Remove unused test data
Modify test data for class tests
Merge branch 'simplify_test_data'