More test data cleanup