Tidy up tests slightly