Test cleanups for testing in a release context