Added more domain model tests