Cleaned up test data and tests.