Fix tests (ExternalService)