diff --git a/StreamChatSwiftUITests/Tests/ChatChannel/ChatChannelViewModel_Tests.swift b/StreamChatSwiftUITests/Tests/ChatChannel/ChatChannelViewModel_Tests.swift
index 0c591e09..8c98ce1a 100644
--- a/StreamChatSwiftUITests/Tests/ChatChannel/ChatChannelViewModel_Tests.swift
+++ b/StreamChatSwiftUITests/Tests/ChatChannel/ChatChannelViewModel_Tests.swift
@@ -105,7 +105,7 @@ class ChatChannelViewModel_Tests: StreamChatTestCase {
 
         // Then
         let dateString = viewModel.currentDateString
-        XCTAssert(dateString == expectedDate)
+        XCTAssertEqual(dateString, expectedDate)
     }
 
     func test_chatChannelVM_showReactionsOverlay() {
diff --git a/StreamChatSwiftUITests/Tests/ChatChannelList/ChatChannelListItemView_Tests.swift b/StreamChatSwiftUITests/Tests/ChatChannelList/ChatChannelListItemView_Tests.swift
index 98988b36..8f908d0b 100644
--- a/StreamChatSwiftUITests/Tests/ChatChannelList/ChatChannelListItemView_Tests.swift
+++ b/StreamChatSwiftUITests/Tests/ChatChannelList/ChatChannelListItemView_Tests.swift
@@ -155,7 +155,7 @@ final class ChatChannelListItemView_Tests: StreamChatTestCase {
 
     func test_channelListItem_pollMessage_youVoted() throws {
         // Given
-        let currentUserId = UserId.unique
+        let currentUserId = Self.currentUserId
         let message = try mockPollMessage(isSentByCurrentUser: false, latestVotes: [
             .mock(pollId: .unique, optionId: .unique, user: .mock(id: currentUserId)),
             .unique,
@@ -179,7 +179,7 @@ final class ChatChannelListItemView_Tests: StreamChatTestCase {
 
     func test_channelListItem_pollMessage_someoneVoted() throws {
         // Given
-        let currentUserId = UserId.unique
+        let currentUserId = Self.currentUserId
         let message = try mockPollMessage(isSentByCurrentUser: false, latestVotes: [
             .mock(pollId: .unique, optionId: .unique, user: .mock(id: .unique, name: "Steve Jobs")),
             .unique,
@@ -331,7 +331,7 @@ final class ChatChannelListItemView_Tests: StreamChatTestCase {
             isSentByCurrentUser: isSentByCurrentUser,
             poll: .mock(
                 name: "Test poll",
-                createdBy: .mock(id: "test", name: "test"),
+                createdBy: .mock(id: isSentByCurrentUser ? Self.currentUserId : "test", name: "test"),
                 latestVotes: latestVotes
             )
         )
diff --git a/StreamChatSwiftUITests/Tests/ChatChannelList/__Snapshots__/LoadingView_Tests/test_redactedLoadingView_snapshot.1.png b/StreamChatSwiftUITests/Tests/ChatChannelList/__Snapshots__/LoadingView_Tests/test_redactedLoadingView_snapshot.1.png
index 9c2ba800..34e3f241 100644
Binary files a/StreamChatSwiftUITests/Tests/ChatChannelList/__Snapshots__/LoadingView_Tests/test_redactedLoadingView_snapshot.1.png and b/StreamChatSwiftUITests/Tests/ChatChannelList/__Snapshots__/LoadingView_Tests/test_redactedLoadingView_snapshot.1.png differ
diff --git a/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_default.1.png b/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_default.1.png
index 2926d0b6..f721b48a 100644
Binary files a/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_default.1.png and b/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_default.1.png differ
diff --git a/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_whenAttachmentIsPoll.1.png b/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_whenAttachmentIsPoll.1.png
index 8ebd427a..c731eada 100644
Binary files a/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_whenAttachmentIsPoll.1.png and b/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_whenAttachmentIsPoll.1.png differ
diff --git a/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_whenAttachments.1.png b/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_whenAttachments.1.png
index 54e7c107..ddf9e539 100644
Binary files a/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_whenAttachments.1.png and b/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_whenAttachments.1.png differ
diff --git a/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_withLastReplyDeleted.1.png b/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_withLastReplyDeleted.1.png
index a4a64435..d18f11f9 100644
Binary files a/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_withLastReplyDeleted.1.png and b/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_withLastReplyDeleted.1.png differ
diff --git a/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_withParentMessageDeleted.1.png b/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_withParentMessageDeleted.1.png
index 0e6d0a06..b08d93a8 100644
Binary files a/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_withParentMessageDeleted.1.png and b/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_withParentMessageDeleted.1.png differ
diff --git a/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_withTitle.1.png b/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_withTitle.1.png
index d6e5b2bb..cbe0ea91 100644
Binary files a/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_withTitle.1.png and b/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_withTitle.1.png differ
diff --git a/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_withUnreads.1.png b/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_withUnreads.1.png
index a13056de..291d422a 100644
Binary files a/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_withUnreads.1.png and b/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListItemView_Tests/test_threadListItem_withUnreads.1.png differ
diff --git a/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListView_Tests/test_chatThreadListView_errorLoadingMoreThreads.1.png b/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListView_Tests/test_chatThreadListView_errorLoadingMoreThreads.1.png
index 5d790527..79d64bc7 100644
Binary files a/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListView_Tests/test_chatThreadListView_errorLoadingMoreThreads.1.png and b/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListView_Tests/test_chatThreadListView_errorLoadingMoreThreads.1.png differ
diff --git a/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListView_Tests/test_chatThreadListView_loadingMoreThreads.1.png b/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListView_Tests/test_chatThreadListView_loadingMoreThreads.1.png
index 4ca8e724..d4525581 100644
Binary files a/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListView_Tests/test_chatThreadListView_loadingMoreThreads.1.png and b/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListView_Tests/test_chatThreadListView_loadingMoreThreads.1.png differ
diff --git a/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListView_Tests/test_chatThreadListView_reloadingThreads.1.png b/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListView_Tests/test_chatThreadListView_reloadingThreads.1.png
index 8cee7235..7f61826c 100644
Binary files a/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListView_Tests/test_chatThreadListView_reloadingThreads.1.png and b/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListView_Tests/test_chatThreadListView_reloadingThreads.1.png differ
diff --git a/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListView_Tests/test_chatThreadListView_whenNewThreadsAvailable.1.png b/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListView_Tests/test_chatThreadListView_whenNewThreadsAvailable.1.png
index c9c80157..f0a3a794 100644
Binary files a/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListView_Tests/test_chatThreadListView_whenNewThreadsAvailable.1.png and b/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListView_Tests/test_chatThreadListView_whenNewThreadsAvailable.1.png differ
diff --git a/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListView_Tests/test_chatThreadListView_withThreads.1.png b/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListView_Tests/test_chatThreadListView_withThreads.1.png
index fddeb745..c596c0e2 100644
Binary files a/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListView_Tests/test_chatThreadListView_withThreads.1.png and b/StreamChatSwiftUITests/Tests/ChatThreadList/__Snapshots__/ChatThreadListView_Tests/test_chatThreadListView_withThreads.1.png differ