Refactored services to be a resource. Re-wrote tests based on service refactor. Using proper service methods in controllers