diff --git a/src/helpers/heritage-integration/navigation-helper.spec.js b/src/helpers/heritage-integration/navigation-helper.spec.js
index 430f1df22..f9b3b1017 100644
--- a/src/helpers/heritage-integration/navigation-helper.spec.js
+++ b/src/helpers/heritage-integration/navigation-helper.spec.js
@@ -377,7 +377,7 @@ describe("navigateToHeritageFunnel", () => {
         router.navigateToExternalUrl = jest.fn();
 
         // Act
-        await navigateToHeritageFunnel();
+        await navigateToHeritageFunnel({});
 
         // Assert
         expect(saveSessionFunction).toHaveBeenCalled();
@@ -424,7 +424,7 @@ describe("navigateToHeritageFunnel", () => {
         router.navigateToExternalUrl = jest.fn();
 
         // Act
-        await navigateToHeritageFunnel();
+        await navigateToHeritageFunnel({});
 
         // Assert
         expect(router.navigateToExternalUrl).toHaveBeenCalled();
@@ -436,7 +436,7 @@ describe("navigateToHeritageFunnel", () => {
         );
     });
 
-    test("should not save session, but should still navigate", async () => {
+    test("shouldSaveSession is false => should not save session, but should still navigate", async () => {
         // Arrange
         const mockReferralNumber = "2";
         const mockCorrelationId = "55";
@@ -462,7 +462,7 @@ describe("navigateToHeritageFunnel", () => {
         router.navigateToExternalUrl = jest.fn();
 
         // Act
-        await navigateToHeritageFunnel(false);
+        await navigateToHeritageFunnel({ shouldSaveSession: false });
 
         // Assert
         expect(saveSessionFunction).not.toHaveBeenCalled();
diff --git a/src/helpers/heritage-integration/order-helper.js b/src/helpers/heritage-integration/order-helper.js
index 6b5e63c49..f18cd44de 100644
--- a/src/helpers/heritage-integration/order-helper.js
+++ b/src/helpers/heritage-integration/order-helper.js
@@ -94,12 +94,12 @@ async function saveSessionHelper() {
     await baseMixin.methods.dispatchStoreAction(
         storeActions.UPDATE_STORE_WITH_SAVE_SESSION_RESPONSE,
         {
-            referralNumber: savedSessionInfo.data.referralNumber.toString(),
+            referralNumber: savedSessionInfo.data.referralNumber?.toString(),
             referralCorrelationId: savedSessionInfo.data.referralCorrelationId,
             referralDate: savedSessionInfo.data.referralDate,
-            accountNumber: savedSessionInfo.data.accountNumber.toString(),
+            accountNumber: savedSessionInfo.data.accountNumber?.toString(),
             savedSessionId: savedSessionInfo.data.savedSessionId,
-            crmCustomerId: savedSessionInfo.data.crmCustomerId.toString(),
+            crmCustomerId: savedSessionInfo.data.crmCustomerId?.toString(),
         },
         false
     );
diff --git a/src/layouts/capability-questions/capability-questions.spec.js b/src/layouts/capability-questions/capability-questions.spec.js
index 31fc63af8..f29be44e6 100644
--- a/src/layouts/capability-questions/capability-questions.spec.js
+++ b/src/layouts/capability-questions/capability-questions.spec.js
@@ -103,6 +103,7 @@ const baseStoreGettersDamage = () => {
 store.getters = {
     pageData: baseStoreGettersPageData,
     damage: baseStoreGettersDamage,
+    payment: { insuranceCoverage: {} },
 };
 store.commit = jest.fn();
 
@@ -111,6 +112,7 @@ afterEach(() => {
     store.getters = {
         pageData: baseStoreGettersPageData,
         damage: baseStoreGettersDamage,
+        payment: { insuranceCoverage: {} },
     };
 });
 
diff --git a/src/layouts/molding-questions/molding-questions.spec.js b/src/layouts/molding-questions/molding-questions.spec.js
index cff119c73..a97e14b41 100644
--- a/src/layouts/molding-questions/molding-questions.spec.js
+++ b/src/layouts/molding-questions/molding-questions.spec.js
@@ -115,6 +115,7 @@ afterEach(() => {
     store.getters = {
         pageData: baseStoreGettersPageData,
         damage: baseStoreGettersDamage,
+        payment: { insuranceCoverage: {} },
     };
 });
 
diff --git a/src/layouts/part-questions/part-questions.spec.js b/src/layouts/part-questions/part-questions.spec.js
index e8adef4ff..f00484ae9 100644
--- a/src/layouts/part-questions/part-questions.spec.js
+++ b/src/layouts/part-questions/part-questions.spec.js
@@ -220,6 +220,9 @@ describe("partQuestions.vue...", () => {
     describe("forwardButtonAction", () => {
         test("Should clear out answerData", async () => {
             // Arrange
+            store.getters.payment = {
+                insuranceCoverage: null
+            }
             const { wrapper } = setupMocks({});
 
             await wrapper.setData({
diff --git a/src/layouts/vehicle-damage/vehicle-damage.spec.js b/src/layouts/vehicle-damage/vehicle-damage.spec.js
index 07096cf23..28b85bf00 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.spec.js
+++ b/src/layouts/vehicle-damage/vehicle-damage.spec.js
@@ -75,7 +75,7 @@ describe("vehicle-damage.vue", () => {
             expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalled();
         });
 
-        test("Replace several pieces of glass on ForwardButtonAction triggers a router.navigate and saves selections to store", async () => {
+        test("Replace several pieces of glass on first pass through concept on ForwardButtonAction triggers a router.navigate and saves selections to store", async () => {
             //Arrange
             const partsData = {
                 partsOrQuestions: [
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index c72e99449..a6e6e1367 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -328,7 +328,8 @@ export default {
         },
 
         navigateForward() {
-            const payment = store.getters.payment;
+            const payment = this.$store.getters.payment;
+            console.log(payment)
             const vehicleChangedDuringPolicyLookupInHeritage = payment.isInsurance && payment.insuranceCoverage.coverageStatus && payment.insuranceCoverage.coverageStatus !== "";
             if (vehicleChangedDuringPolicyLookupInHeritage) {
                 if (store.getters.damage.isRepair) {
diff --git a/src/layouts/vehicle-parts/vehicle-parts.spec.js b/src/layouts/vehicle-parts/vehicle-parts.spec.js
index b4ef9a1fb..d14491ccd 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.spec.js
+++ b/src/layouts/vehicle-parts/vehicle-parts.spec.js
@@ -459,6 +459,7 @@ describe("vehicle-parts.vue", () => {
         store.getters.pageData.mockReturnValueOnce(basePartResponse);
         store.getters.lineItems = { glassParts: {} };
         store.getters.vehicle = { carId: "TEST_CAR_ID" };
+        store.getters.payment = { insuranceCoverage: {} };
 
         const { wrapper } = setupMocks({
             mountOptionsMockData: {
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 08d9fa790..61f26475f 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -449,7 +449,7 @@ export default {
                 // save to store lineItems.glassParts
                 self.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
 
-                const payment = self.$store.getters.payment;
+                const payment = store.getters.payment;
                 shouldGoToHeritageQuote ||
                 (payment.isInsurance && payment.insuranceCoverage.isVerified)
                     ? navigateToHeritageFunnel({ loadingModal: self.$refs.loadingModal })