diff --git a/Tests/ElixxirDAppsSDKTests/Models/BroadcastMessageTests.swift b/Tests/ElixxirDAppsSDKTests/Models/BroadcastMessageTests.swift
index f9cac4b927a3f0d0897e2ddcecbc26fe8271746f..3b6fa7ab7841365647fed1755575612cadcc25b4 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/BroadcastMessageTests.swift
+++ b/Tests/ElixxirDAppsSDKTests/Models/BroadcastMessageTests.swift
@@ -15,17 +15,17 @@ final class BroadcastMessageTests: XCTestCase {
     }
     """
     let jsonData = jsonString.data(using: .utf8)!
-    let message = try BroadcastMessage.decode(jsonData)
+    let model = try BroadcastMessage.decode(jsonData)
 
-    XCTAssertNoDifference(message, BroadcastMessage(
+    XCTAssertNoDifference(model, BroadcastMessage(
       roundId: roundId,
       ephId: ephId,
       payload: Data(base64Encoded: payloadB64)!
     ))
 
-    let encodedMessage = try message.encode()
-    let decodedMessage = try BroadcastMessage.decode(encodedMessage)
+    let encodedModel = try model.encode()
+    let decodedModel = try BroadcastMessage.decode(encodedModel)
 
-    XCTAssertNoDifference(decodedMessage, message)
+    XCTAssertNoDifference(decodedModel, model)
   }
 }
diff --git a/Tests/ElixxirDAppsSDKTests/Models/BroadcastReportTests.swift b/Tests/ElixxirDAppsSDKTests/Models/BroadcastReportTests.swift
index b94ca4a3cffdf8c87e557cfe82d318b985de03b8..c354553ca641f0d6f1ebcc5584533ec247ddb9dd 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/BroadcastReportTests.swift
+++ b/Tests/ElixxirDAppsSDKTests/Models/BroadcastReportTests.swift
@@ -13,16 +13,16 @@ final class BroadcastReportTests: XCTestCase {
     }
     """
     let jsonData = jsonString.data(using: .utf8)!
-    let report = try BroadcastReport.decode(jsonData)
+    let model = try BroadcastReport.decode(jsonData)
 
-    XCTAssertNoDifference(report, BroadcastReport(
+    XCTAssertNoDifference(model, BroadcastReport(
       roundId: roundId,
       ephId: ephId
     ))
 
-    let encodedReport = try report.encode()
-    let decodedReport = try BroadcastReport.decode(encodedReport)
+    let encodedModel = try model.encode()
+    let decodedModel = try BroadcastReport.decode(encodedModel)
 
-    XCTAssertNoDifference(decodedReport, report)
+    XCTAssertNoDifference(decodedModel, model)
   }
 }
diff --git a/Tests/ElixxirDAppsSDKTests/Models/EventReportTests.swift b/Tests/ElixxirDAppsSDKTests/Models/EventReportTests.swift
index 8605f7b79e0188b9aecadd571719e64896b9f9c9..22307d4e431ff798cfa9e25124685a759fc74c45 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/EventReportTests.swift
+++ b/Tests/ElixxirDAppsSDKTests/Models/EventReportTests.swift
@@ -17,18 +17,18 @@ final class EventReportTests: XCTestCase {
     }
     """
     let jsonData = jsonString.data(using: .utf8)!
-    let report = try EventReport.decode(jsonData)
+    let model = try EventReport.decode(jsonData)
 
-    XCTAssertNoDifference(report, EventReport(
+    XCTAssertNoDifference(model, EventReport(
       priority: priority,
       category: category,
       eventType: eventType,
       details: details
     ))
 
-    let encodedReport = try report.encode()
-    let decodedReport = try EventReport.decode(encodedReport)
+    let encodedModel = try model.encode()
+    let decodedModel = try EventReport.decode(encodedModel)
 
-    XCTAssertNoDifference(decodedReport, report)
+    XCTAssertNoDifference(decodedModel, model)
   }
 }
diff --git a/Tests/ElixxirDAppsSDKTests/Models/FactTests.swift b/Tests/ElixxirDAppsSDKTests/Models/FactTests.swift
index 35605e401657a26a101df794c08613ad1db442c3..581cca3b7975bba89078c1deabb415f01a39ed0b 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/FactTests.swift
+++ b/Tests/ElixxirDAppsSDKTests/Models/FactTests.swift
@@ -13,16 +13,16 @@ final class FactTests: XCTestCase {
     }
     """
     let jsonData = jsonString.data(using: .utf8)!
