Tidy up unit tests a wee bit