Cleaning up domain model, starting the SearchController unit test