ControllerService and its tests added