Tidying up test classes