diff --git a/UnitTests/BracketTests.mm b/UnitTests/ObjCTests/BracketTests.mm
similarity index 100%
rename from UnitTests/BracketTests.mm
rename to UnitTests/ObjCTests/BracketTests.mm
diff --git a/UnitTests/HasherTests.m b/UnitTests/ObjCTests/HasherTests.m
similarity index 100%
rename from UnitTests/HasherTests.m
rename to UnitTests/ObjCTests/HasherTests.m
diff --git a/UnitTests/MPAliasRequestTests.m b/UnitTests/ObjCTests/MPAliasRequestTests.m
similarity index 100%
rename from UnitTests/MPAliasRequestTests.m
rename to UnitTests/ObjCTests/MPAliasRequestTests.m
diff --git a/UnitTests/MPAliasResponseTests.m b/UnitTests/ObjCTests/MPAliasResponseTests.m
similarity index 100%
rename from UnitTests/MPAliasResponseTests.m
rename to UnitTests/ObjCTests/MPAliasResponseTests.m
diff --git a/UnitTests/MPAppNotificationHandlerTests.m b/UnitTests/ObjCTests/MPAppNotificationHandlerTests.m
similarity index 100%
rename from UnitTests/MPAppNotificationHandlerTests.m
rename to UnitTests/ObjCTests/MPAppNotificationHandlerTests.m
diff --git a/UnitTests/MPBackendControllerTests.m b/UnitTests/ObjCTests/MPBackendControllerTests.m
similarity index 100%
rename from UnitTests/MPBackendControllerTests.m
rename to UnitTests/ObjCTests/MPBackendControllerTests.m
diff --git a/UnitTests/MPBaseTestCase.h b/UnitTests/ObjCTests/MPBaseTestCase.h
similarity index 100%
rename from UnitTests/MPBaseTestCase.h
rename to UnitTests/ObjCTests/MPBaseTestCase.h
diff --git a/UnitTests/MPBaseTestCase.m b/UnitTests/ObjCTests/MPBaseTestCase.m
similarity index 100%
rename from UnitTests/MPBaseTestCase.m
rename to UnitTests/ObjCTests/MPBaseTestCase.m
diff --git a/UnitTests/MPBase_Attribute_Event_ProjectionTests.m b/UnitTests/ObjCTests/MPBase_Attribute_Event_ProjectionTests.m
similarity index 100%
rename from UnitTests/MPBase_Attribute_Event_ProjectionTests.m
rename to UnitTests/ObjCTests/MPBase_Attribute_Event_ProjectionTests.m
diff --git a/UnitTests/MPCCPAConsentTests.m b/UnitTests/ObjCTests/MPCCPAConsentTests.m
similarity index 100%
rename from UnitTests/MPCCPAConsentTests.m
rename to UnitTests/ObjCTests/MPCCPAConsentTests.m
diff --git a/UnitTests/MPCommerceEventTests.m b/UnitTests/ObjCTests/MPCommerceEventTests.m
similarity index 100%
rename from UnitTests/MPCommerceEventTests.m
rename to UnitTests/ObjCTests/MPCommerceEventTests.m
diff --git a/UnitTests/MPConnectorTests.m b/UnitTests/ObjCTests/MPConnectorTests.m
similarity index 100%
rename from UnitTests/MPConnectorTests.m
rename to UnitTests/ObjCTests/MPConnectorTests.m
diff --git a/UnitTests/MPConsentKitFilterTests.m b/UnitTests/ObjCTests/MPConsentKitFilterTests.m
similarity index 100%
rename from UnitTests/MPConsentKitFilterTests.m
rename to UnitTests/ObjCTests/MPConsentKitFilterTests.m
diff --git a/UnitTests/MPConsentSerializationTests.m b/UnitTests/ObjCTests/MPConsentSerializationTests.m
similarity index 100%
rename from UnitTests/MPConsentSerializationTests.m
rename to UnitTests/ObjCTests/MPConsentSerializationTests.m
diff --git a/UnitTests/MPConsentStateTests.m b/UnitTests/ObjCTests/MPConsentStateTests.m
similarity index 100%
rename from UnitTests/MPConsentStateTests.m
rename to UnitTests/ObjCTests/MPConsentStateTests.m
diff --git a/UnitTests/MPConsumerInfoTests.m b/UnitTests/ObjCTests/MPConsumerInfoTests.m
similarity index 100%
rename from UnitTests/MPConsumerInfoTests.m
rename to UnitTests/ObjCTests/MPConsumerInfoTests.m
diff --git a/UnitTests/MPConvertJSTests.m b/UnitTests/ObjCTests/MPConvertJSTests.m
similarity index 100%
rename from UnitTests/MPConvertJSTests.m
rename to UnitTests/ObjCTests/MPConvertJSTests.m
diff --git a/UnitTests/MPCustomModuleTests.m b/UnitTests/ObjCTests/MPCustomModuleTests.m
similarity index 100%
rename from UnitTests/MPCustomModuleTests.m
rename to UnitTests/ObjCTests/MPCustomModuleTests.m
diff --git a/UnitTests/MPDataModelTests.m b/UnitTests/ObjCTests/MPDataModelTests.m
similarity index 100%
rename from UnitTests/MPDataModelTests.m
rename to UnitTests/ObjCTests/MPDataModelTests.m
diff --git a/UnitTests/MPDataPlanFilterTests.m b/UnitTests/ObjCTests/MPDataPlanFilterTests.m
similarity index 100%
rename from UnitTests/MPDataPlanFilterTests.m
rename to UnitTests/ObjCTests/MPDataPlanFilterTests.m
diff --git a/UnitTests/MPDateFormatterTests.m b/UnitTests/ObjCTests/MPDateFormatterTests.m
similarity index 100%
rename from UnitTests/MPDateFormatterTests.m
rename to UnitTests/ObjCTests/MPDateFormatterTests.m
diff --git a/UnitTests/MPDeviceTests.m b/UnitTests/ObjCTests/MPDeviceTests.m
similarity index 100%
rename from UnitTests/MPDeviceTests.m
rename to UnitTests/ObjCTests/MPDeviceTests.m
diff --git a/UnitTests/MPEventTests.m b/UnitTests/ObjCTests/MPEventTests.m
similarity index 100%
rename from UnitTests/MPEventTests.m
rename to UnitTests/ObjCTests/MPEventTests.m
diff --git a/UnitTests/MPForwardQueueItemTests.m b/UnitTests/ObjCTests/MPForwardQueueItemTests.m
similarity index 100%
rename from UnitTests/MPForwardQueueItemTests.m
rename to UnitTests/ObjCTests/MPForwardQueueItemTests.m
diff --git a/UnitTests/MPForwardRecordTests.m b/UnitTests/ObjCTests/MPForwardRecordTests.m
similarity index 100%
rename from UnitTests/MPForwardRecordTests.m
rename to UnitTests/ObjCTests/MPForwardRecordTests.m
diff --git a/UnitTests/MPGDPRConsentTests.m b/UnitTests/ObjCTests/MPGDPRConsentTests.m
similarity index 100%
rename from UnitTests/MPGDPRConsentTests.m
rename to UnitTests/ObjCTests/MPGDPRConsentTests.m
diff --git a/UnitTests/MPIdentityApiRequestTests.m b/UnitTests/ObjCTests/MPIdentityApiRequestTests.m
similarity index 100%
rename from UnitTests/MPIdentityApiRequestTests.m
rename to UnitTests/ObjCTests/MPIdentityApiRequestTests.m
diff --git a/UnitTests/MPIdentityCachingTests.m b/UnitTests/ObjCTests/MPIdentityCachingTests.m
similarity index 100%
rename from UnitTests/MPIdentityCachingTests.m
rename to UnitTests/ObjCTests/MPIdentityCachingTests.m
diff --git a/UnitTests/MPIdentityTests.m b/UnitTests/ObjCTests/MPIdentityTests.m
similarity index 100%
rename from UnitTests/MPIdentityTests.m
rename to UnitTests/ObjCTests/MPIdentityTests.m
diff --git a/UnitTests/MPIntegrationAttributesTest.m b/UnitTests/ObjCTests/MPIntegrationAttributesTest.m
similarity index 100%
rename from UnitTests/MPIntegrationAttributesTest.m
rename to UnitTests/ObjCTests/MPIntegrationAttributesTest.m
diff --git a/UnitTests/MPKitAPITests.m b/UnitTests/ObjCTests/MPKitAPITests.m
similarity index 100%
rename from UnitTests/MPKitAPITests.m
rename to UnitTests/ObjCTests/MPKitAPITests.m
diff --git a/UnitTests/MPKitActivityTests.m b/UnitTests/ObjCTests/MPKitActivityTests.m
similarity index 100%
rename from UnitTests/MPKitActivityTests.m
rename to UnitTests/ObjCTests/MPKitActivityTests.m
diff --git a/UnitTests/MPKitAppsFlyerTest.h b/UnitTests/ObjCTests/MPKitAppsFlyerTest.h
similarity index 100%
rename from UnitTests/MPKitAppsFlyerTest.h
rename to UnitTests/ObjCTests/MPKitAppsFlyerTest.h
diff --git a/UnitTests/MPKitAppsFlyerTest.m b/UnitTests/ObjCTests/MPKitAppsFlyerTest.m
similarity index 100%
rename from UnitTests/MPKitAppsFlyerTest.m
rename to UnitTests/ObjCTests/MPKitAppsFlyerTest.m
diff --git a/UnitTests/MPKitConfigurationTests.mm b/UnitTests/ObjCTests/MPKitConfigurationTests.mm
similarity index 100%
rename from UnitTests/MPKitConfigurationTests.mm
rename to UnitTests/ObjCTests/MPKitConfigurationTests.mm
diff --git a/UnitTests/MPKitContainerTests.m b/UnitTests/ObjCTests/MPKitContainerTests.m
similarity index 100%
rename from UnitTests/MPKitContainerTests.m
rename to UnitTests/ObjCTests/MPKitContainerTests.m
diff --git a/UnitTests/MPKitRegisterTests.m b/UnitTests/ObjCTests/MPKitRegisterTests.m
similarity index 100%
rename from UnitTests/MPKitRegisterTests.m
rename to UnitTests/ObjCTests/MPKitRegisterTests.m
diff --git a/UnitTests/MPKitSecondTestClass.h b/UnitTests/ObjCTests/MPKitSecondTestClass.h
similarity index 100%
rename from UnitTests/MPKitSecondTestClass.h
rename to UnitTests/ObjCTests/MPKitSecondTestClass.h
diff --git a/UnitTests/MPKitSecondTestClass.m b/UnitTests/ObjCTests/MPKitSecondTestClass.m
similarity index 100%
rename from UnitTests/MPKitSecondTestClass.m
rename to UnitTests/ObjCTests/MPKitSecondTestClass.m
diff --git a/UnitTests/MPKitSecondTestClassNoStartImmediately.h b/UnitTests/ObjCTests/MPKitSecondTestClassNoStartImmediately.h
similarity index 100%
rename from UnitTests/MPKitSecondTestClassNoStartImmediately.h
rename to UnitTests/ObjCTests/MPKitSecondTestClassNoStartImmediately.h
diff --git a/UnitTests/MPKitSecondTestClassNoStartImmediately.m b/UnitTests/ObjCTests/MPKitSecondTestClassNoStartImmediately.m
similarity index 100%
rename from UnitTests/MPKitSecondTestClassNoStartImmediately.m
rename to UnitTests/ObjCTests/MPKitSecondTestClassNoStartImmediately.m
diff --git a/UnitTests/MPKitTestClass.h b/UnitTests/ObjCTests/MPKitTestClass.h
similarity index 100%
rename from UnitTests/MPKitTestClass.h
rename to UnitTests/ObjCTests/MPKitTestClass.h
diff --git a/UnitTests/MPKitTestClass.m b/UnitTests/ObjCTests/MPKitTestClass.m
similarity index 100%
rename from UnitTests/MPKitTestClass.m
rename to UnitTests/ObjCTests/MPKitTestClass.m
diff --git a/UnitTests/MPKitTestClassNoStartImmediately.h b/UnitTests/ObjCTests/MPKitTestClassNoStartImmediately.h
similarity index 100%
rename from UnitTests/MPKitTestClassNoStartImmediately.h
rename to UnitTests/ObjCTests/MPKitTestClassNoStartImmediately.h
diff --git a/UnitTests/MPKitTestClassNoStartImmediately.m b/UnitTests/ObjCTests/MPKitTestClassNoStartImmediately.m
similarity index 100%
rename from UnitTests/MPKitTestClassNoStartImmediately.m
rename to UnitTests/ObjCTests/MPKitTestClassNoStartImmediately.m
diff --git a/UnitTests/MPKitTestClassSideloaded.h b/UnitTests/ObjCTests/MPKitTestClassSideloaded.h
similarity index 100%
rename from UnitTests/MPKitTestClassSideloaded.h
rename to UnitTests/ObjCTests/MPKitTestClassSideloaded.h
diff --git a/UnitTests/MPKitTestClassSideloaded.m b/UnitTests/ObjCTests/MPKitTestClassSideloaded.m
similarity index 100%
rename from UnitTests/MPKitTestClassSideloaded.m
rename to UnitTests/ObjCTests/MPKitTestClassSideloaded.m
diff --git a/UnitTests/MPLaunchInfoTests.m b/UnitTests/ObjCTests/MPLaunchInfoTests.m
similarity index 100%
rename from UnitTests/MPLaunchInfoTests.m
rename to UnitTests/ObjCTests/MPLaunchInfoTests.m
diff --git a/UnitTests/MPMessageBuilderTests.m b/UnitTests/ObjCTests/MPMessageBuilderTests.m
similarity index 100%
rename from UnitTests/MPMessageBuilderTests.m
rename to UnitTests/ObjCTests/MPMessageBuilderTests.m
diff --git a/UnitTests/MPMessageTests.m b/UnitTests/ObjCTests/MPMessageTests.m
similarity index 100%
rename from UnitTests/MPMessageTests.m
rename to UnitTests/ObjCTests/MPMessageTests.m
diff --git a/UnitTests/MPNetworkCommunication+Tests.h b/UnitTests/ObjCTests/MPNetworkCommunication+Tests.h
similarity index 100%
rename from UnitTests/MPNetworkCommunication+Tests.h
rename to UnitTests/ObjCTests/MPNetworkCommunication+Tests.h
diff --git a/UnitTests/MPNetworkCommunicationTests.m b/UnitTests/ObjCTests/MPNetworkCommunicationTests.m
similarity index 100%
rename from UnitTests/MPNetworkCommunicationTests.m
rename to UnitTests/ObjCTests/MPNetworkCommunicationTests.m
diff --git a/UnitTests/MPNotificationController+Tests.h b/UnitTests/ObjCTests/MPNotificationController+Tests.h
similarity index 100%
rename from UnitTests/MPNotificationController+Tests.h
rename to UnitTests/ObjCTests/MPNotificationController+Tests.h
diff --git a/UnitTests/MPPersistenceControllerTests.mm b/UnitTests/ObjCTests/MPPersistenceControllerTests.mm
similarity index 100%
rename from UnitTests/MPPersistenceControllerTests.mm
rename to UnitTests/ObjCTests/MPPersistenceControllerTests.mm
diff --git a/UnitTests/MPResponseConfigTests.m b/UnitTests/ObjCTests/MPResponseConfigTests.m
similarity index 100%
rename from UnitTests/MPResponseConfigTests.m
rename to UnitTests/ObjCTests/MPResponseConfigTests.m
diff --git a/UnitTests/MPResponseEventsTest.m b/UnitTests/ObjCTests/MPResponseEventsTest.m
similarity index 100%
rename from UnitTests/MPResponseEventsTest.m
rename to UnitTests/ObjCTests/MPResponseEventsTest.m
diff --git a/UnitTests/MPRoktTests.m b/UnitTests/ObjCTests/MPRoktTests.m
similarity index 100%
rename from UnitTests/MPRoktTests.m
rename to UnitTests/ObjCTests/MPRoktTests.m
diff --git a/UnitTests/MPStateMachineTests.m b/UnitTests/ObjCTests/MPStateMachineTests.m
similarity index 100%
rename from UnitTests/MPStateMachineTests.m
rename to UnitTests/ObjCTests/MPStateMachineTests.m
diff --git a/UnitTests/MPSurrogateAppDelegateTests.m b/UnitTests/ObjCTests/MPSurrogateAppDelegateTests.m
similarity index 100%
rename from UnitTests/MPSurrogateAppDelegateTests.m
rename to UnitTests/ObjCTests/MPSurrogateAppDelegateTests.m
diff --git a/UnitTests/MPURLRequestBuilderTests.m b/UnitTests/ObjCTests/MPURLRequestBuilderTests.m
similarity index 100%
rename from UnitTests/MPURLRequestBuilderTests.m
rename to UnitTests/ObjCTests/MPURLRequestBuilderTests.m
diff --git a/UnitTests/MPUploadBuilderTests.m b/UnitTests/ObjCTests/MPUploadBuilderTests.m
similarity index 100%
rename from UnitTests/MPUploadBuilderTests.m
rename to UnitTests/ObjCTests/MPUploadBuilderTests.m
diff --git a/UnitTests/MPUserAttributeChangeTests.m b/UnitTests/ObjCTests/MPUserAttributeChangeTests.m
similarity index 100%
rename from UnitTests/MPUserAttributeChangeTests.m
rename to UnitTests/ObjCTests/MPUserAttributeChangeTests.m
diff --git a/UnitTests/MPUserDefaultsTests.m b/UnitTests/ObjCTests/MPUserDefaultsTests.m
similarity index 100%
rename from UnitTests/MPUserDefaultsTests.m
rename to UnitTests/ObjCTests/MPUserDefaultsTests.m
diff --git a/UnitTests/MPUserIdentityChangeTests.m b/UnitTests/ObjCTests/MPUserIdentityChangeTests.m
similarity index 100%
rename from UnitTests/MPUserIdentityChangeTests.m
rename to UnitTests/ObjCTests/MPUserIdentityChangeTests.m
diff --git a/UnitTests/MPZipTests.m b/UnitTests/ObjCTests/MPZipTests.m
similarity index 100%
rename from UnitTests/MPZipTests.m
rename to UnitTests/ObjCTests/MPZipTests.m
diff --git a/UnitTests/MParticleTests.m b/UnitTests/ObjCTests/MParticleTests.m
similarity index 100%
rename from UnitTests/MParticleTests.m
rename to UnitTests/ObjCTests/MParticleTests.m
diff --git a/UnitTests/MParticleUserTests.m b/UnitTests/ObjCTests/MParticleUserTests.m
similarity index 100%
rename from UnitTests/MParticleUserTests.m
rename to UnitTests/ObjCTests/MParticleUserTests.m
diff --git a/UnitTests/MParticleWebViewTests.m b/UnitTests/ObjCTests/MParticleWebViewTests.m
similarity index 100%
rename from UnitTests/MParticleWebViewTests.m
rename to UnitTests/ObjCTests/MParticleWebViewTests.m
diff --git a/UnitTests/NSNumber+MPFormatterTests.m b/UnitTests/ObjCTests/NSNumber+MPFormatterTests.m
similarity index 100%
rename from UnitTests/NSNumber+MPFormatterTests.m
rename to UnitTests/ObjCTests/NSNumber+MPFormatterTests.m
diff --git a/UnitTests/MPAttributionResult+MParticlePrivateTests.swift b/UnitTests/SwiftTests/MPAttributionResult+MParticlePrivateTests.swift
similarity index 100%
rename from UnitTests/MPAttributionResult+MParticlePrivateTests.swift
rename to UnitTests/SwiftTests/MPAttributionResult+MParticlePrivateTests.swift
diff --git a/UnitTests/MPEventTests.swift b/UnitTests/SwiftTests/MPEventTests.swift
similarity index 100%
rename from UnitTests/MPEventTests.swift
rename to UnitTests/SwiftTests/MPEventTests.swift
diff --git a/UnitTests/MPIdentityTests.swift b/UnitTests/SwiftTests/MPIdentityTests.swift
similarity index 100%
rename from UnitTests/MPIdentityTests.swift
rename to UnitTests/SwiftTests/MPIdentityTests.swift
diff --git a/UnitTests/MPNetworkOptions+MParticlePrivateTests.swift b/UnitTests/SwiftTests/MPNetworkOptions+MParticlePrivateTests.swift
similarity index 100%
rename from UnitTests/MPNetworkOptions+MParticlePrivateTests.swift
rename to UnitTests/SwiftTests/MPNetworkOptions+MParticlePrivateTests.swift
diff --git a/UnitTests/MParticleOptions+MParticlePrivateTests.swift b/UnitTests/SwiftTests/MParticleOptions+MParticlePrivateTests.swift
similarity index 100%
rename from UnitTests/MParticleOptions+MParticlePrivateTests.swift
rename to UnitTests/SwiftTests/MParticleOptions+MParticlePrivateTests.swift
diff --git a/UnitTests/MParticleSession+MParticlePrivateTests.swift b/UnitTests/SwiftTests/MParticleSession+MParticlePrivateTests.swift
similarity index 100%
rename from UnitTests/MParticleSession+MParticlePrivateTests.swift
rename to UnitTests/SwiftTests/MParticleSession+MParticlePrivateTests.swift
diff --git a/UnitTests/MParticleTestsSwift.swift b/UnitTests/SwiftTests/MParticleTestsSwift.swift
similarity index 100%
rename from UnitTests/MParticleTestsSwift.swift
rename to UnitTests/SwiftTests/MParticleTestsSwift.swift
diff --git a/UnitTests/NSArray+MPCaseInsensitiveTests.swift b/UnitTests/SwiftTests/NSArray+MPCaseInsensitiveTests.swift
similarity index 100%
rename from UnitTests/NSArray+MPCaseInsensitiveTests.swift
rename to UnitTests/SwiftTests/NSArray+MPCaseInsensitiveTests.swift
diff --git a/UnitTests/NSString+MPPercentEscapeTests.swift b/UnitTests/SwiftTests/NSString+MPPercentEscapeTests.swift
similarity index 100%
rename from UnitTests/NSString+MPPercentEscapeTests.swift
rename to UnitTests/SwiftTests/NSString+MPPercentEscapeTests.swift
diff --git a/UnitTests/SettingsProviderTests.swift b/UnitTests/SwiftTests/SettingsProviderTests.swift
similarity index 100%
rename from UnitTests/SettingsProviderTests.swift
rename to UnitTests/SwiftTests/SettingsProviderTests.swift
diff --git a/mParticle-Apple-SDK.xcodeproj/project.pbxproj b/mParticle-Apple-SDK.xcodeproj/project.pbxproj
index cf3b7f5a7..765b2e390 100644
--- a/mParticle-Apple-SDK.xcodeproj/project.pbxproj
+++ b/mParticle-Apple-SDK.xcodeproj/project.pbxproj
@@ -1314,23 +1314,45 @@
 		53A79C6729CE019E00E7489F /* UnitTests */ = {
 			isa = PBXGroup;
 			children = (
+				7231B8112EB947F0001565E5 /* SwiftTests */,
+				7231B8102EB946C1001565E5 /* ObjCTests */,
 				356D4A572E58B01100CB69FE /* Mocks */,
-				359BAFFE2E575AF500A8A704 /* SettingsProviderTests.swift */,
 				359BAFEA2E55EE0C00A8A704 /* MParticle+PrivateMethods.h */,
-				359BAFE72E55ED7D00A8A704 /* MParticleTestsSwift.swift */,
-				35329FF42E54CB84009AC4FD /* MParticleOptions+MParticlePrivateTests.swift */,
-				35329FEB2E54C480009AC4FD /* MPNetworkOptions+MParticlePrivateTests.swift */,
-				35E3FCD12E549AED00DB5B18 /* MParticleSession+MParticlePrivateTests.swift */,
-				35E3FCC22E53B5C200DB5B18 /* MPAttributionResult+MParticlePrivateTests.swift */,
-				72FEBD162E86FE2D00B8341F /* MPIdentityTests.swift */,
-				72D356522E8460020012A0C2 /* MPEventTests.swift */,
 				53A79C8729CE019F00E7489F /* Libraries */,
 				53A79C9729CE019F00E7489F /* JSON */,
 				53A79CB429CE019F00E7489F /* Info.plist */,
 				53A79C7129CE019E00E7489F /* mParticle_iOS_SDKTests-Bridging-Header.h */,
-				53E20DC62CBFFCD200146A97 /* NSArray+MPCaseInsensitiveTests.swift */,
-				D3961CE32CC0C2A0003B3194 /* NSString+MPPercentEscapeTests.swift */,
-				53A79C6829CE019E00E7489F /* MPPersistenceControllerTests.mm */,
+			);
+			path = UnitTests;
+			sourceTree = "<group>";
+		};
+		53A79C8729CE019F00E7489F /* Libraries */ = {
+			isa = PBXGroup;
+			children = (
+				53A79C8829CE019F00E7489F /* OCMock.xcframework */,
+			);
+			path = Libraries;
+			sourceTree = "<group>";
+		};
+		53A79C9729CE019F00E7489F /* JSON */ = {
+			isa = PBXGroup;
+			children = (
+				53A79C9829CE019F00E7489F /* sample_dataplan2.json */,
+			);
+			path = JSON;
+			sourceTree = "<group>";
+		};
+		53A79CFA29CE046800E7489F /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				53A79CFB29CE046800E7489F /* libsqlite3.tbd */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		7231B8102EB946C1001565E5 /* ObjCTests */ = {
+			isa = PBXGroup;
+			children = (
 				53A79C6929CE019E00E7489F /* MParticleWebViewTests.m */,
 				53A79C6A29CE019E00E7489F /* MPKitAppsFlyerTest.h */,
 				53A79C6B29CE019E00E7489F /* MPKitTestClassSideloaded.m */,
@@ -1398,33 +1420,27 @@
 				53A79CB629CE019F00E7489F /* MPKitRegisterTests.m */,
 				53A79CB729CE019F00E7489F /* HasherTests.m */,
 				7E15B2052D94617900C1FF3E /* MPRoktTests.m */,
+				53A79C6829CE019E00E7489F /* MPPersistenceControllerTests.mm */,
 				531BCF392B28A83E00F5C573 /* MPIdentityCachingTests.m */,
 			);
-			path = UnitTests;
-			sourceTree = "<group>";
-		};
-		53A79C8729CE019F00E7489F /* Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				53A79C8829CE019F00E7489F /* OCMock.xcframework */,
-			);
-			path = Libraries;
-			sourceTree = "<group>";
-		};
-		53A79C9729CE019F00E7489F /* JSON */ = {
-			isa = PBXGroup;
-			children = (
-				53A79C9829CE019F00E7489F /* sample_dataplan2.json */,
-			);
-			path = JSON;
+			path = ObjCTests;
 			sourceTree = "<group>";
 		};
