             .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,

        return self
    }

    @discardableResult
    func build() -> Context {
        let app = EurofurenceSessionBuilder(conventionIdentifier: conventionIdentifier)
            .with(api)
            .with(clock)
            .with(credentialStore)


    }

    private var api = FakeAPI()
    private var credentialStore = CapturingCredentialStore()
    private var clock = StubClock()
    private var dataStore = FakeDataStore()
