Cleanup in ModelService
Improved ProducerServiceImpl and added a set of new tests to it