diff --git a/UnitTests/Sources/MediaProvider/MediaLoaderTests.swift b/UnitTests/Sources/MediaProvider/MediaLoaderTests.swift
index 3587a6091c..1ea40a6edd 100644
--- a/UnitTests/Sources/MediaProvider/MediaLoaderTests.swift
+++ b/UnitTests/Sources/MediaProvider/MediaLoaderTests.swift
@@ -21,7 +21,7 @@ import XCTest
 final class MediaLoaderTests: XCTestCase {
     func testMediaRequestCoalescing() async {
         let mediaLoadingClient = SDKClientMock()
-        mediaLoadingClient.getMediaContentMediaSourceReturnValue = []
+        mediaLoadingClient.getMediaContentMediaSourceReturnValue = Data()
         let mediaLoader = MediaLoader(client: mediaLoadingClient)
         
         let mediaSource = MediaSourceProxy(url: URL.documentsDirectory, mimeType: nil)
@@ -39,7 +39,7 @@ final class MediaLoaderTests: XCTestCase {
     
     func testMediaThumbnailRequestCoalescing() async {
         let mediaLoadingClient = SDKClientMock()
-        mediaLoadingClient.getMediaThumbnailMediaSourceWidthHeightReturnValue = []
+        mediaLoadingClient.getMediaThumbnailMediaSourceWidthHeightReturnValue = Data()
         let mediaLoader = MediaLoader(client: mediaLoadingClient)
         
         let mediaSource = MediaSourceProxy(url: URL.documentsDirectory, mimeType: nil)
diff --git a/UnitTests/Sources/NotificationSettingsEditScreenViewModelTests.swift b/UnitTests/Sources/NotificationSettingsEditScreenViewModelTests.swift
index 88ad3ef380..8ea6e616ac 100644
--- a/UnitTests/Sources/NotificationSettingsEditScreenViewModelTests.swift
+++ b/UnitTests/Sources/NotificationSettingsEditScreenViewModelTests.swift
@@ -194,7 +194,7 @@ class NotificationSettingsEditScreenViewModelTests: XCTestCase {
 
     func testSetModeFailure() async throws {
         notificationSettingsProxy.getDefaultRoomNotificationModeIsEncryptedIsOneToOneReturnValue = .mentionsAndKeywordsOnly
-        notificationSettingsProxy.setDefaultRoomNotificationModeIsEncryptedIsOneToOneModeThrowableError = NotificationSettingsError.Generic(message: "error")
+        notificationSettingsProxy.setDefaultRoomNotificationModeIsEncryptedIsOneToOneModeThrowableError = NotificationSettingsError.Generic(msg: "error")
         viewModel = NotificationSettingsEditScreenViewModel(chatType: .oneToOneChat,
                                                             userSession: userSession,
                                                             notificationSettingsProxy: notificationSettingsProxy)
diff --git a/UnitTests/Sources/NotificationSettingsScreenViewModelTests.swift b/UnitTests/Sources/NotificationSettingsScreenViewModelTests.swift
index 9d1af30645..74e2e70085 100644
--- a/UnitTests/Sources/NotificationSettingsScreenViewModelTests.swift
+++ b/UnitTests/Sources/NotificationSettingsScreenViewModelTests.swift
@@ -277,7 +277,7 @@ class NotificationSettingsScreenViewModelTests: XCTestCase {
     }
 
     func testToggleRoomMentionFailure() async throws {
-        notificationSettingsProxy.setRoomMentionEnabledEnabledThrowableError = NotificationSettingsError.Generic(message: "error")
+        notificationSettingsProxy.setRoomMentionEnabledEnabledThrowableError = NotificationSettingsError.Generic(msg: "error")
         notificationSettingsProxy.isRoomMentionEnabledReturnValue = false
         
         let deferredInitialFetch = deferFulfillment(viewModel.context.$viewState) { state in
@@ -357,7 +357,7 @@ class NotificationSettingsScreenViewModelTests: XCTestCase {
     }
 
     func testToggleCallsFailure() async throws {
-        notificationSettingsProxy.setCallEnabledEnabledThrowableError = NotificationSettingsError.Generic(message: "error")
+        notificationSettingsProxy.setCallEnabledEnabledThrowableError = NotificationSettingsError.Generic(msg: "error")
         notificationSettingsProxy.isCallEnabledReturnValue = false
         
         let deferredInitialFetch = deferFulfillment(viewModel.context.$viewState) { state in
diff --git a/UnitTests/Sources/RoomDetailsViewModelTests.swift b/UnitTests/Sources/RoomDetailsViewModelTests.swift
index 4e137d3754..e404d60f28 100644
--- a/UnitTests/Sources/RoomDetailsViewModelTests.swift
+++ b/UnitTests/Sources/RoomDetailsViewModelTests.swift
@@ -413,7 +413,7 @@ class RoomDetailsScreenViewModelTests: XCTestCase {
     // MARK: - Notifications
     
     func testNotificationLoadingSettingsFailure() async throws {
-        notificationSettingsProxyMock.getNotificationSettingsRoomIdIsEncryptedIsOneToOneThrowableError = NotificationSettingsError.Generic(message: "error")
+        notificationSettingsProxyMock.getNotificationSettingsRoomIdIsEncryptedIsOneToOneThrowableError = NotificationSettingsError.Generic(msg: "error")
         viewModel = RoomDetailsScreenViewModel(accountUserID: "@owner:somewhere.com",
                                                roomProxy: roomProxyMock,
                                                mediaProvider: MockMediaProvider(),
@@ -506,7 +506,7 @@ class RoomDetailsScreenViewModelTests: XCTestCase {
             defer {
                 expectation.fulfill()
             }
-            throw NotificationSettingsError.Generic(message: "unmute error")
+            throw NotificationSettingsError.Generic(msg: "unmute error")
         }
         context.send(viewAction: .processToogleMuteNotifications)
         await fulfillment(of: [expectation])
@@ -531,7 +531,7 @@ class RoomDetailsScreenViewModelTests: XCTestCase {
             defer {
                 expectation.fulfill()
             }
-            throw NotificationSettingsError.Generic(message: "mute error")
+            throw NotificationSettingsError.Generic(msg: "mute error")
         }
         context.send(viewAction: .processToogleMuteNotifications)
         await fulfillment(of: [expectation])
diff --git a/UnitTests/Sources/RoomNotificationSettingsScreenViewModelTests.swift b/UnitTests/Sources/RoomNotificationSettingsScreenViewModelTests.swift
index 3fd62f7e4c..3c5a27d6c6 100644
--- a/UnitTests/Sources/RoomNotificationSettingsScreenViewModelTests.swift
+++ b/UnitTests/Sources/RoomNotificationSettingsScreenViewModelTests.swift
@@ -68,7 +68,7 @@ class RoomNotificationSettingsScreenViewModelTests: XCTestCase {
     }
     
     func testInitialStateFailure() async throws {
-        notificationSettingsProxyMock.getNotificationSettingsRoomIdIsEncryptedIsOneToOneThrowableError = NotificationSettingsError.Generic(message: "error")
+        notificationSettingsProxyMock.getNotificationSettingsRoomIdIsEncryptedIsOneToOneThrowableError = NotificationSettingsError.Generic(msg: "error")
         let viewModel = RoomNotificationSettingsScreenViewModel(notificationSettingsProxy: notificationSettingsProxyMock,
                                                                 roomProxy: roomProxyMock,
                                                                 displayAsUserDefinedRoomSettings: false)
@@ -235,7 +235,7 @@ class RoomNotificationSettingsScreenViewModelTests: XCTestCase {
     
     func testDeleteCustomSettingTappedFailure() async throws {
         notificationSettingsProxyMock.getNotificationSettingsRoomIdIsEncryptedIsOneToOneReturnValue = RoomNotificationSettingsProxyMock(with: .init(mode: .mentionsAndKeywordsOnly, isDefault: false))
-        notificationSettingsProxyMock.restoreDefaultNotificationModeRoomIdThrowableError = NotificationSettingsError.Generic(message: "error")
+        notificationSettingsProxyMock.restoreDefaultNotificationModeRoomIdThrowableError = NotificationSettingsError.Generic(msg: "error")
         let viewModel = RoomNotificationSettingsScreenViewModel(notificationSettingsProxy: notificationSettingsProxyMock,
                                                                 roomProxy: roomProxyMock,
                                                                 displayAsUserDefinedRoomSettings: true)