diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e8163d6c2..b169cbc25 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Test
         env:
           scheme: ${{ 'UnitTestApp' }}
-          test_plan: ${{ 'UnitTestApp_TestPlan_Reduced' }}
+          test_plan: ${{ 'UnitTestPlan_TestPlan_BadgeOnly' }}
           platform: ${{ 'iOS Simulator' }}
           file_to_build: ${{ 'iOS_SDK/OneSignalSDK/OneSignal.xcodeproj' }}
           filetype_parameter: ${{ 'project' }}
diff --git a/iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m b/iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m
index d3061a94a..de420b5aa 100644
--- a/iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m
+++ b/iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m
@@ -50,7 +50,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     
 //    [FIRApp configure];
     
-    NSLog(@"Bundle URL: %@", [[NSBundle mainBundle] bundleURL]);
+    NSLog(@"    Bundle URL: %@", [[NSBundle mainBundle] bundleURL]);
     [OneSignal.Debug setLogLevel:ONE_S_LL_VERBOSE];
     [OneSignal.Debug setAlertLevel:ONE_S_LL_NONE];
     
diff --git a/iOS_SDK/OneSignalSDK.xcworkspace/contents.xcworkspacedata b/iOS_SDK/OneSignalSDK.xcworkspace/contents.xcworkspacedata
index 9979cb733..bb378804e 100644
--- a/iOS_SDK/OneSignalSDK.xcworkspace/contents.xcworkspacedata
+++ b/iOS_SDK/OneSignalSDK.xcworkspace/contents.xcworkspacedata
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Workspace
    version = "1.0">
+   <FileRef
+      location = "group:OneSignalSDK/UnitTestApp/UnitTestPlan_TestPlan_BadgeOnly.xctestplan">
+   </FileRef>
    <FileRef
       location = "group:OneSignalDevApp/OneSignalExample.xcodeproj">
    </FileRef>
diff --git a/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/xcshareddata/xcschemes/UnitTestApp.xcscheme b/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/xcshareddata/xcschemes/UnitTestApp.xcscheme
index 78545068d..bf007ec61 100644
--- a/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/xcshareddata/xcschemes/UnitTestApp.xcscheme
+++ b/iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/xcshareddata/xcschemes/UnitTestApp.xcscheme
@@ -151,6 +151,9 @@
          <TestPlanReference
             reference = "container:UnitTestApp/UnitTestApp_TestPlan_Reduced.xctestplan">
          </TestPlanReference>
+         <TestPlanReference
+            reference = "container:UnitTestApp/UnitTestPlan_TestPlan_BadgeOnly.xctestplan">
+         </TestPlanReference>
       </TestPlans>
       <Testables>
          <TestableReference
@@ -213,6 +216,16 @@
                ReferencedContainer = "container:OneSignal.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "DEBA2A192C20E35E00E234DB"
