diff --git a/src/layouts/endorsements-page/endorsements-page.spec.js b/src/layouts/endorsements-page/endorsements-page.spec.js
index 119bba29..a7eaa593 100644
--- a/src/layouts/endorsements-page/endorsements-page.spec.js
+++ b/src/layouts/endorsements-page/endorsements-page.spec.js
@@ -6,7 +6,6 @@ import { shallowMount } from '@vue/test-utils';
 import { getMountOptions } from '@/helpers/unit-test-helper.js';
 import navigationScenarios from '@/router/router-constants/navigation-scenarios';
 import { createTestingPinia } from '@pinia/testing';
-import { getRandomString, getRandomInt } from '@/helpers/data-generation.js';
 import { useMainStore } from '@/store';
 
 // import { useMainStore } from '@/store/index.js';
diff --git a/src/layouts/policy-vehicles/policy-vehicles.vue b/src/layouts/policy-vehicles/policy-vehicles.vue
index 54f19ce9..5287be82 100644
--- a/src/layouts/policy-vehicles/policy-vehicles.vue
+++ b/src/layouts/policy-vehicles/policy-vehicles.vue
@@ -200,12 +200,15 @@ export default {
                             this.navigationScenarios.CLICKED_FORWARD_NON_LISTED_VEHICLE,
                             this.$route,
                             {},
-                            {});
-                } else if (!!this.endorsementsForSelectedVehicle) {
-                    this.$router.navigate(this.navigationScenarios.CLICKED_FORWARD_WITH_ENDORSEMENTS, 
+                            {}
+                        );
+                } else if (this.endorsementsForSelectedVehicle) {
+                    this.$router.navigate(
+                        this.navigationScenarios.CLICKED_FORWARD_WITH_ENDORSEMENTS,
                         this.$route,
                         {},
-                        {});
+                        {}
+                    );
                 } else {
                     this.$router.navigate(
                         this.navigationScenarios.CLICKED_FORWARD_LISTED_VEHICLE,