Clean up tests a little bit