Tidying up unit tests