diff --git a/iOS_SDK/OneSignalSDK/OneSignalUserMocks/OneSignalUserMocks.swift b/iOS_SDK/OneSignalSDK/OneSignalUserMocks/OneSignalUserMocks.swift
index da94af841..1e0f513c2 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalUserMocks/OneSignalUserMocks.swift
+++ b/iOS_SDK/OneSignalSDK/OneSignalUserMocks/OneSignalUserMocks.swift
@@ -37,6 +37,13 @@ public class OneSignalUserMocks: NSObject {
     // TODO: create mocked server responses to user requests
     @objc
     public static func reset() {
+        OSResilientStorage.setStrings([
+            OSResilientStorage.keyAppId: "",
+            OSResilientStorage.keySubscriptionId: "",
+            OSResilientStorage.keyReceiveReceiptsEnabled: "",
+            OSResilientStorage.keyHasPriorSession: ""
+        ])
+        _ = OSResilientStorage.snapshot()
         OSCoreMocks.resetOperationRepo()
         OneSignalUserManagerImpl.sharedInstance.reset()
     }
diff --git a/iOS_SDK/OneSignalSDK/OneSignalUserTests/Executors/UserExecutorTests.swift b/iOS_SDK/OneSignalSDK/OneSignalUserTests/Executors/UserExecutorTests.swift
index 703079453..20802cd12 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalUserTests/Executors/UserExecutorTests.swift
+++ b/iOS_SDK/OneSignalSDK/OneSignalUserTests/Executors/UserExecutorTests.swift
@@ -107,10 +107,9 @@ final class UserExecutorTests: XCTestCase {
 
         /* When */
         let anonIdentityModel = OSIdentityModel(aliases: [OS_ONESIGNAL_ID: userA_OSID], changeNotifier: OSEventProducer())
-        let newIdentityModel = OSIdentityModel(aliases: [OS_EXTERNAL_ID: userA_EUID], changeNotifier: OSEventProducer())
-
-        // The current user needs to be the same, set it in the user manager
-        OneSignalUserManagerImpl.sharedInstance.identityModelStore.add(id: OS_IDENTITY_MODEL_KEY, model: newIdentityModel, hydrating: false)
+        let newIdentityModel = OneSignalUserMocks
+            .setUserManagerInternalUser(externalId: userA_EUID, onesignalId: nil)
+            .identityModel
         mocks.userExecutor.identifyUser(externalId: userA_EUID, identityModelToIdentify: anonIdentityModel, identityModelToUpdate: newIdentityModel)
 
         OneSignalCoreMocks.waitForBackgroundThreads(seconds: 0.5)
diff --git a/iOS_SDK/OneSignalSDK/OneSignalUserTests/OneSignalUserObjcTests.m b/iOS_SDK/OneSignalSDK/OneSignalUserTests/OneSignalUserObjcTests.m
index 9348f639e..a17ee3132 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalUserTests/OneSignalUserObjcTests.m
+++ b/iOS_SDK/OneSignalSDK/OneSignalUserTests/OneSignalUserObjcTests.m
@@ -32,14 +32,12 @@ - (void)testSendPurchases {
     /* Setup */
 
     MockOneSignalClient* client = [MockOneSignalClient new];
-
-    // 0. Purchases will be dropped if there is no user instance.
-    [OneSignalUserManagerImpl.sharedInstance start];
-
-    // 1. Set up mock responses for the anonymous user
     [MockUserRequests setDefaultCreateAnonUserResponsesWith:client onesignalId:nil subscriptionId:nil];
     [OneSignalCoreImpl setSharedClient:client];
 
+    // Purchases will be dropped if there is no user instance.
+    [OneSignalUserManagerImpl.sharedInstance start];
+
     /* When */
 
     NSMutableArray* arrayOfPurchases = [NSMutableArray new];
diff --git a/iOS_SDK/OneSignalSDK/OneSignalUserTests/OneSignalUserTests.swift b/iOS_SDK/OneSignalSDK/OneSignalUserTests/OneSignalUserTests.swift
index a66d10394..46f66d39c 100644
--- a/iOS_SDK/OneSignalSDK/OneSignalUserTests/OneSignalUserTests.swift
+++ b/iOS_SDK/OneSignalSDK/OneSignalUserTests/OneSignalUserTests.swift
@@ -275,12 +275,13 @@ final class OneSignalUserTests: XCTestCase {
         let checkedUser = manager.currentUser(matching: userA.identityModel.modelId)
         // A concurrent login switches the current user before the response is applied
         let userB = OneSignalUserMocks.setUserManagerInternalUser(externalId: userB_EUID, onesignalId: userB_OSID)
+        let userBLanguage = userB.propertiesModel.language
         checkedUser?.propertiesModel.hydrate(["language": "language-for-user-a"])
 
         /* Then */
         // The response's data went to the user it was for, and the new current user is untouched
         XCTAssertEqual(userA.propertiesModel.language, "language-for-user-a")
-        XCTAssertNil(userB.propertiesModel.language)
+        XCTAssertEqual(userB.propertiesModel.language, userBLanguage)
         XCTAssertEqual(manager._user?.identityModel.externalId, userB_EUID)
     }