tidy up the tests a little