Cleaning up the tests a little