refactoring test classes