diff --git a/src/helpers/heritage-integration/cookie-helper.js b/src/helpers/heritage-integration/cookie-helper.js
index 24acee81..0959722d 100644
--- a/src/helpers/heritage-integration/cookie-helper.js
+++ b/src/helpers/heritage-integration/cookie-helper.js
@@ -1,5 +1,6 @@
 import { cookieNames } from "@/constants/cookie-names";
 import { applicationConfig } from "@/constants/application-config";
+import { useMainStore } from "@/store";
 
 /*
     Will update the cookie if present, or create a new one if not.
@@ -11,13 +12,13 @@ export function updateOrCreateFunnelCookie() {
     // Set up cookie with all the props.
     setFunnelCookieProperties({
         LastTouched: new Date().toUTCString(),
-        SavedSessionTimeoutDate:  useMainStore().getters.applicationUser.savedSessionTimeout,
+        SavedSessionTimeoutDate:  useMainStore.applicationUser.savedSessionTimeout,
         DidHeritageFunnelUpdateLast: false,
         ShouldResetState: false,
-        ReferralNumber:  useMainStore().getters.order.referralNumber,
-        ReferralDate:  useMainStore().getters.order.referralDate,
-        ReferralCorrelationId:  useMainStore().getters.order.referralCorrelationId,
-        ReferralParentAccountNumber:  useMainStore().getters.order.accountNumber,
+        ReferralNumber:  useMainStore.order.referralNumber,
+        ReferralDate:  useMainStore.order.referralDate,
+        ReferralCorrelationId:  useMainStore.order.referralCorrelationId,
+        ReferralParentAccountNumber:  useMainStore.order.accountNumber,
         HasDelayedClaimRegistration: wasClaimRegistrationDelayed,
         SuppressConceptFunnel: shouldSuppressConceptFunnel,
     });
diff --git a/src/helpers/unit-test-helper.js b/src/helpers/unit-test-helper.js
index c2d607c4..17c1196e 100644
--- a/src/helpers/unit-test-helper.js
+++ b/src/helpers/unit-test-helper.js
@@ -1,9 +1,25 @@
 import { storeActions } from "@/constants/store-actions";
+import { storeMutations } from "@/constants/store-mutations.js";
 import { navigationScenarios } from "@/router/router-constants/navigation-scenarios.js";
 import { vehicleCategories } from "@/constants/vehicle-categories.js";
 import { issPageValues } from "@/router/router-constants/issPage-values";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
+import { cookieNames } from "@/constants/cookie-names";
 import { Form } from "vee-validate";
+import baseMixin from "@/mixins/base-mixin";
+import {
+    getCookieDomainValue,
+    setCookieProperties,
+} from "@/helpers/heritage-integration/cookie-helper";
+import {
+    analyticsPageEvents,
+    GaCategories,
+    GaActions,
+    GaLabels,
+    GaEvents,
+    ValueToLogTypes,
+} from "@/constants/analytics";
+import { routerParams } from "@/router/router-constants/router-params";
 import { queryStrings } from "@/constants/query-strings";
 import { useMainStore } from "@/store";
 import { mapStores } from "pinia";
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index b7614a80..ee65380b 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -34,7 +34,7 @@ export default {
                 action: "",
                 event: pageEvent,
                 shouldUseSessionId: false,
-                experimentsForUser:  useMainStore.applicationUserObj.experiments,
+                experimentsForUser: [], //useMainStore.applicationUser.experiments,
             };
 
             baseMixin.methods.dispatchStoreAction(storeActions.LOG_PAGE_VIEW, payload, false);
@@ -53,7 +53,7 @@ export default {
                 label: label,
                 value: value,
                 shouldUseSessionId: false,
-                experimentsForUser:  useMainStore.applicationUserObj.experiments,
+                experimentsForUser: [], //useMainStore.applicationUser.experiments,
             };
 
             baseMixin.methods.dispatchStoreAction(storeActions.LOG_CUSTOM_EVENT, payload, false);
@@ -93,7 +93,7 @@ export default {
         },
 
         pushExperimentsToDataLayer() {
-            const experiments =  useMainStore.applicationUserObj.experiments;
+            const experiments =  []; //useMainStore.applicationUser.experiments;
             experiments?.forEach((exp) => {
                 // Set Google Dimension Index based on experiment settings.
                 let googleDimensionIndex = 99;