diff --git a/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj b/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj
index 2b3289e0a..230d0317d 100644
--- a/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj
+++ b/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj
@@ -96,6 +96,8 @@
 		3C6299A92BEEA46C00649187 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 3C6299A82BEEA46C00649187 /* PrivacyInfo.xcprivacy */; };
 		3C6299AB2BEEA4C000649187 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 3C6299AA2BEEA4C000649187 /* PrivacyInfo.xcprivacy */; };
 		3C67F77A2BEB2B710085A0F0 /* SwitchUserIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C67F7792BEB2B710085A0F0 /* SwitchUserIntegrationTests.swift */; };
+		3C7021E32ECF0821001768C6 /* OneSignalFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E2400381D4FFC31008BDE70 /* OneSignalFramework.framework */; };
+		3C7021E42ECF0821001768C6 /* OneSignalFramework.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3E2400381D4FFC31008BDE70 /* OneSignalFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		3C70FA672D0B68A100031066 /* OneSignalClientError.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C70FA652D0B68A100031066 /* OneSignalClientError.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3C70FA682D0B68A100031066 /* OneSignalClientError.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C70FA662D0B68A100031066 /* OneSignalClientError.m */; };
 		3C789DBD293C2206004CF83D /* OSFocusInfluenceParam.m in Sources */ = {isa = PBXBuildFile; fileRef = 7A600B432453790700514A53 /* OSFocusInfluenceParam.m */; };
@@ -643,6 +645,13 @@
 			remoteGlobalIDString = 3C115160289A259500565C41;
 			remoteInfo = OneSignalOSCore;
 		};
+		3C7021E52ECF0821001768C6 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 37747F8B19147D6400558FAD /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 3E2400371D4FFC31008BDE70;
+			remoteInfo = OneSignalFramework;
+		};
 		3C7A39C32B7BED900082665E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 37747F8B19147D6400558FAD /* Project object */;
@@ -1207,6 +1216,7 @@
 				DEBAAE2F2A4211DA00BF2C1C /* OneSignalInAppMessages.framework in Embed Frameworks */,
 				475F47252B8E398E00EC05B3 /* OneSignalLiveActivities.framework in Embed Frameworks */,
 				3C8544BD2C5AEFF700F542A9 /* OneSignalOSCoreMocks.framework in Embed Frameworks */,
+				3C7021E42ECF0821001768C6 /* OneSignalFramework.framework in Embed Frameworks */,
 				DEA4B4632888C4DC00E9FE12 /* OneSignalOutcomes.framework in Embed Frameworks */,
 				3CEE934B2B7C73B6008440BD /* OneSignalUserMocks.framework in Embed Frameworks */,
 				DEA4B45D2888C1D000E9FE12 /* OneSignalCore.framework in Embed Frameworks */,
@@ -1939,6 +1949,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				3C7021E32ECF0821001768C6 /* OneSignalFramework.framework in Frameworks */,
 				3C11518E289AF83600565C41 /* OneSignalOSCore.framework in Frameworks */,
 				DE3784852888D00300453A8E /* OneSignalUser.framework in Frameworks */,
 				DEBAAE2E2A4211DA00BF2C1C /* OneSignalInAppMessages.framework in Frameworks */,
@@ -3725,6 +3736,7 @@
 				3CEE934D2B7C73B6008440BD /* PBXTargetDependency */,
 				475F47232B8E398E00EC05B3 /* PBXTargetDependency */,
 				3C8544BB2C5AEFF700F542A9 /* PBXTargetDependency */,
+				3C7021E62ECF0821001768C6 /* PBXTargetDependency */,
 			);
 			name = UnitTestApp;
 			productName = UnitTestApp;
@@ -4619,6 +4631,11 @@
 			target = 3C115160289A259500565C41 /* OneSignalOSCore */;
 			targetProxy = 3C115199289AF86C00565C41 /* PBXContainerItemProxy */;
 		};
+		3C7021E62ECF0821001768C6 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 3E2400371D4FFC31008BDE70 /* OneSignalFramework */;
+			targetProxy = 3C7021E52ECF0821001768C6 /* PBXContainerItemProxy */;
+		};
 		3C7A39C42B7BED900082665E /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 3CC063992B6D7A8C002BB07F /* OneSignalCoreMocks */;
