refactor naming of test classes