diff --git a/src/common-components/base-input-button/base-input-button.vue b/src/common-components/base-input-button/base-input-button.vue
index de269f7e3..1a2e51fcc 100644
--- a/src/common-components/base-input-button/base-input-button.vue
+++ b/src/common-components/base-input-button/base-input-button.vue
@@ -13,7 +13,7 @@
             :value="value"
             :checked="isChecked"
             @keypress.space="handleEventAction('space', $event)"
-            @keypress.enter="handleEventAction('keypressSubmit', $event)"
+            @keypress.enter="handleEventAction('enter', $event)"
             @change="handleEventAction('change', $event)" />
 
         <slot></slot>
@@ -74,13 +74,14 @@ export default {
         handleEventAction(eventType, e) {
             const eventTypes = {
                 CHANGE: "change",
-                KEYPRESS_SUBMIT: "keypressSubmit",
+                ENTER: "enter",
+                SPACE: "space",
                 CLICK: "click",
             };
 
             if (this.isMultiSelect) {
                 switch (eventType) {
-                    case eventTypes.KEYPRESS_SUBMIT:
+                    case eventTypes.ENTER:
                     case eventTypes.CHANGE:
                         this.handleClick(e);
                         // this.dispatchStoreAction(
@@ -95,7 +96,8 @@ export default {
             } else {
                 switch (eventType) {
                     case eventTypes.CLICK:
-                    case eventTypes.KEYPRESS_SUBMIT:
+                    case eventTypes.ENTER:
+                    case eventTypes.SPACE:
                         this.handleClick(e);
                         // this.pushClickEventToGAIfReady();
                         break;
diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index 7099e6227..485b513d8 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -13,6 +13,7 @@
         </div>
 
         <div class="w-100 d-flex justify-content-center">
+            
             <fieldset
                 class="w-100"
                 :aria-required="isRequired"
@@ -24,6 +25,7 @@
                 <legend
                     class="sr-only"
                     :data-focus-target="formatString(groupName)"
+                    tabindex="-1"
                     :id="formatString(groupName)">
                     {{ questionText }}
                     {{
diff --git a/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.spec.js b/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.spec.js
index 70f056e3b..16451b219 100644
--- a/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.spec.js
+++ b/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.spec.js
@@ -34,14 +34,14 @@ describe("addressVehiclesQuestion.vue", () => {
       const wrapper = shallowMount(addressVehiclesQuestion, {
         mixins: [mockMixin],
         propsData: {
-            vehicles: ["1", "2"],
-            modelValue: ["1", "2"],
+            vehicles: ["1", "2", "newValue"],
+            modelValue: "2",
         }
       });
 
       // Act
       const localThis = { $emit: jest.fn() }
-      addressVehiclesQuestion.computed.selectedVehicleVinAsArray.set.call(localThis, ['newValue']);
+      addressVehiclesQuestion.computed.selectedVehicleVin.set.call(localThis, 'newValue');
 
       // Assert
       expect(localThis.$emit).toBeCalledWith("update:modelValue", "newValue");
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.spec.js b/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.spec.js
index 635f389f1..795606526 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.spec.js
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.spec.js
@@ -17,7 +17,7 @@ describe("windshield-chip-count-question.vue", () => {
         const { wrapper } = setupMocks({ modelValueProp: 1 });
 
         //Act
-        await wrapper.setData({ numberOfChips: 2 });
+        wrapper.vm.selectedValue = "2";
 
         //Assert
         expect(wrapper.emitted()["update:modelValue"][0]).toEqual([2]);
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.spec.js b/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.spec.js
index 2e3b5aa3c..4b247d705 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.spec.js
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.spec.js
@@ -15,7 +15,7 @@ describe("windshield-damage-type-question.vue", () => {
       await wrapper.vm.$nextTick();
         
       //Assert
-      expect(wrapper.vm.selectedWindshieldDamageType).toEqual("Repair");
+      expect(wrapper.vm.selectedValues).toEqual("Repair");
       expect(wrapper.emitted()["update:modelValue"][0]).toEqual([{ modelValue: "Replace" }]);
     });
   });