-    let fact = try Fact.decode(jsonData)
+    let model = try Fact.decode(jsonData)
 
-    XCTAssertNoDifference(fact, Fact(
+    XCTAssertNoDifference(model, Fact(
       fact: factValue,
       type: factType
     ))
 
-    let encodedFact = try fact.encode()
-    let decodedFact = try Fact.decode(encodedFact)
+    let encodedModel = try model.encode()
+    let decodedModel = try Fact.decode(encodedModel)
 
-    XCTAssertNoDifference(decodedFact, fact)
+    XCTAssertNoDifference(decodedModel, model)
   }
 }
diff --git a/Tests/ElixxirDAppsSDKTests/Models/FileSendTests.swift b/Tests/ElixxirDAppsSDKTests/Models/FileSendTests.swift
index a9a150c732545ce25da89132e29f58ae5b88f48f..d0fbf2752cf82f411964343b5ae26f4dc96c9e60 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/FileSendTests.swift
+++ b/Tests/ElixxirDAppsSDKTests/Models/FileSendTests.swift
@@ -17,18 +17,18 @@ final class FileSendTests: XCTestCase {
     }
     """
     let jsonData = jsonString.data(using: .utf8)!
-    let fileSend = try FileSend.decode(jsonData)
+    let model = try FileSend.decode(jsonData)
 
-    XCTAssertNoDifference(fileSend, FileSend(
+    XCTAssertNoDifference(model, FileSend(
       name: name,
       type: type,
       preview: Data(base64Encoded: previewB64)!,
       contents: Data(base64Encoded: contentsB64)!
     ))
 
-    let encodedFileSend = try fileSend.encode()
-    let decodedFileSend = try FileSend.decode(encodedFileSend)
+    let encodedModel = try model.encode()
+    let decodedModel = try FileSend.decode(encodedModel)
 
-    XCTAssertNoDifference(decodedFileSend, fileSend)
+    XCTAssertNoDifference(decodedModel, model)
   }
 }
diff --git a/Tests/ElixxirDAppsSDKTests/Models/MessageSendReportTests.swift b/Tests/ElixxirDAppsSDKTests/Models/MessageSendReportTests.swift
index 011ac21b8f53f3b7a3e324cdacd1e9dd8dbad0e6..f1852dd39c90c75820949f51e07acf2d641c8e9b 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/MessageSendReportTests.swift
+++ b/Tests/ElixxirDAppsSDKTests/Models/MessageSendReportTests.swift
@@ -15,27 +15,26 @@ final class MessageSendReportTests: XCTestCase {
     }
     """
     let jsonData = jsonString.data(using: .utf8)!
-    let report = try MessageSendReport.decode(jsonData)
+    let model = try MessageSendReport.decode(jsonData)
 
