Updated unit tests to reflect domain model changes.