Cleaned up test data creation for unit and integration tests.