tidying up unit tests