Using new service interfaces in controllers and fixed service usage and tests for controllers