Started writing tests for new domain model