tidy up tests a bit