diff --git a/vector/src/test/java/im/vector/app/features/poll/create/CreatePollViewStates.kt b/vector/src/test/java/im/vector/app/features/poll/create/CreatePollViewStates.kt
deleted file mode 100644
index 518beabd1f..0000000000
--- a/vector/src/test/java/im/vector/app/features/poll/create/CreatePollViewStates.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2022 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.app.features.poll.create
-
-import im.vector.app.features.poll.PollMode
-import kotlin.random.Random
-
-object CreatePollViewStates {
-
-    const val fakeRoomId = "fakeRoomId"
-    const val fakeEventId = "fakeEventId"
-
-    val createPollArgs = CreatePollArgs(fakeRoomId, null, PollMode.CREATE)
-    val editPollArgs = CreatePollArgs(fakeRoomId, fakeEventId, PollMode.EDIT)
-
-    const val fakeQuestion = "What is your favourite coffee?"
-    val fakeOptions = List(CreatePollViewModel.MAX_OPTIONS_COUNT + 1) { "Coffee No${Random.nextInt()}" }
-
-    val initialCreatePollViewState = CreatePollViewState(createPollArgs).copy(
-        canCreatePoll = false,
-        canAddMoreOptions = true
-    )
-
-    val pollViewStateWithOnlyQuestion = initialCreatePollViewState.copy(
-            question = fakeQuestion,
-            canCreatePoll = false,
-            canAddMoreOptions = true
-    )
-
-    val pollViewStateWithQuestionAndNotEnoughOptions = initialCreatePollViewState.copy(
-            question = fakeQuestion,
-            options = fakeOptions.take(CreatePollViewModel.MIN_OPTIONS_COUNT - 1).toMutableList().apply { add("") },
-            canCreatePoll = false,
-            canAddMoreOptions = true
-    )
-
-    val pollViewStateWithoutQuestionAndEnoughOptions = initialCreatePollViewState.copy(
-            question = "",
-            options = fakeOptions.take(CreatePollViewModel.MIN_OPTIONS_COUNT),
-            canCreatePoll = false,
-            canAddMoreOptions = true
-    )
-
-    val pollViewStateWithQuestionAndEnoughOptions = initialCreatePollViewState.copy(
-            question = fakeQuestion,
-            options = fakeOptions.take(CreatePollViewModel.MIN_OPTIONS_COUNT),
-            canCreatePoll = true,
-            canAddMoreOptions = true
-    )
-
-    val pollViewStateWithQuestionAndMaxOptions = initialCreatePollViewState.copy(
-            question = fakeQuestion,
-            options = fakeOptions.take(CreatePollViewModel.MAX_OPTIONS_COUNT),
-            canCreatePoll = true,
-            canAddMoreOptions = false
-    )
-}
diff --git a/vector/src/test/java/im/vector/app/features/poll/create/FakeCreatePollViewStates.kt b/vector/src/test/java/im/vector/app/features/poll/create/FakeCreatePollViewStates.kt
new file mode 100644
index 0000000000..b384a9a257
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/poll/create/FakeCreatePollViewStates.kt
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.poll.create
+
+import im.vector.app.features.poll.PollMode
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.room.model.message.MessagePollContent
+import org.matrix.android.sdk.api.session.room.model.message.PollAnswer
+import org.matrix.android.sdk.api.session.room.model.message.PollCreationInfo
+import org.matrix.android.sdk.api.session.room.model.message.PollQuestion
+import org.matrix.android.sdk.api.session.room.sender.SenderInfo
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import kotlin.random.Random
+
+object FakeCreatePollViewStates {
+
+    const val A_FAKE_ROOM_ID = "fakeRoomId"
+    private const val A_FAKE_EVENT_ID = "fakeEventId"
+    private const val A_FAKE_USER_ID = "fakeUserId"
+
+    val createPollArgs = CreatePollArgs(A_FAKE_ROOM_ID, null, PollMode.CREATE)
+    val editPollArgs = CreatePollArgs(A_FAKE_ROOM_ID, A_FAKE_EVENT_ID, PollMode.EDIT)
+
+    const val A_FAKE_QUESTION = "What is your favourite coffee?"
+    val A_FAKE_OPTIONS = List(CreatePollViewModel.MAX_OPTIONS_COUNT + 1) { "Coffee No${Random.nextInt()}" }
+
+    private val A_POLL_CONTENT = MessagePollContent(
+            unstablePollCreationInfo = PollCreationInfo(
+                    question = PollQuestion(
+                            unstableQuestion = A_FAKE_QUESTION
+                    ),
+                    maxSelections = 1,
+                    answers = listOf(
+                            PollAnswer(
+                                    id = "5ef5f7b0-c9a1-49cf-a0b3-374729a43e76",
+                                    unstableAnswer = A_FAKE_OPTIONS[0]
+                            ),
+                            PollAnswer(
+                                    id = "ec1a4db0-46d8-4d7a-9bb6-d80724715938",
+                                    unstableAnswer = A_FAKE_OPTIONS[1]
+                            )
+                    )
+            )
+    )
+
+    private val A_POLL_START_EVENT = Event(
+            type = EventType.POLL_START.first(),
+            eventId = A_FAKE_EVENT_ID,
+            originServerTs = 1652435922563,
+            senderId = A_FAKE_USER_ID,
+            roomId = A_FAKE_ROOM_ID,
+            content = A_POLL_CONTENT.toContent()
+    )
+
+    val A_POLL_START_TIMELINE_EVENT = TimelineEvent(
+            root = A_POLL_START_EVENT,
+            localId = 12345,
+            eventId = A_FAKE_EVENT_ID,
+            displayIndex = 1,
+            senderInfo = SenderInfo(A_FAKE_USER_ID, isUniqueDisplayName = true, avatarUrl = "", displayName = "")
+    )
+
+    val initialCreatePollViewState = CreatePollViewState(createPollArgs).copy(
+        canCreatePoll = false,
+        canAddMoreOptions = true
+    )
+
+    val pollViewStateWithOnlyQuestion = initialCreatePollViewState.copy(
+            question = A_FAKE_QUESTION,
+            canCreatePoll = false,
+            canAddMoreOptions = true
+    )
+
+    val pollViewStateWithQuestionAndNotEnoughOptions = initialCreatePollViewState.copy(
+            question = A_FAKE_QUESTION,
+            options = A_FAKE_OPTIONS.take(CreatePollViewModel.MIN_OPTIONS_COUNT - 1).toMutableList().apply { add("") },
+            canCreatePoll = false,
+            canAddMoreOptions = true
+    )
+
+    val pollViewStateWithoutQuestionAndEnoughOptions = initialCreatePollViewState.copy(
+            question = "",
+            options = A_FAKE_OPTIONS.take(CreatePollViewModel.MIN_OPTIONS_COUNT),
+            canCreatePoll = false,
+            canAddMoreOptions = true
+    )
+
+    val pollViewStateWithQuestionAndEnoughOptions = initialCreatePollViewState.copy(
+            question = A_FAKE_QUESTION,
+            options = A_FAKE_OPTIONS.take(CreatePollViewModel.MIN_OPTIONS_COUNT),
+            canCreatePoll = true,
+            canAddMoreOptions = true
+    )
+
+    val pollViewStateWithQuestionAndMaxOptions = initialCreatePollViewState.copy(
+            question = A_FAKE_QUESTION,
+            options = A_FAKE_OPTIONS.take(CreatePollViewModel.MAX_OPTIONS_COUNT),
+            canCreatePoll = true,
+            canAddMoreOptions = false
+    )
+
+    val editedPollViewState = pollViewStateWithQuestionAndEnoughOptions.copy(
+            editedEventId = A_FAKE_EVENT_ID,
+            mode = PollMode.EDIT
+    )
+}