diff --git a/src/digital-components/button-question/button-question.spec.js b/src/digital-components/button-question/button-question.spec.js
index ce8d87fab..e9e1d70a4 100644
--- a/src/digital-components/button-question/button-question.spec.js
+++ b/src/digital-components/button-question/button-question.spec.js
@@ -1,9 +1,6 @@
 import { shallowMount, mount } from "@vue/test-utils";
 import buttonQuestion from "./button-question";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
-import crypto from "crypto";
-
-global.crypto = crypto;
 
 describe("buttonQuestion.vue", () => {
     it("Should show overflow classes on fieldset if isOverflowScrollable is true", () => {
diff --git a/src/digital-components/dropdown-question/dropdown-question.spec.js b/src/digital-components/dropdown-question/dropdown-question.spec.js
index 654709926..8d7a28a85 100644
--- a/src/digital-components/dropdown-question/dropdown-question.spec.js
+++ b/src/digital-components/dropdown-question/dropdown-question.spec.js
@@ -1,6 +1,6 @@
 import { shallowMount } from "@vue/test-utils";
 import dropdownQuestion from "./dropdown-question";
-import crypto from "crypto";
+
 
 // Mock CMS content
 const questionText = "Question Text";
@@ -12,8 +12,6 @@ const mockMixin = {
     },
 };
 
-global.crypto = crypto;
-
 // TODO: Remove the following from dropdown-question.vue -> :class="(errors && errors.length) || hasError ? 'has-error' : ''"
 // It is not being used.
 describe("dropdownQuestion.vue", () => {
diff --git a/src/digital-components/dropdown-question/dropdown-question.vue b/src/digital-components/dropdown-question/dropdown-question.vue
index 5c32b298c..044b28a6c 100644
--- a/src/digital-components/dropdown-question/dropdown-question.vue
+++ b/src/digital-components/dropdown-question/dropdown-question.vue
@@ -30,27 +30,27 @@
 
 <script>
 import { useField } from "vee-validate";
+import { v4 as uuidv4 } from "uuid";
 
 export default {
     name: "dropdown-question",
     props: {
-        modelValue: String,
-        customInputId: String,
+        customDropdownId: String,
         options: {
             type: Object,
             required: true,
         },
+        modelValue: String,
         isDisabled: Boolean,
         isRequired: Boolean,
         validationRules: String,
         cmsWidgetName: String,
-        hasError: Boolean,
-        placeHolderText: String,
-        customDropdownId: String,
+        hasError: Boolean,     
     },
     setup(props) {
+        const uuid = uuidv4();
         const dropdownId = !props.customDropdownId
-            ? `dropdown-${crypto.randomUUID()}`
+            ? `dropdown-${uuid}`
             : props.customDropdownId;
 
         const propsClone = Object.assign({}, props);
diff --git a/src/digital-components/modal/modal.spec.js b/src/digital-components/modal/modal.spec.js
index e4d8692d4..73ad5e92f 100644
--- a/src/digital-components/modal/modal.spec.js
+++ b/src/digital-components/modal/modal.spec.js
@@ -7,15 +7,13 @@ const mockMeta = (returnValue) => jest.fn(async () => Promise.resolve(returnValu
 
 import { shallowMount } from "@vue/test-utils";
 import modal from "./modal";
-import crypto from "crypto";
+
 import { useForm } from "vee-validate";
 import { Modal } from "bootstrap";
 
 const footerButtonText = "Sample footer text here.";
 const headerText = "Sample header text here.";
 
-global.crypto = crypto;
-
 describe("modal.vue", () => {
     it("Should display modal header text when headerText is defined", async () => {
         // Arrange / Act
diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 0004be47e..e0add89dc 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -44,6 +44,7 @@
 import modalButtonMain from "@/digital-components/modal/ux-components/modal-button-main/modal-button-main";
 import { Modal } from "bootstrap";
 import { useForm } from "vee-validate";
+import { v4 as uuidv4 } from "uuid";
 
 export default {
     name: "modal",
@@ -58,7 +59,9 @@ export default {
         },
     },
     setup() {
-        const modalId = `modal-${crypto.randomUUID()}`;
+        const uuid = uuidv4(); 
+        const modalId = `modal-${uuid}`;
+
         const { meta, validate, resetForm } = useForm();
 
         return {
diff --git a/src/digital-components/textbox-question/textbox-question.spec.js b/src/digital-components/textbox-question/textbox-question.spec.js
index aea563624..be33230c2 100644
--- a/src/digital-components/textbox-question/textbox-question.spec.js
+++ b/src/digital-components/textbox-question/textbox-question.spec.js
@@ -1,6 +1,5 @@
 import { shallowMount } from "@vue/test-utils";
 import textboxQuestion from "./textbox-question";
-import crypto from "crypto";
 
 // Mock CMS content
 const questionText = "Question Text";
@@ -13,8 +12,6 @@ const mockMixin = {
 };
 const maska = jest.fn();
 
-global.crypto = crypto;
-
 describe("textboxQuestion.vue", () => {
     it("Should render a text input", async () => {
         // Arrange
diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index a4de11254..ca182d348 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -77,13 +77,14 @@
 
 <script>
 import { useField, validate } from "vee-validate";
-import { storeActions } from "@/constants/store-actions";
 import loader from "@/ux-components/loader/loader.vue";
 import { ref } from "vue";
+import { v4 as uuidv4 } from "uuid";
 
 export default {
     name: "textbox-question",
     props: {
+        customInputId: String,
         type: {
             type: String,
             default: "text",
@@ -97,7 +98,6 @@ export default {
             default: true,
         },
         modelValue: String,
-        customInputId: String,
         isDisabled: Boolean,
         isRequired: Boolean,
         hasIcon: Boolean, // If input has an icon
@@ -120,7 +120,8 @@ export default {
         centerErrorMessage: Boolean,
     },
     setup(props) {
-        const inputId = !props.customInputId ? `input-${crypto.randomUUID()}` : props.customInputId;
+        const uuid = uuidv4(); 
+        const inputId = !props.customInputId ? `input-${uuid}` : props.customInputId;
 
         const propsClone = Object.assign({}, props);
         const modelValue = propsClone.modelValue;
diff --git a/src/fmg-components/content-group-modal/content-group-modal.spec.js b/src/fmg-components/content-group-modal/content-group-modal.spec.js
index cbdf6e182..a8058b2d5 100644
--- a/src/fmg-components/content-group-modal/content-group-modal.spec.js
+++ b/src/fmg-components/content-group-modal/content-group-modal.spec.js
@@ -1,8 +1,5 @@
 import { mount } from "@vue/test-utils";
 import contentGroupModal from "./content-group-modal";
-import crypto from "crypto";
-
-global.crypto = crypto;
 
 describe("content-group-modal.vue", () => {
     it("Should display header text when HeaderText is defined in the CMS", async () => {
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index 3ad8a8df2..2505715bc 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -1,6 +1,6 @@
 <template>
-    <div class="address-questions" role="application">
-        <div class="row mb-4">
+    <div class="address-questions" >
+        <div class="row mb-4" aria-live="polite">
             <div class="col">
                 <textboxQuestion
                     id="streetAddressField"
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
index 66bd93799..7f9ba0656 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
@@ -2,11 +2,6 @@ import mobileLocationModalQuestions from "./mobile-location-modal-questions";
 import { mount, shallowMount } from "@vue/test-utils";
 import { storeActions } from "@/constants/store-actions";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
-import modal from "@/digital-components/modal/modal";
-
-import crypto from "crypto";
-
-global.crypto = crypto;
 
 const linkWidgetName = "linkWidgetName";
 const modalWidgetName = "modalWidgetName";
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index eebaaab07..8eab8d799 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -76,6 +76,7 @@ import {
 
 // Validation
 import { useField } from "vee-validate";
+import { v4 as uuidv4 } from "uuid";
 
 export default {
     name: "mobile-location-modal-questions",
@@ -89,8 +90,9 @@ export default {
         };
     },
     setup(props) {
+        const uuid = uuidv4(); 
         const componentId = !props.customComponentId
-            ? `component-${crypto.randomUUID()}`
+            ? `component-${uuid}`
             : props.customComponentId;
 
         // Integrate this component as a single field with an object for it's value into the page level validation
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
index 6c9cf42f5..c1ebd65af 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
@@ -1,7 +1,5 @@
 import { mount, shallowMount } from "@vue/test-utils";
 import serviceZipModalQuestion from "./service-zip-modal-question";
-import crypto from "crypto";
-global.crypto = crypto;
 
 jest.mock("@/digital-components/textbox-question/textbox-question", () => ({
     getCmsContent: jest.fn((widgetName, cmsFieldName) => {