some cleanups for the tests