             .build()
         
         let refreshObserver = CapturingRefreshServiceObserver()
-        app.services.refresh.add(refreshObserver)
-
-        return Context(session: app,
+        session.services.refresh.add(refreshObserver)
+
+        return Context(session: session,
                        clock: clock,
                        notificationTokenRegistration: notificationTokenRegistration,
                        credentialStore: credentialStore,


    }

    private let conventionIdentifier = ConventionIdentifier(identifier: ModelCharacteristics.testConventionIdentifier)
    private var api = FakeAPI()
    private let notificationTokenRegistration = CapturingRemoteNotificationsTokenRegistration()
    private var credentialStore = CapturingCredentialStore()
    private var clock = StubClock()
    private var dataStore = FakeDataStore()

    private var collectThemAllRequestFactory: CollectThemAllRequestFactory = StubCollectThemAllRequestFactory()
    private var forceUpgradeRequired: ForceRefreshRequired = StubForceRefreshRequired(isForceRefreshRequired: false)

    func with(_ currentDate: Date) -> EurofurenceSessionTestBuilder {
        clock = StubClock(currentDate: currentDate)
        return self
