Clean up test data names