diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/error/ErrorFormatterTests.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/error/ErrorFormatterTests.kt
index ef0c1f6da6..25d3707f68 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/error/ErrorFormatterTests.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/error/ErrorFormatterTests.kt
@@ -17,9 +17,9 @@
 package io.element.android.features.login.impl.error
 
 import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.auth.AuthenticationException
 import io.element.android.libraries.ui.strings.R
 import org.junit.Test
-import org.matrix.rustcomponents.sdk.AuthenticationException
 
 class ErrorFormatterTests {
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/actionlist/ActionListPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/actionlist/ActionListPresenterTest.kt
index 7bb9583f05..410f7186aa 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/actionlist/ActionListPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/actionlist/ActionListPresenterTest.kt
@@ -170,7 +170,7 @@ private fun aMessageEvent(
 ) = TimelineItem.Event(
     id = AN_EVENT_ID.value,
     eventId = AN_EVENT_ID,
-    senderId = A_USER_ID.value,
+    senderId = A_USER_ID,
     senderDisplayName = A_USER_NAME,
     senderAvatar = AvatarData(A_USER_ID.value, A_USER_NAME),
     content = content,
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/fixtures/aMessageEvent.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/fixtures/aMessageEvent.kt
index 08720eac06..a7208cb8af 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/fixtures/aMessageEvent.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/fixtures/aMessageEvent.kt
@@ -33,7 +33,7 @@ internal fun aMessageEvent(
 ) = TimelineItem.Event(
     id = AN_EVENT_ID.value,
     eventId = AN_EVENT_ID,
-    senderId = A_USER_ID.value,
+    senderId = A_USER_ID,
     senderDisplayName = A_USER_NAME,
     senderAvatar = AvatarData(A_USER_ID.value, A_USER_NAME),
     content = content,
diff --git a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/auth/AuthErrorCodeTests.kt b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/auth/AuthErrorCodeTests.kt
index c163a18766..b3ccf5264d 100644
--- a/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/auth/AuthErrorCodeTests.kt
+++ b/libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/auth/AuthErrorCodeTests.kt
@@ -18,7 +18,6 @@ package io.element.android.libraries.matrix.api.auth
 
 import com.google.common.truth.Truth.assertThat
 import org.junit.Test
-import org.matrix.rustcomponents.sdk.AuthenticationException
 
 class AuthErrorCodeTests {
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeAuthenticationService.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeAuthenticationService.kt
index e6a6be8012..e44a1d18a8 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeAuthenticationService.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeAuthenticationService.kt
@@ -60,8 +60,13 @@ class FakeAuthenticationService : MatrixAuthenticationService {
 
     override suspend fun login(username: String, password: String): Result<SessionId> {
         delay(100)
-        loginError?.let { throw it }
-        return Result.success(A_USER_ID)
+        return loginError.let { loginError ->
+            if (loginError == null) {
+                Result.success(A_USER_ID)
+            } else {
+                Result.failure(loginError)
+            }
+        }
     }
 
     fun givenLoginError(throwable: Throwable?) {