Updated controllers, services and tests