+               BuildableName = "OneSignalNotificationsTests.xctest"
+               BlueprintName = "OneSignalNotificationsTests"
+               ReferencedContainer = "container:OneSignal.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
diff --git a/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m b/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m
index 9ce51e29b..b0e5ed11c 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m
@@ -260,8 +260,10 @@ + (void)start {
 + (void)registerLifecycleObserver {
     // Replacing swizzled lifecycle selectors with notification center observers for scene based Apps
     if ([OSBundleUtils isAppUsingUIScene]) {
+        NSLog(@"💛 registerLifecycleObserverAs UIScene ");
         [self registerLifecycleObserverAsUIScene];
     } else {
+        NSLog(@"💛 registerLifecycleObserverAs UIApplication ");
         [self registerLifecycleObserverAsUIApplication];
     }
 }
diff --git a/iOS_SDK/OneSignalSDK/OneSignalNotificationsTests/OneSignalNotificationsTests.swift b/iOS_SDK/OneSignalSDK/OneSignalNotificationsTests/OneSignalNotificationsTests.swift
index 5052d6bf7..1b4ff49e3 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalNotificationsTests/OneSignalNotificationsTests.swift
+++ b/iOS_SDK/OneSignalSDK/OneSignalNotificationsTests/OneSignalNotificationsTests.swift
@@ -31,6 +31,8 @@ final class OneSignalNotificationsTests: XCTestCase {
     var token: String = ""
 
     override func setUpWithError() throws {
+        // Temp. logging to help debug during testing
+        OneSignalLog.setLogLevel(.LL_VERBOSE)
         // Put setup code here. This method is called before the invocation of each test method in the class.
         self.notifTypes = 0
         self.token = ""
@@ -40,31 +42,93 @@ final class OneSignalNotificationsTests: XCTestCase {
         // Put teardown code here. This method is called after the invocation of each test method in the class.
     }
 
-    func testClearBadgesWhenAppEntersForeground() throws {
+    func testClearBadgesWhenAppEntersForeground() throws { // Fails when running alone
         // NotificationManager Start to register lifecycle listener
         OSNotificationsManager.start()
         // Set badge count > 0
+        print("💛 testClearBadgesWhenAppEntersForeground setting applicationIconBadgeNumber = 1")
         UIApplication.shared.applicationIconBadgeNumber = 1
+        print("🥑 applicationIconBadgeNumber is \(UIApplication.shared.applicationIconBadgeNumber)")
+
         // Then background the app
         OneSignalCoreMocks.backgroundApp()
         // Foreground the app
         OneSignalCoreMocks.foregroundApp()
         // Ensure that badge count == 0
+        print("🥑 applicationIconBadgeNumber now is \(UIApplication.shared.applicationIconBadgeNumber)")
+
         XCTAssertEqual(UIApplication.shared.applicationIconBadgeNumber, 0)
     }
 
-    func testDontclearBadgesWhenAppBecomesActive() throws {
+    func testDontclearBadgesWhenAppBecomesActive() throws { // Unable to make it fail alone
         // NotificationManager Start to register lifecycle listener
         OSNotificationsManager.start()
         // Set badge count > 0
+        print("💛 testDontclearBadgesWhenAppBecomesActive setting applicationIconBadgeNumber = 1")
         UIApplication.shared.applicationIconBadgeNumber = 1
+        print("🥑 applicationIconBadgeNumber is \(UIApplication.shared.applicationIconBadgeNumber)")
+
         // Then resign active
         OneSignalCoreMocks.resignActive()
         // App becomes active the app
         OneSignalCoreMocks.becomeActive()
         // Ensure that badge count == 1
+        print("🥑 applicationIconBadgeNumber now is \(UIApplication.shared.applicationIconBadgeNumber)")
+
         XCTAssertEqual(UIApplication.shared.applicationIconBadgeNumber, 1)
     }
+//    
+//    func testClearBadgesWhenAppEntersForeground1() throws {
+//        // NotificationManager Start to register lifecycle listener
+//        OSNotificationsManager.start()
+//        // Set badge count > 0
+//        UIApplication.shared.applicationIconBadgeNumber = 1
+//        // Then background the app
+//        OneSignalCoreMocks.backgroundApp()
+//        // Foreground the app
+//        OneSignalCoreMocks.foregroundApp()
+//        // Ensure that badge count == 0
+//        XCTAssertEqual(UIApplication.shared.applicationIconBadgeNumber, 0)
+//    }
+//
+//    func testDontclearBadgesWhenAppBecomesActive2() throws {
+//        // NotificationManager Start to register lifecycle listener
+//        OSNotificationsManager.start()
+//        // Set badge count > 0
+//        UIApplication.shared.applicationIconBadgeNumber = 1
+//        // Then resign active
+//        OneSignalCoreMocks.resignActive()
+//        // App becomes active the app
+//        OneSignalCoreMocks.becomeActive()
+//        // Ensure that badge count == 1
+//        XCTAssertEqual(UIApplication.shared.applicationIconBadgeNumber, 1)
+//    }
+//    
+//    func testClearBadgesWhenAppEntersForeground3() throws {
+//        // NotificationManager Start to register lifecycle listener
+//        OSNotificationsManager.start()
+//        // Set badge count > 0
+//        UIApplication.shared.applicationIconBadgeNumber = 1
+//        // Then background the app
+//        OneSignalCoreMocks.backgroundApp()
+//        // Foreground the app
+//        OneSignalCoreMocks.foregroundApp()
+//        // Ensure that badge count == 0
+//        XCTAssertEqual(UIApplication.shared.applicationIconBadgeNumber, 0)
+//    }
+//
+//    func testDontclearBadgesWhenAppBecomesActive4() throws {
+//        // NotificationManager Start to register lifecycle listener
+//        OSNotificationsManager.start()
+//        // Set badge count > 0
+//        UIApplication.shared.applicationIconBadgeNumber = 1
+//        // Then resign active
+//        OneSignalCoreMocks.resignActive()
+//        // App becomes active the app
+//        OneSignalCoreMocks.becomeActive()
+//        // Ensure that badge count == 1
+//        XCTAssertEqual(UIApplication.shared.applicationIconBadgeNumber, 1)
+//    }
 
     func testUpdateNotificationTypesOnAppEntersForeground() throws {
         // NotificationManager Start to register lifecycle listener
diff --git a/iOS_SDK/OneSignalSDK/UnitTestApp/UnitTestPlan_TestPlan_BadgeOnly.xctestplan b/iOS_SDK/OneSignalSDK/UnitTestApp/UnitTestPlan_TestPlan_BadgeOnly.xctestplan
new file mode 100644
index 000000000..209ee99ae
--- /dev/null
+++ b/iOS_SDK/OneSignalSDK/UnitTestApp/UnitTestPlan_TestPlan_BadgeOnly.xctestplan
@@ -0,0 +1,24 @@
+{
+  "configurations" : [
+    {
+      "id" : "0F56CD0B-5904-415C-B328-24EE0394B75B",
+      "name" : "Configuration 1",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "testTimeoutsEnabled" : true
+  },
+  "testTargets" : [
+    {
+      "target" : {
+        "containerPath" : "container:OneSignal.xcodeproj",
+        "identifier" : "DEBA2A192C20E35E00E234DB",
+        "name" : "OneSignalNotificationsTests"
+      }
+    }
+  ],
+  "version" : 1
+}