Modify service_connector_unitttest to use Service<>