diff --git a/Examples/xx-messenger/Tests/ContactFeatureTests/ContactFeatureTests.swift b/Examples/xx-messenger/Tests/ContactFeatureTests/ContactFeatureTests.swift
index 244cc90093c2267fd124a268982c5e65e5c57380..247abb49e226acd5ea720d8a7cd8265f6ca197ef 100644
--- a/Examples/xx-messenger/Tests/ContactFeatureTests/ContactFeatureTests.swift
+++ b/Examples/xx-messenger/Tests/ContactFeatureTests/ContactFeatureTests.swift
@@ -55,9 +55,9 @@ final class ContactFeatureTests: XCTestCase {
     var xxContact: XXClient.Contact = .unimplemented("contact-data".data(using: .utf8)!)
     xxContact.getFactsFromContact.run = { _ in
       [
-        Fact(fact: "contact-username", type: 0),
-        Fact(fact: "contact-email", type: 1),
-        Fact(fact: "contact-phone", type: 2),
+        Fact(type: .username, value: "contact-username"),
+        Fact(type: .email, value: "contact-email"),
+        Fact(type: .phone, value: "contact-phone"),
       ]
     }
 
diff --git a/Examples/xx-messenger/Tests/HomeFeatureTests/HomeFeatureTests.swift b/Examples/xx-messenger/Tests/HomeFeatureTests/HomeFeatureTests.swift
index cbc261cefd8f85153c3316d08bada0337cceea35..2d7f6dafd6f5833483112c9e7bea9912be90314e 100644
--- a/Examples/xx-messenger/Tests/HomeFeatureTests/HomeFeatureTests.swift
+++ b/Examples/xx-messenger/Tests/HomeFeatureTests/HomeFeatureTests.swift
@@ -370,7 +370,7 @@ final class HomeFeatureTests: XCTestCase {
     }
 
     XCTAssertNoDifference(dbDidFetchContacts, [.init(id: ["contact-id".data(using: .utf8)!])])
-    XCTAssertNoDifference(udDidPermanentDeleteAccount, [Fact(fact: "MyUsername", type: 0)])
+    XCTAssertNoDifference(udDidPermanentDeleteAccount, [Fact(type: .username, value: "MyUsername")])
     XCTAssertNoDifference(messengerDidDestroy, 1)
     XCTAssertNoDifference(didRemoveDB, 1)
 
diff --git a/Examples/xx-messenger/Tests/RegisterFeatureTests/RegisterFeatureTests.swift b/Examples/xx-messenger/Tests/RegisterFeatureTests/RegisterFeatureTests.swift
index 12addba7f1a5901fcf2d9424d44e791db8ab4904..6c802874d64bbd0dcf7e0ac5b9fee0de7e136d8f 100644
--- a/Examples/xx-messenger/Tests/RegisterFeatureTests/RegisterFeatureTests.swift
+++ b/Examples/xx-messenger/Tests/RegisterFeatureTests/RegisterFeatureTests.swift
@@ -63,7 +63,7 @@ final class RegisterFeatureTests: XCTestCase {
     bgQueue.advance()
 
     XCTAssertNoDifference(messengerDidRegisterUsername, ["NewUser"])
-    XCTAssertNoDifference(didSetFactsOnContact, [[Fact(fact: "NewUser", type: 0)]])
+    XCTAssertNoDifference(didSetFactsOnContact, [[Fact(type: .username, value: "NewUser")]])
     XCTAssertNoDifference(dbDidSaveContact, [
       XXModels.Contact(
         id: "contact-id".data(using: .utf8)!,
diff --git a/Examples/xx-messenger/Tests/SendRequestFeatureTests/SendRequestFeatureTests.swift b/Examples/xx-messenger/Tests/SendRequestFeatureTests/SendRequestFeatureTests.swift
index 1dbe26be1d99196abe4217b23f5daeba46fe15c7..cec3587e845624edc68ef537b00604b8a577c13c 100644
--- a/Examples/xx-messenger/Tests/SendRequestFeatureTests/SendRequestFeatureTests.swift
+++ b/Examples/xx-messenger/Tests/SendRequestFeatureTests/SendRequestFeatureTests.swift
@@ -63,9 +63,9 @@ final class SendRequestFeatureTests: XCTestCase {
 
     var myContact: XXClient.Contact = .unimplemented("my-contact-data".data(using: .utf8)!)
     let myFacts = [
-      Fact(fact: "my-username", type: 0),
-      Fact(fact: "my-email", type: 1),
-      Fact(fact: "my-phone", type: 2),
+      Fact(type: .username, value: "my-username"),
+      Fact(type: .email, value: "my-email"),
+      Fact(type: .phone, value: "my-phone"),
     ]
     myContact.getFactsFromContact.run = { _ in myFacts }
 
@@ -142,9 +142,9 @@ final class SendRequestFeatureTests: XCTestCase {
 
     var myContact: XXClient.Contact = .unimplemented("my-contact-data".data(using: .utf8)!)
     let myFacts = [
-      Fact(fact: "my-username", type: 0),
-      Fact(fact: "my-email", type: 1),
-      Fact(fact: "my-phone", type: 2),
+      Fact(type: .username, value: "my-username"),
+      Fact(type: .email, value: "my-email"),
+      Fact(type: .phone, value: "my-phone"),
     ]
     myContact.getFactsFromContact.run = { _ in myFacts }