diff --git a/src/layouts/capability-questions/capability-questions.spec.js b/src/layouts/capability-questions/capability-questions.spec.js
index c59857182..31fc63af8 100644
--- a/src/layouts/capability-questions/capability-questions.spec.js
+++ b/src/layouts/capability-questions/capability-questions.spec.js
@@ -84,12 +84,14 @@ const baseStoreGettersDamage = () => {
                     {
                         questionText:
                             "Is your vehicle equipped with the Panoramic Sunroof which can be identified by having a glass panel over the rear seats?",
+                        selectedAnswer: "1|nextQuestion|3|Yes",
                         selectedAnswerText: "Yes",
                         questionNum: 1,
                     },
                     {
                         questionText:
                             "Is your vehicle equipped with a heated windshield that melts snow and ice from underneath the windshield wiper blades?",
+                        selectedAnswer: "2|nextQuestion|3|Yes",
                         selectedAnswerText: "Yes",
                         questionNum: 2,
                     },
@@ -166,10 +168,10 @@ describe("capabilityQuestions.vue", () => {
     });
 
     describe("watch on selectedAnswers should be set up...", () => {
-        test("Should trigger handleAnswerUpdates if watched data changes", async () => {
+        test("Should trigger handleCompletedQuestionChainAnswers if watched data changes", async () => {
             // Arrange
             const { wrapper } = setupMocks({});
-            const spy = jest.spyOn(wrapper.vm, "handleAnswerUpdates");
+            const spy = jest.spyOn(wrapper.vm, "handleCompletedQuestionChainAnswers");
 
             // Act
             wrapper.setData({
@@ -180,12 +182,14 @@ describe("capabilityQuestions.vue", () => {
                             {
                                 questionText:
                                     "Is your vehicle equipped with the Panoramic Sunroof which can be identified by having a glass panel over the rear seats?",
+                                selectedAnswer: "1|nextQuestion|3|Yes",
                                 selectedAnswerText: "Yes",
                                 questionNum: 1,
                             },
                             {
                                 questionText:
                                     "Is your vehicle equipped with a heated windshield that melts snow and ice from underneath the windshield wiper blades?",
+                                selectedAnswer: "2|nextQuestion|3|Yes",
                                 selectedAnswerText: "Yes",
                                 questionNum: 2,
                             },
diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index c3122b9a3..ffef2f6fa 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -112,7 +112,7 @@ export default {
                         "selectedAnswers." + glass.answerKey,
                         (newValue) => {
                             if (newValue && Object.keys(newValue).length > 0) {
-                                this.handleAnswerUpdates(newValue, glass.answerKey);
+                                this.handleCompletedQuestionChainAnswers(newValue, glass.answerKey);
                             }
                         },
                         { deep: true }
diff --git a/src/layouts/molding-questions/molding-questions.spec.js b/src/layouts/molding-questions/molding-questions.spec.js
index a408a406f..cff119c73 100644
--- a/src/layouts/molding-questions/molding-questions.spec.js
+++ b/src/layouts/molding-questions/molding-questions.spec.js
@@ -88,12 +88,14 @@ const baseStoreGettersDamage = () => {
                     {
                         questionText:
                             "Is your vehicle equipped with the Panoramic Sunroof which can be identified by having a glass panel over the rear seats?",
+                        selectedAnswer: "1|nextQuestion|3|Yes",
                         selectedAnswerText: "Yes",
                         questionNum: 1,
                     },
                     {
                         questionText:
                             "Is your vehicle equipped with a heated windshield that melts snow and ice from underneath the windshield wiper blades?",
+                        selectedAnswer: "2|nextQuestion|3|Yes",
                         selectedAnswerText: "Yes",
                         questionNum: 2,
                     },
@@ -170,10 +172,10 @@ describe("moldingQuestions.vue", () => {
     });
 
     describe("watch on selectedAnswers should be set up...", () => {
-        test("Should trigger handleAnswerUpdates if watched data changes", async () => {
+        test("Should trigger handleCompletedQuestionChainAnswers if watched data changes", async () => {
             // Arrange
             const { wrapper } = setupMocks({});
-            const spy = jest.spyOn(wrapper.vm, "handleAnswerUpdates");
+            const spy = jest.spyOn(wrapper.vm, "handleCompletedQuestionChainAnswers");
 
             // Act
             wrapper.setData({
@@ -184,12 +186,14 @@ describe("moldingQuestions.vue", () => {
                             {
                                 questionText:
                                     "Is your vehicle equipped with the Panoramic Sunroof which can be identified by having a glass panel over the rear seats?",
+                                selectedAnswer: "1|nextQuestion|3|Yes",
                                 selectedAnswerText: "Yes",
                                 questionNum: 1,
                             },
                             {
                                 questionText:
                                     "Is your vehicle equipped with a heated windshield that melts snow and ice from underneath the windshield wiper blades?",
+                                selectedAnswer: "2|nextQuestion|3|Yes",
                                 selectedAnswerText: "Yes",
                                 questionNum: 2,
                             },
diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue
index b0e767b21..53a010d72 100644
--- a/src/layouts/molding-questions/molding-questions.vue
+++ b/src/layouts/molding-questions/molding-questions.vue
@@ -111,7 +111,7 @@ export default {
                         "selectedAnswers." + glass.answerKey,
                         (newValue) => {
                             if (newValue && Object.keys(newValue).length > 0) {
-                                this.handleAnswerUpdates(newValue, glass.answerKey);
+                                this.handleCompletedQuestionChainAnswers(newValue, glass.answerKey);
                             }
                         },
                         { deep: true }