domain model changes, test data preparation