diff --git a/app/src/main/java/com/nextcloud/talk/data/database/mappers/ChatMessageMapUtils.kt b/app/src/main/java/com/nextcloud/talk/data/database/mappers/ChatMessageMapUtils.kt
index cb34a2372..30b856a6b 100644
--- a/app/src/main/java/com/nextcloud/talk/data/database/mappers/ChatMessageMapUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/data/database/mappers/ChatMessageMapUtils.kt
@@ -7,9 +7,9 @@
 
 package com.nextcloud.talk.data.database.mappers
 
-import com.nextcloud.talk.chat.data.model.ChatMessage
-import com.nextcloud.talk.data.database.model.ChatMessageEntity
 import com.nextcloud.talk.models.json.chat.ChatMessageJson
+import com.nextcloud.talk.data.database.model.ChatMessageEntity
+import com.nextcloud.talk.chat.data.model.ChatMessage
 
 fun ChatMessageJson.asEntity(accountId: Long) =
     ChatMessageEntity(
diff --git a/app/src/test/java/com/nextcloud/talk/contacts/ContactsViewModelTest.kt b/app/src/test/java/com/nextcloud/talk/contacts/ContactsViewModelTest.kt
index 7bb905b43..8a9a56937 100644
--- a/app/src/test/java/com/nextcloud/talk/contacts/ContactsViewModelTest.kt
+++ b/app/src/test/java/com/nextcloud/talk/contacts/ContactsViewModelTest.kt
@@ -81,7 +81,7 @@ class ContactsViewModelTest {
 
     @Test
     fun `update shareTypes`() {
-        viewModel.updateShareTypes(ShareType.Group.shareType)
+        viewModel.updateShareTypes(listOf(ShareType.Group.shareType))
         assert(viewModel.shareTypeList.contains(ShareType.Group.shareType))
     }