Clean up the tests a bit