Some test data cleanup