diff --git a/Podfile b/Podfile
index 69607231f..646ffe3b4 100644
--- a/Podfile
+++ b/Podfile
@@ -94,7 +94,10 @@ abstract_target 'GlobalDependencies' do
         pod 'Nimble'
         
         # Need to include these for the tests because otherwise it won't actually build
+        pod 'SAMKeychain'
+        pod 'PureLayout', '~> 3.1.8'
         pod 'YYImage/libwebp', git: 'https://github.com/signalapp/YYImage'
+        pod 'DifferenceKit'
       end
     end
   end
diff --git a/Podfile.lock b/Podfile.lock
index be5d70d3e..ac224cfb4 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -131,6 +131,6 @@ SPEC CHECKSUMS:
   WebRTC-lib: d83df8976fa608b980f1d85796b3de66d60a1953
   YYImage: f1ddd15ac032a58b78bbed1e012b50302d318331
 
-PODFILE CHECKSUM: 2f2ab5029f554a2a802b5c59be8de1a307d19e76
+PODFILE CHECKSUM: abfefa57c8a0a69a408ccc48345be949e33ce774
 
 COCOAPODS: 1.15.2
diff --git a/Session.xcodeproj/xcshareddata/xcschemes/Session.xcscheme b/Session.xcodeproj/xcshareddata/xcschemes/Session.xcscheme
index 9f8a26898..22887c56e 100644
--- a/Session.xcodeproj/xcshareddata/xcschemes/Session.xcscheme
+++ b/Session.xcodeproj/xcshareddata/xcschemes/Session.xcscheme
@@ -168,6 +168,18 @@
                ReferencedContainer = "container:Session.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES"
+            testExecutionOrdering = "random">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "FD7C37AD2BBB8B1D009DEEA7"
+               BuildableName = "SessionSnodeKitTests.xctest"
+               BlueprintName = "SessionSnodeKitTests"
+               ReferencedContainer = "container:Session.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
diff --git a/Session.xcodeproj/xcshareddata/xcschemes/SessionSnodeKit.xcscheme b/Session.xcodeproj/xcshareddata/xcschemes/SessionSnodeKit.xcscheme
new file mode 100644
index 000000000..abffbecab
--- /dev/null
+++ b/Session.xcodeproj/xcshareddata/xcschemes/SessionSnodeKit.xcscheme
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1520"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C3C2A59E255385C100C340D1"
+               BuildableName = "SessionSnodeKit.framework"
+               BlueprintName = "SessionSnodeKit"
+               ReferencedContainer = "container:Session.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "App Store Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C3C2A59E255385C100C340D1"
+            BuildableName = "SessionSnodeKit.framework"
+            BlueprintName = "SessionSnodeKit"
+            ReferencedContainer = "container:Session.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "App Store Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/SessionMessagingKitTests/Open Groups/OpenGroupAPISpec.swift b/SessionMessagingKitTests/Open Groups/OpenGroupAPISpec.swift
index 8c0de628a..13653f572 100644
--- a/SessionMessagingKitTests/Open Groups/OpenGroupAPISpec.swift	
+++ b/SessionMessagingKitTests/Open Groups/OpenGroupAPISpec.swift	
@@ -532,7 +532,9 @@ class OpenGroupAPISpec: QuickSpec {
                     }
                 }
             }
-            
+        }
+        
+        describe("an OpenGroupAPI") {
             // MARK: -- when preparing a capabilitiesAndRooms request
             context("when preparing a capabilitiesAndRooms request") {
                 // MARK: ---- generates the request correctly
@@ -1355,7 +1357,9 @@ class OpenGroupAPISpec: QuickSpec {
                         .to(contain("TestFileName"))
                 }
             }
-            
+        }
+        
+        describe("an OpenGroupAPI") {
             // MARK: -- when preparing a download file request
             context("when preparing a download file request") {
                 // MARK: ---- generates the request correctly
@@ -1620,7 +1624,9 @@ class OpenGroupAPISpec: QuickSpec {
                         .to(equal(.roomDeleteMessages("testRoom", sessionId: "testUserId")))
                 }
             }
-            
+        }
+        
+        describe("an OpenGroupAPI") {
             // MARK: -- when signing
             context("when signing") {
                 // MARK: ---- fails when there is no serverPublicKey