Created builders for tests
Modified domain model
Added more builders