Cleans up the tests a little