Fixes

CustomerServiceTest completed
EntityConvertor corected
EntityConvertorTest added