clean up the tests a little