-		53A79CFA29CE046800E7489F /* Frameworks */ = {
+		7231B8112EB947F0001565E5 /* SwiftTests */ = {
 			isa = PBXGroup;
 			children = (
-				53A79CFB29CE046800E7489F /* libsqlite3.tbd */,
+				359BAFFE2E575AF500A8A704 /* SettingsProviderTests.swift */,
+				359BAFE72E55ED7D00A8A704 /* MParticleTestsSwift.swift */,
+				35329FF42E54CB84009AC4FD /* MParticleOptions+MParticlePrivateTests.swift */,
+				35329FEB2E54C480009AC4FD /* MPNetworkOptions+MParticlePrivateTests.swift */,
+				35E3FCD12E549AED00DB5B18 /* MParticleSession+MParticlePrivateTests.swift */,
+				35E3FCC22E53B5C200DB5B18 /* MPAttributionResult+MParticlePrivateTests.swift */,
+				72FEBD162E86FE2D00B8341F /* MPIdentityTests.swift */,
+				72D356522E8460020012A0C2 /* MPEventTests.swift */,
+				53E20DC62CBFFCD200146A97 /* NSArray+MPCaseInsensitiveTests.swift */,
+				D3961CE32CC0C2A0003B3194 /* NSString+MPPercentEscapeTests.swift */,
 			);
-			name = Frameworks;
+			path = SwiftTests;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */