Refactoring test data classes