clean up the tests some