More cleanup in test data