-    XCTAssertNoDifference(report, MessageSendReport(
+    XCTAssertNoDifference(model, MessageSendReport(
       roundList: rounds,
       messageId: Data(base64Encoded: messageIdB64)!,
       timestamp: timestamp
     ))
 
-    let encodedReport = try report.encode()
-    let decodedReport = try MessageSendReport.decode(encodedReport)
+    let encodedModel = try model.encode()
+    let decodedModel = try MessageSendReport.decode(encodedModel)
 
-    XCTAssertNoDifference(decodedReport, report)
+    XCTAssertNoDifference(decodedModel, model)
   }
 
   func testDecodeEmpty() throws {
     let jsonString = "{}"
     let jsonData = jsonString.data(using: .utf8)!
+    let model = try MessageSendReport.decode(jsonData)
 
-    let report = try MessageSendReport.decode(jsonData)
-
-    XCTAssertNoDifference(report, MessageSendReport(
+    XCTAssertNoDifference(model, MessageSendReport(
       roundList: nil,
       messageId: nil,
       timestamp: nil
diff --git a/Tests/ElixxirDAppsSDKTests/Models/MessageTests.swift b/Tests/ElixxirDAppsSDKTests/Models/MessageTests.swift
index b1183a35e0dee86a0c8810634b8c482939fd2f73..ba9f63df2857d76d5b3004c2151d518e955e1d82 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/MessageTests.swift
+++ b/Tests/ElixxirDAppsSDKTests/Models/MessageTests.swift
@@ -27,9 +27,9 @@ final class MessageTests: XCTestCase {
     }
     """
     let jsonData = jsonString.data(using: .utf8)!
-    let message = try Message.decode(jsonData)
+    let model = try Message.decode(jsonData)
 
-    XCTAssertNoDifference(message, Message(
+    XCTAssertNoDifference(model, Message(
       messageType: 1,
       id: Data(base64Encoded: idB64)!,
       payload: Data(base64Encoded: payloadB64)!,
@@ -41,9 +41,9 @@ final class MessageTests: XCTestCase {
       roundId: roundId
     ))
 
-    let encodedMessage = try message.encode()
-    let decodedMessage = try Message.decode(encodedMessage)
+    let encodedModel = try model.encode()
+    let decodedModel = try Message.decode(encodedModel)
 
-    XCTAssertNoDifference(decodedMessage, message)
+    XCTAssertNoDifference(decodedModel, model)
   }
 }
diff --git a/Tests/ElixxirDAppsSDKTests/Models/ProgressTests.swift b/Tests/ElixxirDAppsSDKTests/Models/ProgressTests.swift
index 451ea593aef7bd145265617c178c4dce32788ad5..557eac6840f3e356066252bb331d83b54fa1c7fc 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/ProgressTests.swift
+++ b/Tests/ElixxirDAppsSDKTests/Models/ProgressTests.swift
@@ -16,19 +16,19 @@ final class ProgressTests: XCTestCase {
     }
     """
     let jsonData = jsonString.data(using: .utf8)!
-    let progress = try Progress.decode(jsonData)
+    let model = try Progress.decode(jsonData)
 
-    XCTAssertNoDifference(progress, Progress(
+    XCTAssertNoDifference(model, Progress(
       completed: completed,
       transmitted: transmitted,
       total: total,
       error: nil
     ))
 
-    let encodedProgress = try progress.encode()
-    let decodedProgress = try Progress.decode(encodedProgress)
+    let encodedModel = try model.encode()
+    let decodedModel = try Progress.decode(encodedModel)
 
-    XCTAssertNoDifference(decodedProgress, progress)
+    XCTAssertNoDifference(decodedModel, model)
   }
 
   func testDecodingProgressWithError() throws {
@@ -45,9 +45,9 @@ final class ProgressTests: XCTestCase {
     }
     """
     let jsonData = jsonString.data(using: .utf8)!
-    let progress = try Progress.decode(jsonData)
+    let model = try Progress.decode(jsonData)
 
-    XCTAssertNoDifference(progress, Progress(
+    XCTAssertNoDifference(model, Progress(
       completed: completed,
       transmitted: transmitted,
       total: total,
diff --git a/Tests/ElixxirDAppsSDKTests/Models/ReceivedFileTests.swift b/Tests/ElixxirDAppsSDKTests/Models/ReceivedFileTests.swift
index 2e82fef046e9b4d8495d27fbbc4528c7af2a5969..f04720e525d074f9307e36e54464b6bd5fa62e8a 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/ReceivedFileTests.swift
+++ b/Tests/ElixxirDAppsSDKTests/Models/ReceivedFileTests.swift
@@ -21,9 +21,9 @@ final class ReceivedFileTests: XCTestCase {
     }
     """
     let jsonData = jsonString.data(using: .utf8)!
-    let receivedFile = try ReceivedFile.decode(jsonData)
+    let model = try ReceivedFile.decode(jsonData)
 
-    XCTAssertNoDifference(receivedFile, ReceivedFile(
+    XCTAssertNoDifference(model, ReceivedFile(
       transferId: Data(base64Encoded: transferIdB64)!,
       senderId: Data(base64Encoded: senderIdB64)!,
       preview: Data(base64Encoded: previewB64)!,
@@ -32,9 +32,9 @@ final class ReceivedFileTests: XCTestCase {
       size: size
     ))
 
-    let encodedReceivedFile = try receivedFile.encode()
-    let decodedReceivedFile = try ReceivedFile.decode(encodedReceivedFile)
+    let encodedModel = try model.encode()
+    let decodedModel = try ReceivedFile.decode(encodedModel)
 
-    XCTAssertNoDifference(decodedReceivedFile, receivedFile)
+    XCTAssertNoDifference(decodedModel, model)
   }
 }
diff --git a/Tests/ElixxirDAppsSDKTests/Models/ReceptionIdentityTests.swift b/Tests/ElixxirDAppsSDKTests/Models/ReceptionIdentityTests.swift
index b329cc2dec762dd49802e8d33410592fcb44c418..9e00d0354ab907dca9a5d5857933c9ebd0f7ccbc 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/ReceptionIdentityTests.swift
+++ b/Tests/ElixxirDAppsSDKTests/Models/ReceptionIdentityTests.swift
@@ -17,18 +17,18 @@ final class ReceptionIdentityTests: XCTestCase {
     }
     """
     let jsonData = jsonString.data(using: .utf8)!
-    let identity = try ReceptionIdentity.decode(jsonData)
+    let model = try ReceptionIdentity.decode(jsonData)
 
-    XCTAssertNoDifference(identity, ReceptionIdentity(
+    XCTAssertNoDifference(model, ReceptionIdentity(
       id: Data(base64Encoded: idB64)!,
       rsaPrivatePem: Data(base64Encoded: rsaPrivatePemB64)!,
       salt: Data(base64Encoded: saltB64)!,
       dhKeyPrivate: Data(base64Encoded: dhKeyPrivateB64)!
     ))
 
-    let encodedIdentity = try identity.encode()
-    let decodedIdentity = try ReceptionIdentity.decode(encodedIdentity)
+    let encodedModel = try model.encode()
+    let decodedModel = try ReceptionIdentity.decode(encodedModel)
 
-    XCTAssertNoDifference(decodedIdentity, identity)
+    XCTAssertNoDifference(decodedModel, model)
   }
 }
diff --git a/Tests/ElixxirDAppsSDKTests/Models/RestlikeMessageTests.swift b/Tests/ElixxirDAppsSDKTests/Models/RestlikeMessageTests.swift
index 88a69216b6ecac9a9ea8983c30c99d1dd1c0af34..7fca8d7267ac87d8936cb0dbc4a5826cb5a5f076 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/RestlikeMessageTests.swift
+++ b/Tests/ElixxirDAppsSDKTests/Models/RestlikeMessageTests.swift
@@ -21,9 +21,9 @@ final class RestlikeMessageTests: XCTestCase {
     }
     """
     let jsonData = jsonString.data(using: .utf8)!
-    let message = try RestlikeMessage.decode(jsonData)
+    let model = try RestlikeMessage.decode(jsonData)
 
-    XCTAssertNoDifference(message, RestlikeMessage(
+    XCTAssertNoDifference(model, RestlikeMessage(
       version: version,
       headers: Data(base64Encoded: headersB64)!,
       content: Data(base64Encoded: contentB64)!,
@@ -32,9 +32,9 @@ final class RestlikeMessageTests: XCTestCase {
       error: error
     ))
 
-    let encodedMessage = try message.encode()
-    let decodedMessage = try RestlikeMessage.decode(encodedMessage)
+    let encodedModel = try model.encode()
+    let decodedModel = try RestlikeMessage.decode(encodedModel)
 
-    XCTAssertNoDifference(decodedMessage, message)
+    XCTAssertNoDifference(decodedModel, model)
   }
 }
diff --git a/Tests/ElixxirDAppsSDKTests/Models/SingleUseCallbackReportTests.swift b/Tests/ElixxirDAppsSDKTests/Models/SingleUseCallbackReportTests.swift
index 667644815969257ddcac1774222008312d5d73ec..0f478cb70b764e9ec733b0f4fd29cb114c540a3b 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/SingleUseCallbackReportTests.swift
+++ b/Tests/ElixxirDAppsSDKTests/Models/SingleUseCallbackReportTests.swift
@@ -21,9 +21,9 @@ final class SingleUseCallbackReportTests: XCTestCase {
     }
     """
     let jsonData = jsonString.data(using: .utf8)!
-    let report = try SingleUseCallbackReport.decode(jsonData)
+    let model = try SingleUseCallbackReport.decode(jsonData)
 
-    XCTAssertNoDifference(report, SingleUseCallbackReport(
+    XCTAssertNoDifference(model, SingleUseCallbackReport(
       rounds: rounds,
       payload: Data(base64Encoded: payloadB64)!,
       partner: Data(base64Encoded: partnerB64)!,
@@ -33,9 +33,9 @@ final class SingleUseCallbackReportTests: XCTestCase {
       )
     ))
 
-    let encodedReport = try report.encode()
-    let decodedReport = try SingleUseCallbackReport.decode(encodedReport)
+    let encodedModel = try model.encode()
+    let decodedModel = try SingleUseCallbackReport.decode(encodedModel)
 
-    XCTAssertNoDifference(decodedReport, report)
+    XCTAssertNoDifference(decodedModel, model)
   }
 }
diff --git a/Tests/ElixxirDAppsSDKTests/Models/SingleUseResponseReportTests.swift b/Tests/ElixxirDAppsSDKTests/Models/SingleUseResponseReportTests.swift
index 223582b948f34a1c8f18de5c8464a33d67602fb0..f4bd95f92b294d9302ff60c3b8607bd86c134fe0 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/SingleUseResponseReportTests.swift
+++ b/Tests/ElixxirDAppsSDKTests/Models/SingleUseResponseReportTests.swift
@@ -20,9 +20,9 @@ final class SingleUseResponseReportTests: XCTestCase {
     }
     """
     let jsonData = jsonString.data(using: .utf8)!
-    let report = try SingleUseResponseReport.decode(jsonData)
+    let model = try SingleUseResponseReport.decode(jsonData)
 
-    XCTAssertNoDifference(report, SingleUseResponseReport(
+    XCTAssertNoDifference(model, SingleUseResponseReport(
       rounds: rounds,
       payload: Data(base64Encoded: payloadB64)!,
       receptionId: .init(
@@ -32,10 +32,10 @@ final class SingleUseResponseReportTests: XCTestCase {
       error: nil
     ))
 
-    let encodedReport = try report.encode()
-    let decodedReport = try SingleUseResponseReport.decode(encodedReport)
+    let encodedModel = try model.encode()
+    let decodedModel = try SingleUseResponseReport.decode(encodedModel)
 
-    XCTAssertNoDifference(decodedReport, report)
+    XCTAssertNoDifference(decodedModel, model)
   }
 
   func testDecodingReportWithError() throws {
@@ -56,9 +56,9 @@ final class SingleUseResponseReportTests: XCTestCase {
     }
     """
     let jsonData = jsonString.data(using: .utf8)!
-    let report = try SingleUseResponseReport.decode(jsonData)
+    let model = try SingleUseResponseReport.decode(jsonData)
 
-    XCTAssertNoDifference(report, SingleUseResponseReport(
+    XCTAssertNoDifference(model, SingleUseResponseReport(
       rounds: rounds,
       payload: Data(base64Encoded: payloadB64)!,
       receptionId: .init(
diff --git a/Tests/ElixxirDAppsSDKTests/Models/SingleUseSendReportTests.swift b/Tests/ElixxirDAppsSDKTests/Models/SingleUseSendReportTests.swift
index d53c49f3b3969f3f271b3f2ae2ba0b6423ac4b44..2a23b72e0e06707cf6e72f436b06974d368cf1f6 100644
--- a/Tests/ElixxirDAppsSDKTests/Models/SingleUseSendReportTests.swift
+++ b/Tests/ElixxirDAppsSDKTests/Models/SingleUseSendReportTests.swift
@@ -17,9 +17,9 @@ final class SingleUseSendReportTests: XCTestCase {
     }
     """
     let jsonData = jsonString.data(using: .utf8)!
-    let report = try SingleUseSendReport.decode(jsonData)
+    let model = try SingleUseSendReport.decode(jsonData)
 
-    XCTAssertNoDifference(report, SingleUseSendReport(
+    XCTAssertNoDifference(model, SingleUseSendReport(
       rounds: rounds,
       ephId: .init(
         ephId: ephId,
@@ -27,9 +27,9 @@ final class SingleUseSendReportTests: XCTestCase {
       )
     ))
 
-    let encodedReport = try report.encode()
-    let decodedReport = try SingleUseSendReport.decode(encodedReport)
+    let encodedModel = try model.encode()
+    let decodedModel = try SingleUseSendReport.decode(encodedModel)
 
-    XCTAssertNoDifference(decodedReport, report)
+    XCTAssertNoDifference(decodedModel, model)
   }
 }