diff --git a/SignalServiceKit/src/Loki/Protocol/Sync Messages/GroupParser.swift b/SignalServiceKit/src/Loki/Protocol/Sync Messages/ClosedGroupParser.swift
similarity index 95%
rename from SignalServiceKit/src/Loki/Protocol/Sync Messages/GroupParser.swift
rename to SignalServiceKit/src/Loki/Protocol/Sync Messages/ClosedGroupParser.swift
index 2a42e3d58..3118f569d 100644
--- a/SignalServiceKit/src/Loki/Protocol/Sync Messages/GroupParser.swift	
+++ b/SignalServiceKit/src/Loki/Protocol/Sync Messages/ClosedGroupParser.swift	
@@ -1,5 +1,5 @@
 
-@objc public final class GroupParser : NSObject {
+@objc public final class ClosedGroupParser : NSObject {
     private let data: Data
     
     @objc public init(data: Data) {
diff --git a/SignalServiceKit/src/Loki/Protocol/Sync Messages/SyncMessagesProtocol.swift b/SignalServiceKit/src/Loki/Protocol/Sync Messages/SyncMessagesProtocol.swift
index 0d73b8f51..45d611418 100644
--- a/SignalServiceKit/src/Loki/Protocol/Sync Messages/SyncMessagesProtocol.swift	
+++ b/SignalServiceKit/src/Loki/Protocol/Sync Messages/SyncMessagesProtocol.swift	
@@ -159,7 +159,11 @@ public final class SyncMessagesProtocol : NSObject {
         let wasSentByMasterDevice = (masterHexEncodedPublicKey == hexEncodedPublicKey)
         guard wasSentByMasterDevice, let contacts = syncMessage.contacts, let contactsAsData = contacts.data, contactsAsData.count > 0 else { return }
         print("[Loki] Contact sync message received.")
-        let parser = ContactParser(data: contactsAsData)
+        handleContactSyncMessageData(contactsAsData, using: transaction)
+    }
+
+    public static func handleContactSyncMessageData(_ data: Data, using transaction: YapDatabaseReadWriteTransaction) {
+        let parser = ContactParser(data: data)
         let hexEncodedPublicKeys = parser.parseHexEncodedPublicKeys()
         // Try to establish sessions
         for hexEncodedPublicKey in hexEncodedPublicKeys {
@@ -199,17 +203,17 @@ public final class SyncMessagesProtocol : NSObject {
         let wasSentByMasterDevice = (masterHexEncodedPublicKey == hexEncodedPublicKey)
         guard wasSentByMasterDevice, let groups = syncMessage.groups, let groupsAsData = groups.data, groupsAsData.count > 0 else { return }
         print("[Loki] Closed group sync message received.")
-        let parser = GroupParser(data: groupsAsData)
+        let parser = ClosedGroupParser(data: groupsAsData)
         let groupModels = parser.parseGroupModels()
         for groupModel in groupModels {
             var thread: TSGroupThread! = TSGroupThread(groupId: groupModel.groupId, transaction: transaction)
             if thread == nil {
                 thread = TSGroupThread.getOrCreateThread(with: groupModel, transaction: transaction)
                 thread.save(with: transaction)
-                ClosedGroupsProtocol.establishSessionsIfNeeded(with: groupModel.groupMemberIds, in: thread, using: transaction)
-                let infoMessage = TSInfoMessage(timestamp: NSDate.ows_millisecondTimeStamp(), in: thread, messageType: .typeGroupUpdate, customMessage: "You have joined the group.")
-                infoMessage.save(with: transaction)
             }
+            ClosedGroupsProtocol.establishSessionsIfNeeded(with: groupModel.groupMemberIds, in: thread, using: transaction)
+            let infoMessage = TSInfoMessage(timestamp: NSDate.ows_millisecondTimeStamp(), in: thread, messageType: .typeGroupUpdate, customMessage: "You have joined the group.")
+            infoMessage.save(with: transaction)
         }
     }
 
diff --git a/SignalServiceKit/src/Loki/Protocol/Sync Messages/SyncMessagesProtocolTests.swift b/SignalServiceKit/src/Loki/Protocol/Sync Messages/SyncMessagesProtocolTests.swift
new file mode 100644
index 000000000..281e4b6f9
--- /dev/null
+++ b/SignalServiceKit/src/Loki/Protocol/Sync Messages/SyncMessagesProtocolTests.swift	
@@ -0,0 +1,49 @@
+import PromiseKit
+@testable import SignalServiceKit
+import XCTest
+
+class SyncMessagesProtocolTests : XCTestCase {
+
+    private var storage: OWSPrimaryStorage { OWSPrimaryStorage.shared() }
+
+    override func setUp() {
+        super.setUp()
+        // Activate the mock environment
+        ClearCurrentAppContextForTests()
+        SetCurrentAppContext(TestAppContext())
+        MockSSKEnvironment.activate()
+        // Register a mock user
+        let identityManager = OWSIdentityManager.shared()
+        let seed = Randomness.generateRandomBytes(16)!
+        let keyPair = Curve25519.generateKeyPair(fromSeed: seed + seed)
+        let databaseConnection = identityManager.value(forKey: "dbConnection") as! YapDatabaseConnection
+        databaseConnection.setObject(keyPair, forKey: OWSPrimaryStorageIdentityKeyStoreIdentityKey, inCollection: OWSPrimaryStorageIdentityKeyStoreCollection)
+        TSAccountManager.sharedInstance().phoneNumberAwaitingVerification = keyPair.hexEncodedPublicKey
+        TSAccountManager.sharedInstance().didRegister()
+    }
+
+    func testContactSyncMessageHandling() {
+        // Let's say Alice and Bob have an ongoing conversation. Alice now links a device. Let's call Alice's master device A1
+        // and her slave device A2, and let's call Bob's device B. When Alice links A2 to A1, A2 needs to somehow establish a
+        // session with B (it already established a session with A1 when the devices were linked). How does it do this?
+        //
+        // As part of the linking process, A2 should've received a contact sync from A1. Upon receiving this contact sync,
+        // A2 should send out AFRs to the subset of the contacts it received from A1 for which it doesn't yet have a session (in
+        // theory this should be all of them).
+        let base64EncodedContactData = "AAAA7QpCMDU0ZmI2M2IxYTU4YjU1YTcwNjMxODkyOWRjNmQxMWM4ZWY3OTAxMTZhNzRjOWFmNTVmYTZhMzZlNjhmMTYzYTMyEhBZMyAoLi4uOGYxNjNhMzIpIgZvcmFuZ2UqaQpCMDU0ZmI2M2IxYTU4YjU1YTcwNjMxODkyOWRjNmQxMWM4ZWY3OTAxMTZhNzRjOWFmNTVmYTZhMzZlNjhmMTYzYTMyEiEFT7Y7Gli1WnBjGJKdxtEcjveQEWp0ya9V+mo25o8WOjIYADIgXAgtAlrJr81tnuWyk8TgJhdsKzz+yIui5mXnbcMyPk1AAAAAAOwKQjA1Nzg4MmQzM2E4OTI1NDdiOTI2NjIyYjk0ZDZjMWNmYjI1ZmY2YTczZmQ4OTZlMWIxNmY1ODI0NzRjZjQ3MDE2YhIQWTQgKC4uLmNmNDcwMTZiKSIFYnJvd24qaQpCMDU3ODgyZDMzYTg5MjU0N2I5MjY2MjJiOTRkNmMxY2ZiMjVmZjZhNzNmZDg5NmUxYjE2ZjU4MjQ3NGNmNDcwMTZiEiEFeILTOoklR7kmYiuU1sHPsl/2pz/YluGxb1gkdM9HAWsYADIgD1QA1ofVIccRhbx8AnbygQYo5iOiyGUMG/sGNP1ENRJAAAAAAPAKQjA1OTUyYTRiNTFjNDJkZWE2OWEwYWNhNWU2OTgxYTQ2MDk0NGI2Yjc0NjdkOWQ5OTliOWU3NjExNzdkYWI1NzIxMxIQWTEgKC4uLmRhYjU3MjEzKSIJYmx1ZV9ncmV5KmkKQjA1OTUyYTRiNTFjNDJkZWE2OWEwYWNhNWU2OTgxYTQ2MDk0NGI2Yjc0NjdkOWQ5OTliOWU3NjExNzdkYWI1NzIxMxIhBZUqS1HELeppoKyl5pgaRglEtrdGfZ2Zm552EXfatXITGAAyIBkyX0S08IAuov6faUvaxYsfJtdpww1G4LF6bG5vG7L+QAA="
+        let contactData = Data(base64Encoded: base64EncodedContactData)!
+        let parser = ContactParser(data: contactData)
+        let hexEncodedPublicKeys = parser.parseHexEncodedPublicKeys()
+        storage.dbReadWriteConnection.readWrite { transaction in
+            SyncMessagesProtocol.handleContactSyncMessageData(contactData, using: transaction)
+        }
+        hexEncodedPublicKeys.forEach { hexEncodedPublicKey in
+            var thread: TSContactThread!
+            storage.dbReadWriteConnection.readWrite { transaction in
+                thread = TSContactThread.getOrCreateThread(withContactId: hexEncodedPublicKey, transaction: transaction)
+            }
+            XCTAssert(thread.friendRequestStatus == .requestSent)
+        }
+        // TODO: Test the case where Bob has multiple devices
+    }
+}