Removed service locator from mappers, covered foodstuff mapper with unit tests