diff --git a/src/digital-components/modal/modal.spec.js b/src/digital-components/modal/modal.spec.js
index 963167829..7ed8fff12 100644
--- a/src/digital-components/modal/modal.spec.js
+++ b/src/digital-components/modal/modal.spec.js
@@ -1,7 +1,6 @@
 import { shallowMount } from "@vue/test-utils";
 import Modal from "./modal";
 import crypto from "crypto";
-import { useForm } from "vee-validate";
 
 const modalId = "modal-one";
 const footerButtonText = "Sample footer text here.";
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 a8058b2d5..cbdf6e182 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,5 +1,8 @@
 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/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 03c3f6759..75ee865ca 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -120,6 +120,7 @@ export default {
         },
 
         onModalOpened() {
+            this.serviceZipCodeInput = this.serviceZipModel.zipCode;
             this.focusOnZipInput();
         },