clean up tests a little