diff --git a/src/iss-components/cart-dropdown/advanced-mobile-modal/advanced-mobile-modal.vue b/src/iss-components/cart-dropdown/advanced-mobile-modal/advanced-mobile-modal.vue
index 0f3dac86..2009919e 100644
--- a/src/iss-components/cart-dropdown/advanced-mobile-modal/advanced-mobile-modal.vue
+++ b/src/iss-components/cart-dropdown/advanced-mobile-modal/advanced-mobile-modal.vue
@@ -1,8 +1,7 @@
 <template>
     <div class="advanced-mobile-modal-container">
         <modal
-            ref="advancedMobileModal"
-            :onModalClosedCallback="onModalClosed">
+            ref="advancedMobileModal">
             <div>
                 <div class="header">{{ modalHeaderText }}</div>
                 <div class="subheader">{{ modalHeaderSubText }}</div>
@@ -42,7 +41,7 @@ export default {
     props: {
         cmsWidgetName: {
             type: String,
-            default: 'SuggestTimeslotModal'
+            default: 'AdvancedMobileModal'
         }
     },
     computed: {
diff --git a/src/iss-components/cart-dropdown/cart-dropdown.vue b/src/iss-components/cart-dropdown/cart-dropdown.vue
index 0b7afd36..6787ad77 100644
--- a/src/iss-components/cart-dropdown/cart-dropdown.vue
+++ b/src/iss-components/cart-dropdown/cart-dropdown.vue
@@ -124,8 +124,6 @@
 
 <script>
 import { useMainStore } from '@/store';
-import contentGroupModal from '@/iss-components/content-group-modal/content-group-modal.vue';
-import textBlock from '@/digital-components/text-block/text-block.vue';
 import textLink from '@/ux-components/text-link/text-link.vue';
 import { formatAmountInDollars } from '@/helpers/text-helper.js';
 import advancedMobileModal from '@/iss-components/cart-dropdown/advanced-mobile-modal/advanced-mobile-modal.vue';
@@ -470,7 +468,7 @@ export default {
         .price-row {
             display: flex;
 
-            :last-child {
+            >:last-child {
                 margin-left: auto;
             }
         }
diff --git a/src/ux-components/tool-tip/tool-tip.spec.js b/src/ux-components/tool-tip/tool-tip.spec.js
index 3161705c..def75721 100644
--- a/src/ux-components/tool-tip/tool-tip.spec.js
+++ b/src/ux-components/tool-tip/tool-tip.spec.js
@@ -1,4 +1,4 @@
-import { shallowMount, mount } from "@vue/test-utils";
+import { shallowMount, mount, enableAutoUnmount } from "@vue/test-utils";
 import toolTip from "@/ux-components/tool-tip/tool-tip.vue";
 
 const mockMixin = {
@@ -18,6 +18,7 @@ function setupMocks(mountOptionsMockData = {}) {
 }
 
 describe("toolTip.vue", () => {
+    enableAutoUnmount(afterEach);
     afterEach(() => {
         jest.clearAllMocks();
     });
diff --git a/src/ux-components/tool-tip/tool-tip.vue b/src/ux-components/tool-tip/tool-tip.vue
index 6ae18c2b..6dd59539 100644
--- a/src/ux-components/tool-tip/tool-tip.vue
+++ b/src/ux-components/tool-tip/tool-tip.vue
@@ -1,10 +1,16 @@
 <template>
     <div class="tooltip-container" ref="container">
-        <span @click="toggleTooltip" class="tooltip-icon">
-            <slot name="icon">
-                <img src="@/assets/img/icons/info-circle-blue.svg" />
-            </slot>
-        </span>
+         <span
+             class="tooltip-icon"
+             role="button"
+             aria-label="Show more information"
+             @click="toggleTooltip"
+             @keydown.enter.prevent="toggleTooltip"
+             @keydown.space.prevent="toggleTooltip">
+             <slot name="icon">
+                 <img src="@/assets/img/icons/info-circle-blue.svg" alt="" />
+             </slot>
+         </span>
         <span
             v-if="isVisible"
             class="tooltip"
@@ -22,16 +28,11 @@
 import { getStringWithCustomValues } from '@/helpers/cms-content-helper';
 
 export default {
-    name: "toolTip",
+    name: "tool-tip",
     props: {
         cmsWidgetName: {
             type: String,
-            default(rawProps) {
-                if (!rawProps.cmsWidgetName) {
-                    console.log("Error: Missing a CMS Widget Name (required field)");
-                }
-                return "widgetUndefined";
-            },
+            default: 'widgetUndefined'
         },
         customValueMap: {
             type: Object,