diff --git a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenEntryPointTest.kt b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenEntryPointTest.kt
index 854e89b13a..c74366ef46 100644
--- a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenEntryPointTest.kt
+++ b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenEntryPointTest.kt
@@ -8,9 +8,11 @@
 package io.element.android.features.lockscreen.impl
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
 import com.bumble.appyx.core.modality.BuildContext
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.lockscreen.api.LockScreenEntryPoint
+import io.element.android.features.lockscreen.impl.unlock.activity.PinUnlockActivity
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.node.TestParentNode
 import org.junit.Test
@@ -59,4 +61,11 @@ class DefaultLockScreenEntryPointTest {
         assertThat(result.plugins).contains(LockScreenFlowNode.Inputs(LockScreenFlowNode.NavTarget.Settings))
         assertThat(result.plugins).contains(callback)
     }
+
+    @Test
+    fun `test pin unlock intent`() {
+        val entryPoint = DefaultLockScreenEntryPoint()
+        val result = entryPoint.pinUnlockIntent(InstrumentationRegistry.getInstrumentation().context)
+        assertThat(result.component?.className).isEqualTo(PinUnlockActivity::class.qualifiedName)
+    }
 }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/DefaultMessagesEntryPointTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/DefaultMessagesEntryPointTest.kt
index dd4f4e4d41..fa3896aeea 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/DefaultMessagesEntryPointTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/DefaultMessagesEntryPointTest.kt
@@ -118,4 +118,12 @@ class DefaultMessagesEntryPointTest {
         assertThat(result.plugins).contains(MessagesEntryPoint.Params(initialTarget))
         assertThat(result.plugins).contains(callback)
     }
+
+    @Test
+    fun `test initial target to nav target mapping`() {
+        assertThat(MessagesEntryPoint.InitialTarget.Messages(focusedEventId = AN_EVENT_ID).toNavTarget())
+            .isEqualTo(MessagesFlowNode.NavTarget.Messages(AN_EVENT_ID))
+        assertThat(MessagesEntryPoint.InitialTarget.PinnedMessages.toNavTarget())
+            .isEqualTo(MessagesFlowNode.NavTarget.PinnedMessagesList)
+    }
 }
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/DefaultPreferencesEntryPointTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/DefaultPreferencesEntryPointTest.kt
index 971ca6ab51..9ef0e09512 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/DefaultPreferencesEntryPointTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/DefaultPreferencesEntryPointTest.kt
@@ -74,4 +74,11 @@ class DefaultPreferencesEntryPointTest {
         assertThat(result.plugins).contains(params)
         assertThat(result.plugins).contains(callback)
     }
+
+    @Test
+    fun `test initial target to nav target mapping`() {
+        assertThat(PreferencesEntryPoint.InitialTarget.Root.toNavTarget()).isEqualTo(PreferencesFlowNode.NavTarget.Root)
+        assertThat(PreferencesEntryPoint.InitialTarget.NotificationSettings.toNavTarget()).isEqualTo(PreferencesFlowNode.NavTarget.NotificationSettings)
+        assertThat(PreferencesEntryPoint.InitialTarget.NotificationTroubleshoot.toNavTarget()).isEqualTo(PreferencesFlowNode.NavTarget.TroubleshootNotifications)
+    }
 }
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/DefaultRoomDetailsEntryPointTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/DefaultRoomDetailsEntryPointTest.kt
index e863b7b562..0115fd9c44 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/DefaultRoomDetailsEntryPointTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/DefaultRoomDetailsEntryPointTest.kt
@@ -24,6 +24,7 @@ import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
+import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.mediaviewer.api.MediaGalleryEntryPoint
 import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint
@@ -102,4 +103,14 @@ class DefaultRoomDetailsEntryPointTest {
         assertThat(result.plugins).contains(params)
         assertThat(result.plugins).contains(callback)
     }
+
+    @Test
+    fun `test initial target to nav target mapping`() {
+        assertThat(RoomDetailsEntryPoint.InitialTarget.RoomDetails.toNavTarget())
+            .isEqualTo(RoomDetailsFlowNode.NavTarget.RoomDetails)
+        assertThat(RoomDetailsEntryPoint.InitialTarget.RoomMemberDetails(A_USER_ID).toNavTarget())
+            .isEqualTo(RoomDetailsFlowNode.NavTarget.RoomMemberDetails(A_USER_ID))
+        assertThat(RoomDetailsEntryPoint.InitialTarget.RoomNotificationSettings.toNavTarget())
+            .isEqualTo(RoomDetailsFlowNode.NavTarget.RoomNotificationSettings(showUserDefinedSettingStyle = true))
+    }
 }