Tidy up tests a little