Re-enable some tests that were being skipped due to flakiness. Fix flakiness stemming from not waiting until new license was applied. Fix race in AOP code. Co-authored-by: Nick Cabatoff <ncabatoff@hashicorp.com>