Tidy up unit test