Re-adds routes for Service to pass some tests