Tidy up unit test class