diff --git a/src/common-components/textbox-question/textbox-question.vue b/src/common-components/textbox-question/textbox-question.vue
index ea72124b9..a98b1e255 100644
--- a/src/common-components/textbox-question/textbox-question.vue
+++ b/src/common-components/textbox-question/textbox-question.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="textbox-question" :class="(hasError) ? 'has-error' : ''">
+	<div class="textbox-question" :class="(errors && errors.length) || hasError ? 'has-error' : ''">
 		<label :for="inputId" :aria-label="questionText" class="form-label" v-html="labelText"></label>
 		<input v-model="value" 
 			v-maska="mask"
diff --git a/src/helpers/damage-helper.spec.js b/src/helpers/damage-helper.spec.js
new file mode 100644
index 000000000..cf53c1eec
--- /dev/null
+++ b/src/helpers/damage-helper.spec.js
@@ -0,0 +1,15 @@
+import {getDamageString} from "./damage-helper";
+
+jest.mock("@/store", () => ({
+    getters: {damage: {
+        glassToReplace: [{location: "TEST"}]
+    } 
+    }
+  }));
+
+  describe("damage-helper.js", () => {
+    it("Should return damage getter info", () => {
+      const damage = getDamageString();
+      expect(damage).toEqual("TEST")
+    });
+  });
\ No newline at end of file
diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index b193e1cba..77d6abe92 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -43,10 +43,10 @@ export async function getPageToRouteExistingOrderTo(toRoute = {}, existingHerita
         return 'vehicle-damage'
     } else {
         if (store.getters.vehicle.vin) {
-            return 'license-plate-lookup';
+            return 'vehicle-damage';
             //return "vin-lookup"; (uncomment)
         } else {
-            return 'license-plate-lookup';
+            return 'vehicle-damage';
             //return "estimate" (uncomment)
         }
     }
diff --git a/src/ux-components/alert/alert.spec.js b/src/ux-components/alert/alert.spec.js
index f046009a4..17ed6988a 100644
--- a/src/ux-components/alert/alert.spec.js
+++ b/src/ux-components/alert/alert.spec.js
@@ -47,27 +47,6 @@ describe("alert.vue", () => {
     expect(wrapperDiv.classes()).toContain('warning')
   });
 
-  it("Should update headline when manual headline added", async () => {
-    // Arrange
-    const wrapper = shallowMount(alert, {
-      
-      computed: {
-        alertCopy: {
-          get() {
-            return "TEST";
-          },
-        }
-      },
-      mixins: [mockMixin]
-    });
-
-    await wrapper.vm.$nextTick();
-    const wrapperDiv = wrapper.find('.text-body');
-
-    // Assert
-    expect(wrapperDiv.text()).toEqual('TEST')
-  });
-
 });
 
 const mockMixin = {