Avocet/embargo

These changes fix all the test failures.