Tidy up some tests