diff --git a/ElementX/Sources/UITests/UITestsAppCoordinator.swift b/ElementX/Sources/UITests/UITestsAppCoordinator.swift
index 940f18826..eee69feb4 100644
--- a/ElementX/Sources/UITests/UITestsAppCoordinator.swift
+++ b/ElementX/Sources/UITests/UITestsAppCoordinator.swift
@@ -260,7 +260,7 @@ class MockScreen: Identifiable {
             return navigationStackCoordinator
         case .roomPlainNoAvatar:
             let navigationStackCoordinator = NavigationStackCoordinator()
-            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(),
+            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(.init()),
                                                              roomProxy: JoinedRoomProxyMock(.init(name: "Some room name", avatarURL: nil)),
                                                              timelineController: MockTimelineController(),
                                                              mediaProvider: MediaProviderMock(configuration: .init()),
@@ -280,7 +280,7 @@ class MockScreen: Identifiable {
             let navigationStackCoordinator = NavigationStackCoordinator()
             let timelineController = MockTimelineController()
             timelineController.timelineItems = RoomTimelineItemFixtures.smallChunk
-            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(),
+            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(.init()),
                                                              roomProxy: JoinedRoomProxyMock(.init(name: "New room", avatarURL: .mockMXCAvatar)),
                                                              timelineController: timelineController,
                                                              mediaProvider: MediaProviderMock(configuration: .init()),
@@ -300,7 +300,7 @@ class MockScreen: Identifiable {
             let navigationStackCoordinator = NavigationStackCoordinator()
             let timelineController = MockTimelineController()
             timelineController.timelineItems = RoomTimelineItemFixtures.default
-            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(),
+            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(.init()),
                                                              roomProxy: JoinedRoomProxyMock(.init(name: "New room", avatarURL: .mockMXCAvatar)),
                                                              timelineController: timelineController,
                                                              mediaProvider: MediaProviderMock(configuration: .init()),
@@ -320,7 +320,7 @@ class MockScreen: Identifiable {
             let navigationStackCoordinator = NavigationStackCoordinator()
             let timelineController = MockTimelineController()
             timelineController.timelineItems = RoomTimelineItemFixtures.smallChunkWithReadReceipts
-            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(),
+            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(.init()),
                                                              roomProxy: JoinedRoomProxyMock(.init(name: "New room", avatarURL: .mockMXCAvatar)),
                                                              timelineController: timelineController,
                                                              mediaProvider: MediaProviderMock(configuration: .init()),
@@ -343,7 +343,7 @@ class MockScreen: Identifiable {
             timelineController.timelineItems = RoomTimelineItemFixtures.smallChunk
             timelineController.backPaginationResponses = [RoomTimelineItemFixtures.singleMessageChunk]
             timelineController.incomingItems = [RoomTimelineItemFixtures.incomingMessage]
-            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(),
+            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(.init()),
                                                              roomProxy: JoinedRoomProxyMock(.init(name: "Small timeline", avatarURL: .mockMXCAvatar)),
                                                              timelineController: timelineController,
                                                              mediaProvider: MediaProviderMock(configuration: .init()),
@@ -366,7 +366,7 @@ class MockScreen: Identifiable {
             let timelineController = MockTimelineController(listenForSignals: true)
             timelineController.timelineItems = RoomTimelineItemFixtures.smallChunk
             timelineController.backPaginationResponses = [RoomTimelineItemFixtures.largeChunk]
-            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(),
+            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(.init()),
                                                              roomProxy: JoinedRoomProxyMock(.init(name: "Small timeline, paginating", avatarURL: .mockMXCAvatar)),
                                                              timelineController: timelineController,
                                                              mediaProvider: MediaProviderMock(configuration: .init()),
@@ -389,7 +389,7 @@ class MockScreen: Identifiable {
             let timelineController = MockTimelineController(listenForSignals: true)
             timelineController.timelineItems = RoomTimelineItemFixtures.largeChunk
             timelineController.backPaginationResponses = [RoomTimelineItemFixtures.largeChunk]
-            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(),
+            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(.init()),
                                                              roomProxy: JoinedRoomProxyMock(.init(name: "Large timeline", avatarURL: .mockMXCAvatar)),
                                                              timelineController: timelineController,
                                                              mediaProvider: MediaProviderMock(configuration: .init()),
@@ -413,7 +413,7 @@ class MockScreen: Identifiable {
             timelineController.timelineItems = RoomTimelineItemFixtures.largeChunk
             timelineController.backPaginationResponses = [RoomTimelineItemFixtures.largeChunk]
             timelineController.incomingItems = [RoomTimelineItemFixtures.incomingMessage]
-            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(),
+            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(.init()),
                                                              roomProxy: JoinedRoomProxyMock(.init(name: "Large timeline", avatarURL: .mockMXCAvatar)),
                                                              timelineController: timelineController,
                                                              mediaProvider: MediaProviderMock(configuration: .init()),
@@ -436,7 +436,7 @@ class MockScreen: Identifiable {
             let timelineController = MockTimelineController(listenForSignals: true)
             timelineController.timelineItems = RoomTimelineItemFixtures.largeChunk
             timelineController.incomingItems = [RoomTimelineItemFixtures.incomingMessage]
-            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(),
+            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(.init()),
                                                              roomProxy: JoinedRoomProxyMock(.init(name: "Large timeline", avatarURL: .mockMXCAvatar)),
                                                              timelineController: timelineController,
                                                              mediaProvider: MediaProviderMock(configuration: .init()),
@@ -458,7 +458,7 @@ class MockScreen: Identifiable {
             
             let timelineController = MockTimelineController()
             timelineController.timelineItems = RoomTimelineItemFixtures.permalinkChunk
-            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(),
+            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(.init()),
                                                              roomProxy: JoinedRoomProxyMock(.init(name: "Timeline highlight", avatarURL: .mockMXCAvatar)),
                                                              timelineController: timelineController,
                                                              mediaProvider: MediaProviderMock(configuration: .init()),
@@ -494,7 +494,7 @@ class MockScreen: Identifiable {
             let timelineController = MockTimelineController()
             timelineController.timelineItems = RoomTimelineItemFixtures.disclosedPolls
             timelineController.incomingItems = []
-            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(),
+            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(.init()),
                                                              roomProxy: JoinedRoomProxyMock(.init(name: "Polls timeline", avatarURL: .mockMXCAvatar)),
                                                              timelineController: timelineController,
                                                              mediaProvider: MediaProviderMock(configuration: .init()),
@@ -517,7 +517,7 @@ class MockScreen: Identifiable {
             let timelineController = MockTimelineController()
             timelineController.timelineItems = RoomTimelineItemFixtures.undisclosedPolls
             timelineController.incomingItems = []
-            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(),
+            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(.init()),
                                                              roomProxy: JoinedRoomProxyMock(.init(name: "Polls timeline", avatarURL: .mockMXCAvatar)),
                                                              timelineController: timelineController,
                                                              mediaProvider: MediaProviderMock(configuration: .init()),
@@ -540,7 +540,7 @@ class MockScreen: Identifiable {
             let timelineController = MockTimelineController()
             timelineController.timelineItems = RoomTimelineItemFixtures.outgoingPolls
             timelineController.incomingItems = []
-            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(),
+            let parameters = RoomScreenCoordinatorParameters(clientProxy: ClientProxyMock(.init()),
                                                              roomProxy: JoinedRoomProxyMock(.init(name: "Polls timeline", avatarURL: .mockMXCAvatar)),
                                                              timelineController: timelineController,
                                                              mediaProvider: MediaProviderMock(configuration: .init()),