@@ -6874,7 +6891,7 @@
 			buildSettings = {
 				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ENABLE_CODE_COVERAGE = NO;
+				CLANG_ENABLE_CODE_COVERAGE = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_MODULE_DEBUGGING = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
@@ -6888,6 +6905,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_TESTABILITY = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				INFOPLIST_FILE = OneSignalFramework/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -7055,7 +7073,7 @@
 			buildSettings = {
 				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ENABLE_CODE_COVERAGE = NO;
+				CLANG_ENABLE_CODE_COVERAGE = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_MODULE_DEBUGGING = YES;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
@@ -7069,6 +7087,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_TESTABILITY = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				INFOPLIST_FILE = OneSignalFramework/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
diff --git a/iOS_SDK/OneSignalSDK/UnitTestApp/UnitTestApp_TestPlan_Full.xctestplan b/iOS_SDK/OneSignalSDK/UnitTestApp/UnitTestApp_TestPlan_Full.xctestplan
index 2f416718f..5a33fb5d5 100644
--- a/iOS_SDK/OneSignalSDK/UnitTestApp/UnitTestApp_TestPlan_Full.xctestplan
+++ b/iOS_SDK/OneSignalSDK/UnitTestApp/UnitTestApp_TestPlan_Full.xctestplan
@@ -11,11 +11,6 @@
   "defaultOptions" : {
     "codeCoverage" : {
       "targets" : [
-        {
-          "containerPath" : "container:OneSignal.xcodeproj",
-          "identifier" : "911E2CB91E398AB3003112A4",
-          "name" : "UnitTests"
-        },
         {
           "containerPath" : "container:OneSignal.xcodeproj",
           "identifier" : "DE7D17E527026B95002D3A5D",
@@ -48,18 +43,23 @@
         },
         {
           "containerPath" : "container:OneSignal.xcodeproj",
-          "identifier" : "3CC063EA2B6D7FE8002BB07F",
-          "name" : "OneSignalUserTests"
+          "identifier" : "DEBAAE272A4211D900BF2C1C",
+          "name" : "OneSignalInAppMessages"
+        },
+        {
+          "containerPath" : "container:OneSignal.xcodeproj",
+          "identifier" : "475F471D2B8E398D00EC05B3",
+          "name" : "OneSignalLiveActivities"
         },
         {
           "containerPath" : "container:OneSignal.xcodeproj",
-          "identifier" : "3CC063A02B6D7A8D002BB07F",
-          "name" : "OneSignalCoreTests"
+          "identifier" : "DEBAADF82A420A3700BF2C1C",
+          "name" : "OneSignalLocation"
         },
         {
           "containerPath" : "container:OneSignal.xcodeproj",
-          "identifier" : "DEBA2A192C20E35E00E234DB",
-          "name" : "OneSignalNotificationsTests"
+          "identifier" : "DEF784282912DEB600A1F3A5",
+          "name" : "OneSignalNotifications"
         }
       ]
     },
diff --git a/iOS_SDK/OneSignalSDK/UnitTestApp/UnitTestApp_TestPlan_Reduced.xctestplan b/iOS_SDK/OneSignalSDK/UnitTestApp/UnitTestApp_TestPlan_Reduced.xctestplan
index 9ebb1d676..2e2799f8b 100644
--- a/iOS_SDK/OneSignalSDK/UnitTestApp/UnitTestApp_TestPlan_Reduced.xctestplan
+++ b/iOS_SDK/OneSignalSDK/UnitTestApp/UnitTestApp_TestPlan_Reduced.xctestplan
@@ -9,7 +9,60 @@
     }
   ],
   "defaultOptions" : {
-
+    "codeCoverage" : {
+      "targets" : [
+        {
+          "containerPath" : "container:OneSignal.xcodeproj",
+          "identifier" : "3E2400371D4FFC31008BDE70",
+          "name" : "OneSignalFramework"
+        },
+        {
+          "containerPath" : "container:OneSignal.xcodeproj",
+          "identifier" : "DE7D17F827026BA3002D3A5D",
+          "name" : "OneSignalExtension"
+        },
+        {
+          "containerPath" : "container:OneSignal.xcodeproj",
+          "identifier" : "DE7D17E527026B95002D3A5D",
+          "name" : "OneSignalCore"
+        },
+        {
+          "containerPath" : "container:OneSignal.xcodeproj",
+          "identifier" : "DE69E19A282ED8060090BB3D",
+          "name" : "OneSignalUser"
+        },
+        {
+          "containerPath" : "container:OneSignal.xcodeproj",
+          "identifier" : "DE7D187F27037F43002D3A5D",
+          "name" : "OneSignalOutcomes"
+        },
+        {
+          "containerPath" : "container:OneSignal.xcodeproj",
+          "identifier" : "DEF784282912DEB600A1F3A5",
+          "name" : "OneSignalNotifications"
+        },
+        {
+          "containerPath" : "container:OneSignal.xcodeproj",
+          "identifier" : "475F471D2B8E398D00EC05B3",
+          "name" : "OneSignalLiveActivities"
+        },
+        {
+          "containerPath" : "container:OneSignal.xcodeproj",
+          "identifier" : "DEBAAE272A4211D900BF2C1C",
+          "name" : "OneSignalInAppMessages"
+        },
+        {
+          "containerPath" : "container:OneSignal.xcodeproj",
+          "identifier" : "DEBAADF82A420A3700BF2C1C",
+          "name" : "OneSignalLocation"
+        },
+        {
+          "containerPath" : "container:OneSignal.xcodeproj",
+          "identifier" : "3C115160289A259500565C41",
+          "name" : "OneSignalOSCore"
+        }
+      ]
+    }
   },
   "testTargets" : [
     {