diff --git a/client/src/app/app.test.js b/client/src/app/app.test.js
index ff8e25eaa868..50664b289345 100644
--- a/client/src/app/app.test.js
+++ b/client/src/app/app.test.js
@@ -1,6 +1,7 @@
 import galaxyOptions from "@tests/test-data/bootstrapped";
 import { getGalaxyInstance, setGalaxyInstance } from "app";
 import Backbone from "backbone";
+import { suppressDebugConsole } from "tests/jest/helpers";
 
 export function setupTestGalaxy(galaxyOptions_ = null) {
     galaxyOptions_ = galaxyOptions_ || galaxyOptions;
@@ -13,6 +14,10 @@ export function setupTestGalaxy(galaxyOptions_ = null) {
     });
 }
 
+// the app console debugs make sense but we just don't want to see them in test
+// output.
+suppressDebugConsole();
+
 describe("App base construction/initializiation defaults", () => {
     beforeEach(() => {
         setupTestGalaxy(galaxyOptions);
diff --git a/client/src/components/ConfigTemplates/formUtil.ts b/client/src/components/ConfigTemplates/formUtil.ts
index b6908259dcf9..6608597a32a6 100644
--- a/client/src/components/ConfigTemplates/formUtil.ts
+++ b/client/src/components/ConfigTemplates/formUtil.ts
@@ -218,9 +218,7 @@ export function upgradeForm(template: TemplateSummary, instance: Instance): Form
     }
     for (const secret of secrets) {
         const secretName = secret.name;
-        if (secretsSet.indexOf(secretName) >= 0) {
-            console.log("skipping...");
-        } else {
+        if (secretsSet.indexOf(secretName) < 0) {
             form.push(templateSecretFormEntry(secret));
         }
     }
diff --git a/client/src/components/Dataset/DatasetStorage/DatasetStorage.test.ts b/client/src/components/Dataset/DatasetStorage/DatasetStorage.test.ts
index a1b0b8e384de..9ef1926d5e80 100644
--- a/client/src/components/Dataset/DatasetStorage/DatasetStorage.test.ts
+++ b/client/src/components/Dataset/DatasetStorage/DatasetStorage.test.ts
@@ -1,6 +1,6 @@
 import { shallowMount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
-import { getLocalVue } from "tests/jest/helpers";
+import { getLocalVue, suppressDebugConsole } from "tests/jest/helpers";
 
 import { type DatasetStorageDetails } from "@/api";
 import { useServerMock } from "@/api/client/__mocks__";
@@ -58,6 +58,7 @@ describe("DatasetStorage.vue", () => {
     });
 
     it("test error rendering...", async () => {
+        suppressDebugConsole();
         mount({ simulateError: true });
         await flushPromises();
         expect(wrapper.findAll(".error").length).toBe(1);
diff --git a/client/src/components/Form/Elements/FormData/FormData.test.js b/client/src/components/Form/Elements/FormData/FormData.test.js
index 709f2910a791..25ed1945588f 100644
--- a/client/src/components/Form/Elements/FormData/FormData.test.js
+++ b/client/src/components/Form/Elements/FormData/FormData.test.js
@@ -1,3 +1,5 @@
+import "tests/jest/mockHelpPopovers";
+
 import { createTestingPinia } from "@pinia/testing";
 import { mount } from "@vue/test-utils";
 import { PiniaVuePlugin } from "pinia";
diff --git a/client/src/components/Grid/GridList.test.js b/client/src/components/Grid/GridList.test.js
index 0a2668c74687..3abe0006a669 100644
--- a/client/src/components/Grid/GridList.test.js
+++ b/client/src/components/Grid/GridList.test.js
@@ -3,8 +3,8 @@ import { mount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
 import { PiniaVuePlugin } from "pinia";
 import { getLocalVue } from "tests/jest/helpers";
+import { setupMockConfig } from "tests/jest/mockConfig";
 
-import { useConfig } from "@/composables/config";
 import Filtering from "@/utils/filtering";
 
 import MountTarget from "./GridList.vue";
@@ -12,15 +12,8 @@ import MountTarget from "./GridList.vue";
 jest.useFakeTimers();
 
 jest.mock("composables/config");
-useConfig.mockReturnValue({
-    config: {
-        value: {
-            disabled: false,
-            enabled: true,
-        },
-    },
-    isConfigLoaded: true,
-});
+
+setupMockConfig({ disabled: false, enabled: true });
 
 jest.mock("vue-router/composables");
 
diff --git a/client/src/components/History/CurrentHistory/SelectPreferredStore.test.ts b/client/src/components/History/CurrentHistory/SelectPreferredStore.test.ts
index 7638ef43b918..c500afa2af64 100644
--- a/client/src/components/History/CurrentHistory/SelectPreferredStore.test.ts
+++ b/client/src/components/History/CurrentHistory/SelectPreferredStore.test.ts
@@ -3,6 +3,7 @@ import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 import flushPromises from "flush-promises";
 import { getLocalVue } from "tests/jest/helpers";
+import { h } from "vue";
 
 import { useServerMock } from "@/api/client/__mocks__";
 import { ROOT_COMPONENT } from "@/utils/navigation/schema";
@@ -42,6 +43,13 @@ async function mountComponent() {
 
 const PREFERENCES = ROOT_COMPONENT.preferences;
 
+// bootstrap vue will try to match targets to actual HTML elements in DOM but there
+// may be no DOM for jest tests, just stub out an alternative minimal implementation.
+jest.mock("@/components/ObjectStore/ObjectStoreSelectButtonPopover.vue", () => ({
+    name: "ObjectStoreSelectButtonPopover",
+    render: () => h("div", "Mocked Popover"),
+}));
+
 describe("SelectPreferredStore.vue", () => {
     let axiosMock: MockAdapter;
 
diff --git a/client/src/components/History/Multiple/MultipleView.test.js b/client/src/components/History/Multiple/MultipleView.test.js
index cb7f83264164..4ab167eb7029 100644
--- a/client/src/components/History/Multiple/MultipleView.test.js
+++ b/client/src/components/History/Multiple/MultipleView.test.js
@@ -3,6 +3,7 @@ import { mount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
 import { createPinia } from "pinia";
 import { getLocalVue } from "tests/jest/helpers";
+import { setupMockConfig } from "tests/jest/mockConfig";
 
 import { useServerMock } from "@/api/client/__mocks__";
 import { useHistoryStore } from "@/stores/historyStore";
@@ -13,6 +14,8 @@ import MultipleView from "./MultipleView.vue";
 const USER_ID = "test-user-id";
 const FIRST_HISTORY_ID = "test-history-id-0";
 
+setupMockConfig({});
+
 const { server, http } = useServerMock();
 
 const getFakeHistorySummaries = (num) => {
@@ -29,10 +32,6 @@ describe("MultipleView", () => {
         const fakeSummaries = getFakeHistorySummaries(count);
 
         server.use(
-            http.get("/api/configuration", ({ response }) => {
-                return response(200).json({});
-            }),
-
             http.get("/api/histories/{history_id}", ({ response, params }) => {
                 const { history_id } = params;
                 const summary = fakeSummaries.find((s) => s.id === history_id);
diff --git a/client/src/components/JobInformation/JobInformation.test.js b/client/src/components/JobInformation/JobInformation.test.js
index 68602a1b6ffd..8cc65b9499c3 100644
--- a/client/src/components/JobInformation/JobInformation.test.js
+++ b/client/src/components/JobInformation/JobInformation.test.js
@@ -1,3 +1,5 @@
+import "tests/jest/mockHelpPopovers";
+
 import { mount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
 import { getLocalVue } from "tests/jest/helpers";
diff --git a/client/src/components/Masthead/QuotaMeter.test.ts b/client/src/components/Masthead/QuotaMeter.test.ts
index b405a5b36a12..70b8b12989d5 100644
--- a/client/src/components/Masthead/QuotaMeter.test.ts
+++ b/client/src/components/Masthead/QuotaMeter.test.ts
@@ -3,6 +3,7 @@ import { getFakeRegisteredUser } from "@tests/test-data";
 import { mount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
 import { getLocalVue } from "tests/jest/helpers";
+import { setupMockConfig } from "tests/jest/mockConfig";
 
 import { type RegisteredUser } from "@/api";
 import { useUserStore } from "@/stores/userStore";
@@ -11,19 +12,10 @@ import QuotaMeter from "./QuotaMeter.vue";
 
 jest.mock("@/api/schema");
 
-let configValues = { enable_quotas: true };
-
-jest.mock("@/composables/config", () => ({
-    useConfig: jest.fn(() => ({
-        config: { value: { ...configValues } },
-        isConfigLoaded: true,
-    })),
-}));
-
 const localVue = getLocalVue();
 
 async function createQuotaMeterWrapper(config: any, user: RegisteredUser) {
-    configValues = { ...config };
+    setupMockConfig(config);
     const pinia = createTestingPinia();
     const userStore = useUserStore();
     userStore.currentUser = user;
diff --git a/client/src/components/StsDownloadButton.test.js b/client/src/components/StsDownloadButton.test.js
index e35f720a59b0..29506c7b5cd9 100644
--- a/client/src/components/StsDownloadButton.test.js
+++ b/client/src/components/StsDownloadButton.test.js
@@ -6,8 +6,7 @@ import MockAdapter from "axios-mock-adapter";
 import flushPromises from "flush-promises";
 import { createPinia } from "pinia";
 import { getLocalVue } from "tests/jest/helpers";
-
-import { useServerMock } from "@/api/client/__mocks__";
+import { setupMockConfig } from "tests/jest/mockConfig";
 
 import StsDownloadButton from "./StsDownloadButton.vue";
 
@@ -22,14 +21,8 @@ const FALLBACK_URL = "http://cow.com/direct_download";
 const DOWNLOAD_ENDPOINT = "http://cow.com/prepare_download";
 const STORAGE_REQUEST_ID = "moocow1235";
 
-const { server, http } = useServerMock();
-
 async function mountStsDownloadButtonWrapper(config) {
-    server.use(
-        http.get("/api/configuration", ({ response }) => {
-            return response(200).json(config);
-        })
-    );
+    setupMockConfig(config);
 
     const pinia = createPinia();
     const wrapper = mount(StsDownloadButton, {
diff --git a/client/src/components/TagsMultiselect/StatelessTags.test.js b/client/src/components/TagsMultiselect/StatelessTags.test.js
index 54a35a19bb38..487c7057f1e4 100644
--- a/client/src/components/TagsMultiselect/StatelessTags.test.js
+++ b/client/src/components/TagsMultiselect/StatelessTags.test.js
@@ -1,7 +1,6 @@
 import { mount } from "@vue/test-utils";
 import { useToast } from "composables/toast";
-import { getLocalVue } from "tests/jest/helpers";
-import { computed } from "vue";
+import { getLocalVue, suppressBootstrapVueWarnings } from "tests/jest/helpers";
 
 import { normalizeTag, useUserTagsStore } from "@/stores/userTagsStore";
 
@@ -19,10 +18,12 @@ const mountWithProps = (props) => {
     });
 };
 
+suppressBootstrapVueWarnings();
+
 jest.mock("@/stores/userTagsStore");
 const onNewTagSeenMock = jest.fn((tag) => tag);
 useUserTagsStore.mockReturnValue({
-    userTags: computed(() => autocompleteTags),
+    userTags: autocompleteTags,
     onNewTagSeen: onNewTagSeenMock,
     onTagUsed: jest.fn(),
     onMultipleNewTagsSeen: jest.fn(),
diff --git a/client/src/components/TagsMultiselect/StatelessTags.vue b/client/src/components/TagsMultiselect/StatelessTags.vue
index 7f2256a4aaa3..1bca9868a8f9 100644
--- a/client/src/components/TagsMultiselect/StatelessTags.vue
+++ b/client/src/components/TagsMultiselect/StatelessTags.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { BButton } from "bootstrap-vue";
-import { storeToRefs } from "pinia";
 import { computed, onMounted, ref } from "vue";
 
 import { useToast } from "@/composables/toast";
@@ -36,7 +35,6 @@ const emit = defineEmits<{
 }>();
 
 const userTagsStore = useUserTagsStore();
-const { userTags } = storeToRefs(userTagsStore);
 const { warning } = useToast();
 
 onMounted(() => {
@@ -110,7 +108,7 @@ function onTagClicked(tag: string) {
             </div>
 
             <HeadlessMultiselect
-                :options="userTags"
+                :options="userTagsStore.userTags"
                 :selected="props.value"
                 :placeholder="props.placeholder"
                 :validator="isValid"
diff --git a/client/src/components/Tool/ToolCard.test.js b/client/src/components/Tool/ToolCard.test.js
index 25226dd0a8b0..74b38b1f28e8 100644
--- a/client/src/components/Tool/ToolCard.test.js
+++ b/client/src/components/Tool/ToolCard.test.js
@@ -1,20 +1,22 @@
 import { mount } from "@vue/test-utils";
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
+import flushPromises from "flush-promises";
 import { createPinia } from "pinia";
 import { useUserStore } from "stores/userStore";
 import { getLocalVue } from "tests/jest/helpers";
+import { setupMockConfig } from "tests/jest/mockConfig";
+
+import { useServerMock } from "@/api/client/__mocks__";
 
 import ToolCard from "./ToolCard";
 
+const { server, http } = useServerMock();
+
 jest.mock("@/api/schema");
 
-jest.mock("@/composables/config", () => ({
-    useConfig: jest.fn(() => ({
-        config: { enable_tool_source_display: false },
-        isConfigLoaded: true,
-    })),
-}));
+const config = { enable_tool_source_display: false };
+setupMockConfig(config);
 
 const localVue = getLocalVue();
 
@@ -23,7 +25,15 @@ describe("ToolCard", () => {
     let axiosMock;
     let userStore;
 
-    beforeEach(() => {
+    beforeEach(async () => {
+        // some child component must be bypassing useConfig - so we need to explicitly
+        // stup the API endpoint also. If you can drop this without request problems in log,
+        // this hack can be removed.
+        server.use(
+            http.get("/api/configuration", ({ response }) => {
+                return response(200).json(config);
+            })
+        );
         axiosMock = new MockAdapter(axios);
         axiosMock.onGet(`/api/webhooks`).reply(200, []);
 
@@ -38,9 +48,12 @@ describe("ToolCard", () => {
                 sustainVersion: false,
                 options: {
                     id: "options.id",
+                    name: "options.name",
+                    version: "options.version",
                     versions: [],
                     sharable_url: "options.sharable_url",
                     help: "options.help",
+                    help_format: "restructuredtext",
                     citations: false,
                 },
                 messageText: "messageText",
@@ -60,6 +73,7 @@ describe("ToolCard", () => {
             is_admin: true,
             preferences: {},
         };
+        await flushPromises();
     });
 
     it("shows props", async () => {
@@ -81,5 +95,6 @@ describe("ToolCard", () => {
         await wrapper.setProps({ disabled: true });
         const backdropActive = wrapper.findAll(".portlet-backdrop");
         expect(backdropActive.length).toBe(1);
+        await flushPromises();
     });
 });
diff --git a/client/src/components/Tool/ToolSelectPreferredObjectStore.test.js b/client/src/components/Tool/ToolSelectPreferredObjectStore.test.js
index 2bbad3ab37ca..9034badb4520 100644
--- a/client/src/components/Tool/ToolSelectPreferredObjectStore.test.js
+++ b/client/src/components/Tool/ToolSelectPreferredObjectStore.test.js
@@ -1,8 +1,10 @@
+import "tests/jest/mockHelpPopovers";
+
 import { mount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
 import { getLocalVue } from "tests/jest/helpers";
+import { setupMockConfig } from "tests/jest/mockConfig";
 
-import { useServerMock } from "@/api/client/__mocks__";
 import { setupSelectableMock } from "@/components/ObjectStore/mockServices";
 import { ROOT_COMPONENT } from "@/utils/navigation";
 
@@ -12,15 +14,9 @@ setupSelectableMock();
 
 const localVue = getLocalVue(true);
 
-const { server, http } = useServerMock();
+setupMockConfig({});
 
 function mountComponent() {
-    server.use(
-        http.get("/api/configuration", ({ response }) => {
-            return response(200).json({});
-        })
-    );
-
     const wrapper = mount(ToolSelectPreferredObjectStore, {
         propsData: { toolPreferredObjectStoreId: null },
         localVue,
diff --git a/client/src/components/Toolshed/InstalledList/Details.vue b/client/src/components/Toolshed/InstalledList/Details.vue
index 1dc166b64756..6be8e38dbf85 100644
--- a/client/src/components/Toolshed/InstalledList/Details.vue
+++ b/client/src/components/Toolshed/InstalledList/Details.vue
@@ -3,9 +3,9 @@
         <div v-if="error" class="alert alert-danger" show>{{ error }}</div>
         <div v-else>
             <span v-if="loading">
-                <b-card>
+                <BCard>
                     <LoadingSpan message="Loading installed repository details" />
-                </b-card>
+                </BCard>
             </span>
             <div v-else>
                 <RepositoryDetails :repo="toolshedRepository" :toolshed-url="repo.tool_shed_url" />
@@ -14,6 +14,7 @@
     </div>
 </template>
 <script>
+import { BCard } from "bootstrap-vue";
 import LoadingSpan from "components/LoadingSpan";
 import { getAppRoot } from "onload/loadConfig";
 
@@ -23,6 +24,7 @@ import RepositoryDetails from "../RepositoryDetails/Index.vue";
 
 export default {
     components: {
+        BCard,
         LoadingSpan,
         RepositoryDetails,
     },
diff --git a/client/src/components/Toolshed/RepositoryDetails/Index.test.ts b/client/src/components/Toolshed/RepositoryDetails/Index.test.ts
index b2a8cc0b19a7..e733ed052b9b 100644
--- a/client/src/components/Toolshed/RepositoryDetails/Index.test.ts
+++ b/client/src/components/Toolshed/RepositoryDetails/Index.test.ts
@@ -1,7 +1,7 @@
 import { shallowMount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
 import { createPinia } from "pinia";
-import { getLocalVue } from "tests/jest/helpers";
+import { getLocalVue, suppressDebugConsole } from "tests/jest/helpers";
 
 import { HttpResponse, useServerMock } from "@/api/client/__mocks__";
 
@@ -10,6 +10,8 @@ import Index from "./Index.vue";
 const { server, http } = useServerMock();
 
 describe("RepositoryDetails", () => {
+    suppressDebugConsole(); // we issue a debug warning when a repo has no revisions
+
     it("test repository details index", async () => {
         server.use(
             http.get("/api/configuration", ({ response }) => {
diff --git a/client/src/components/Workflow/Editor/Forms/FormTool.test.js b/client/src/components/Workflow/Editor/Forms/FormTool.test.js
index 72ce85fddec6..56c65045504d 100644
--- a/client/src/components/Workflow/Editor/Forms/FormTool.test.js
+++ b/client/src/components/Workflow/Editor/Forms/FormTool.test.js
@@ -2,8 +2,11 @@ import { createTestingPinia } from "@pinia/testing";
 import { mount } from "@vue/test-utils";
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
+import flushPromises from "flush-promises";
 import { getLocalVue } from "tests/jest/helpers";
 
+import { useServerMock } from "@/api/client/__mocks__";
+
 import FormTool from "./FormTool";
 
 jest.mock("@/api/schema");
@@ -17,10 +20,20 @@ jest.mock("@/composables/config", () => ({
 
 const localVue = getLocalVue();
 
+const { server, http } = useServerMock();
+
 describe("FormTool", () => {
     const axiosMock = new MockAdapter(axios);
     axiosMock.onGet(`/api/webhooks`).reply(200, []);
 
+    beforeEach(() => {
+        server.use(
+            http.get("/api/configuration", ({ response }) => {
+                return response(200).json({});
+            })
+        );
+    });
+
     function mountTarget() {
         return mount(FormTool, {
             propsData: {
@@ -35,6 +48,7 @@ describe("FormTool", () => {
                         description: "description",
                         inputs: [{ name: "input", label: "input", type: "text", value: "value" }],
                         help: "help_text",
+                        help_format: "restructuredtext",
                         versions: ["1.0", "2.0", "3.0"],
                         citations: false,
                     },
@@ -71,5 +85,6 @@ describe("FormTool", () => {
         state = wrapper.emitted().onSetData[1][1];
         expect(state.tool_version).toEqual("3.0");
         expect(state.tool_id).toEqual("tool_id+3.0");
+        await flushPromises();
     });
 });
diff --git a/client/src/components/Workflow/Editor/Index.test.ts b/client/src/components/Workflow/Editor/Index.test.ts
index 62e9673f3673..7262d2d72956 100644
--- a/client/src/components/Workflow/Editor/Index.test.ts
+++ b/client/src/components/Workflow/Editor/Index.test.ts
@@ -38,7 +38,7 @@ describe("Index", () => {
         const datatypesStore = useDatatypesMapperStore();
         datatypesStore.datatypesMapper = testDatatypesMapper;
         mockLoadWorkflow.mockResolvedValue({ steps: {} });
-        MockGetVersions.mockResolvedValue(() => []);
+        MockGetVersions.mockResolvedValue([]);
         mockGetStateUpgradeMessages.mockImplementation(() => []);
         mockGetAppRoot.mockImplementation(() => "prefix/");
         Object.defineProperty(window, "onbeforeunload", {
diff --git a/client/src/components/Workflow/Editor/Index.vue b/client/src/components/Workflow/Editor/Index.vue
index 99087e09d500..1943de38e215 100644
--- a/client/src/components/Workflow/Editor/Index.vue
+++ b/client/src/components/Workflow/Editor/Index.vue
@@ -190,7 +190,7 @@
 import { library } from "@fortawesome/fontawesome-svg-core";
 import { faArrowLeft, faArrowRight, faHistory } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
-import { useMagicKeys, whenever } from "@vueuse/core";
+import { whenever } from "@vueuse/core";
 import { logicAnd, logicNot, logicOr } from "@vueuse/math";
 import { Toast } from "composables/toast";
 import { storeToRefs } from "pinia";
@@ -199,6 +199,7 @@ import Vue, { computed, nextTick, onUnmounted, ref, unref, watch } from "vue";
 import { getUntypedWorkflowParameters } from "@/components/Workflow/Editor/modules/parameters";
 import { ConfirmDialog } from "@/composables/confirmDialog";
 import { useDatatypesMapper } from "@/composables/datatypesMapper";
+import { useMagicKeys } from "@/composables/useMagicKeys";
 import { useUid } from "@/composables/utils/uid";
 import { provideScopedWorkflowStores } from "@/composables/workflowStores";
 import { hide_modal } from "@/layout/modal";
diff --git a/client/src/components/Workflow/Editor/NodeOutput.test.ts b/client/src/components/Workflow/Editor/NodeOutput.test.ts
index 414ebd7e42f3..db7f46221b85 100644
--- a/client/src/components/Workflow/Editor/NodeOutput.test.ts
+++ b/client/src/components/Workflow/Editor/NodeOutput.test.ts
@@ -37,6 +37,9 @@ function propsForStep(step: Step) {
         scroll: { x: ref(0), y: ref(0) },
         scale: 1,
         datatypesMapper: testDatatypesMapper,
+        parentNode: null,
+        readonly: true,
+        blank: false,
     };
 }
 
diff --git a/client/src/components/Workflow/Editor/Options.vue b/client/src/components/Workflow/Editor/Options.vue
index 4cc7932e9966..e288489a0364 100644
--- a/client/src/components/Workflow/Editor/Options.vue
+++ b/client/src/components/Workflow/Editor/Options.vue
@@ -38,7 +38,6 @@ const props = defineProps<{
     hasChanges?: boolean;
     hasInvalidConnections?: boolean;
     requiredReindex?: boolean;
-    currentActivePanel: string;
 }>();
 
 const { confirm } = useConfirmDialog();
diff --git a/client/src/composables/taskMonitor.test.ts b/client/src/composables/taskMonitor.test.ts
index 60702963e983..71b195cb755d 100644
--- a/client/src/composables/taskMonitor.test.ts
+++ b/client/src/composables/taskMonitor.test.ts
@@ -1,4 +1,5 @@
 import flushPromises from "flush-promises";
+import { suppressDebugConsole } from "tests/jest/helpers";
 
 import { useServerMock } from "@/api/client/__mocks__";
 import { useTaskMonitor } from "@/composables/taskMonitor";
@@ -68,6 +69,7 @@ describe("useTaskMonitor", () => {
 
     it("should indicate the task status request failed when the request failed", async () => {
         const { waitForTask, requestHasFailed, isRunning, isCompleted, taskStatus } = useTaskMonitor();
+        suppressDebugConsole();
 
         expect(requestHasFailed.value).toBe(false);
         waitForTask(REQUEST_FAILED_TASK_ID);
diff --git a/client/src/composables/useMagicKeys.js b/client/src/composables/useMagicKeys.js
new file mode 100644
index 000000000000..1d2338ce6c00
--- /dev/null
+++ b/client/src/composables/useMagicKeys.js
@@ -0,0 +1,15 @@
+import { useMagicKeys as wrappedUseMagicKeys } from "@vueuse/core";
+import Vue from "vue";
+
+export function useMagicKeys() {
+    // a version of useMagicKeys from vueuse/core that doesn't console.error the
+    // the message [Vue warn]: Vue 2 does not support reactive collection types such as Map or Set.
+    // in all our tests. This can be dropped after the migration to Vue3.
+    const oldSlientConfig = Vue.config.silent;
+    try {
+        Vue.config.silent = true;
+        return wrappedUseMagicKeys();
+    } finally {
+        Vue.config.silent = oldSlientConfig;
+    }
+}
diff --git a/client/src/store/historyStore/model/watchHistory.test.js b/client/src/store/historyStore/model/watchHistory.test.js
index 6669c0200e5e..dafd0700fc95 100644
--- a/client/src/store/historyStore/model/watchHistory.test.js
+++ b/client/src/store/historyStore/model/watchHistory.test.js
@@ -4,6 +4,7 @@ import MockAdapter from "axios-mock-adapter";
 import { createPinia, mapState } from "pinia";
 import { useHistoryItemsStore } from "stores/historyItemsStore";
 import { useHistoryStore } from "stores/historyStore";
+import { suppressDebugConsole } from "tests/jest/helpers";
 
 import { watchHistoryOnce } from "./watchHistory";
 
@@ -77,6 +78,8 @@ describe("watchHistory", () => {
     });
 
     it("survives a failing request", async () => {
+        suppressDebugConsole(); // we log that 500, totally expected, do not include it in test output
+
         // Setup a failing request, then update history content
         axiosMock
             .onGet(`/history/current_history_json`)
@@ -92,7 +95,6 @@ describe("watchHistory", () => {
         try {
             await watchHistoryOnce();
         } catch (error) {
-            console.log(error);
             expect(error.message).toContain("500");
         }
         // Need to reset axios mock here. Smells like a bug,
diff --git a/client/src/stores/workflowEditorToolbarStore.ts b/client/src/stores/workflowEditorToolbarStore.ts
index 3bb36ea75cda..c2db1be8f8fb 100644
--- a/client/src/stores/workflowEditorToolbarStore.ts
+++ b/client/src/stores/workflowEditorToolbarStore.ts
@@ -1,7 +1,7 @@
-import { useMagicKeys } from "@vueuse/core";
-import { computed, onScopeDispose, reactive, ref, watch } from "vue";
+import { computed, getCurrentScope, onScopeDispose, reactive, ref, watch } from "vue";
 
 import { type Rectangle } from "@/components/Workflow/Editor/modules/geometry";
+import { useMagicKeys } from "@/composables/useMagicKeys";
 import { useUserLocalStorage } from "@/composables/userLocalStorage";
 
 import { defineScopedStore } from "./scopedStore";
@@ -66,9 +66,11 @@ export const useWorkflowEditorToolbarStore = defineScopedStore("workflowEditorTo
 
         inputCatcherEventListeners.add(listener);
 
-        onScopeDispose(() => {
-            inputCatcherEventListeners.delete(listener);
-        });
+        if (getCurrentScope()) {
+            onScopeDispose(() => {
+                inputCatcherEventListeners.delete(listener);
+            });
+        }
     }
 
     onInputCatcherEvent("pointerdown", () => (inputCatcherPressed.value = true));
diff --git a/client/src/utils/upload-queue.test.js b/client/src/utils/upload-queue.test.js
index 3e5a72588132..ce38d572ea30 100644
--- a/client/src/utils/upload-queue.test.js
+++ b/client/src/utils/upload-queue.test.js
@@ -9,52 +9,66 @@ function StubFile(name = null, size = 0, mode = "local") {
     return { name, size, mode };
 }
 
+function instrumentedUploadQueue(options = {}) {
+    const uploadQueue = new UploadQueue(options);
+    uploadQueue.encountedErrors = false;
+    uploadQueue.opts.error = function (d, m) {
+        uploadQueue.encountedErrors = true;
+    };
+    return uploadQueue;
+}
+
 describe("UploadQueue", () => {
     test("a queue is initialized to correct state", () => {
-        const q = new UploadQueue({ foo: 1 });
+        const q = instrumentedUploadQueue({ foo: 1 });
         expect(q.size).toEqual(0);
         expect(q.isRunning).toBe(false);
         expect(q.opts.foo).toEqual(1); // passed as options
         expect(q.opts.multiple).toBe(true); // default value
+        expect(q.encountedErrors).toBeFalsy();
     });
 
     test("resetting the queue removes all files from it", () => {
-        const q = new UploadQueue();
+        const q = instrumentedUploadQueue();
         q.add([StubFile("a"), StubFile("b")]);
         expect(q.size).toEqual(2);
         q.reset();
         expect(q.size).toEqual(0);
+        expect(q.encountedErrors).toBeFalsy();
     });
 
     test("calling configure updates options", () => {
-        const q = new UploadQueue({ foo: 1 });
+        const q = instrumentedUploadQueue({ foo: 1 });
         expect(q.opts.foo).toEqual(1);
         expect(q.opts.bar).toBeUndefined();
         q.configure({ bar: 2 }); // overwrite bar
         expect(q.opts.foo).toEqual(1); // value unchangee
         expect(q.opts.bar).toEqual(2); // value overwritten
+        expect(q.encountedErrors).toBeFalsy();
     });
 
     test("calling start sets isRunning to true", () => {
-        const q = new UploadQueue();
+        const q = instrumentedUploadQueue();
         q._process = jest.fn(); // mock this, otherwise it'll reset isRunning after it's done.
         expect(q.isRunning).toBe(false);
         q.start();
         expect(q.isRunning).toBe(true);
+        expect(q.encountedErrors).toBeFalsy();
     });
 
     test("calling start is a noop if queue is running", () => {
-        const q = new UploadQueue();
+        const q = instrumentedUploadQueue();
         const mockedProcess = jest.fn();
         q._process = mockedProcess();
         q.isRunning = true;
         q.start();
         expect(mockedProcess.mock.calls.length === 0); // function was not called
+        expect(q.encountedErrors).toBeFalsy();
     });
 
     test("calling start processes all files in queue", () => {
         const fileEntries = {};
-        const q = new UploadQueue({
+        const q = instrumentedUploadQueue({
             get: (index) => fileEntries[index],
             announce: (index, file) => {
                 fileEntries[index] = {
@@ -62,6 +76,7 @@ describe("UploadQueue", () => {
                     fileName: file.name,
                     fileSize: file.size,
                     fileContent: "fileContent",
+                    targetHistoryId: "mockhistoryid",
                 };
             },
         });
@@ -71,12 +86,13 @@ describe("UploadQueue", () => {
         q.add([StubFile("a"), StubFile("b")]);
         q.start();
         expect(q.size).toEqual(0);
+        expect(q.encountedErrors).toBeFalsy();
         expect(spy.mock.calls.length).toEqual(3); // called for 2, 1, 0 files.
         spy.mockRestore(); // not necessary, but safer, in case we later modify implementation.
     });
 
     test("calling stop sets isPaused to true", () => {
-        const q = new UploadQueue();
+        const q = instrumentedUploadQueue();
         q.start();
         expect(q.isPaused).toBe(false);
         q.stop();
@@ -84,7 +100,7 @@ describe("UploadQueue", () => {
     });
 
     test("adding files increases the queue size by the number of files", () => {
-        const q = new UploadQueue();
+        const q = instrumentedUploadQueue();
         expect(q.size).toEqual(0);
         q.add([StubFile("a"), StubFile("b")]);
         expect(q.nextIndex).toEqual(2);
@@ -94,14 +110,14 @@ describe("UploadQueue", () => {
     });
 
     test("adding files increases the next index by the number of files", () => {
-        const q = new UploadQueue();
+        const q = instrumentedUploadQueue();
         expect(q.nextIndex).toEqual(0);
         q.add([StubFile("a"), StubFile("b")]);
         expect(q.nextIndex).toEqual(2);
     });
 
     test("duplicate files are not added to the queue, unless the mode is set to 'new'", () => {
-        const q = new UploadQueue();
+        const q = instrumentedUploadQueue();
         const file1 = StubFile("a", 1);
         const file2 = StubFile("a", 1);
         const file3 = StubFile("a", 1, "new");
@@ -115,7 +131,7 @@ describe("UploadQueue", () => {
 
     test("adding a file calls opts.announce with correct arguments", () => {
         const mockAnnounce = jest.fn();
-        const q = new UploadQueue({ announce: mockAnnounce });
+        const q = instrumentedUploadQueue({ announce: mockAnnounce });
         const file = StubFile("a");
         expect(mockAnnounce.mock.calls.length).toBe(0);
         q.add([file]);
@@ -126,7 +142,7 @@ describe("UploadQueue", () => {
 
     test("removing a file reduces the queue size by 1", () => {
         const fileEntries = {};
-        const q = new UploadQueue({
+        const q = instrumentedUploadQueue({
             announce: (index, file) => {
                 fileEntries[index] = file;
             },
@@ -138,7 +154,7 @@ describe("UploadQueue", () => {
     });
 
     test("removing a file by index out of sequence is allowed", () => {
-        const q = new UploadQueue();
+        const q = instrumentedUploadQueue();
         const file1 = StubFile("a");
         const file2 = StubFile("b");
         const file3 = StubFile("c");
@@ -149,10 +165,11 @@ describe("UploadQueue", () => {
         expect(q.queue.get("0")).toBe(file1);
         expect(q.queue.get("1")).toBeUndefined();
         expect(q.queue.get("2")).toBe(file3);
+        expect(q.encountedErrors).toBeFalsy();
     });
 
     test("removing a file via _processIndex, obeys FIFO protocol", () => {
-        const q = new UploadQueue();
+        const q = instrumentedUploadQueue();
         q.add([StubFile("a"), StubFile("b")]);
         let nextIndex = q._processIndex();
         expect(nextIndex).toEqual("0");
@@ -161,11 +178,12 @@ describe("UploadQueue", () => {
         expect(nextIndex).toEqual("1");
         q.remove(nextIndex);
         expect(q._processIndex()).toBeUndefined();
+        expect(q.encountedErrors).toBeFalsy();
     });
 
     test("remote file batch", () => {
         const fileEntries = {};
-        const q = new UploadQueue({
+        const q = instrumentedUploadQueue({
             historyId: "historyId",
             announce: (index, file) => {
                 fileEntries[index] = {
@@ -227,5 +245,6 @@ describe("UploadQueue", () => {
                 },
             ],
         });
+        expect(q.encountedErrors).toBeFalsy();
     });
 });
diff --git a/client/tests/jest/helpers.js b/client/tests/jest/helpers.js
index ff5f1e716919..a76a2a7b1191 100644
--- a/client/tests/jest/helpers.js
+++ b/client/tests/jest/helpers.js
@@ -273,3 +273,17 @@ export function injectTestRouter(localVue) {
     const router = new VueRouter();
     return router;
 }
+
+export function suppressDebugConsole() {
+    jest.spyOn(console, "debug").mockImplementation(jest.fn());
+}
+
+export function suppressBootstrapVueWarnings() {
+    jest.spyOn(console, "warn").mockImplementation(
+        jest.fn((msg) => {
+            if (msg.indexOf("BootstrapVue warn") < 0) {
+                console.warn(msg);
+            }
+        })
+    );
+}
diff --git a/client/tests/jest/jest.setup.js b/client/tests/jest/jest.setup.js
index 505e186fd517..8f20e2ba5d13 100644
--- a/client/tests/jest/jest.setup.js
+++ b/client/tests/jest/jest.setup.js
@@ -4,10 +4,25 @@ import "fake-indexeddb/auto";
 
 import Vue from "vue";
 
+// not available in jsdom, mock it out
+Element.prototype.scrollIntoView = jest.fn();
+
 // Set Vue to suppress production / devtools / etc. warnings
 Vue.config.productionTip = false;
 Vue.config.devtools = false;
 
+// if we do jest.mock(module) where modules imports Vue, it will create a clean Vue context
+// that ignores the above tips. So pre-emptively mock out Vue in these contexts with the following
+// block of code. GridList.test.js is a good example of this, when ran (yarn test GridList.test.js)
+// it will bypass the attempt to set the Vue config values above and print the messages anyway without
+// this block.
+jest.mock("vue", () => {
+    const Vue = jest.requireActual("vue"); // Import the actual Vue instance
+    Vue.config.productionTip = false; // Disable production tip
+    Vue.config.devtools = false; // Disable vue devtools
+    return Vue; // Return the modified Vue instance
+});
+
 /* still don't understand what was invoking the following, but nothing should,
 and this makes the tag tests work correctly */
 global.setImmediate = global.setTimeout;
diff --git a/client/tests/jest/mockConfig.js b/client/tests/jest/mockConfig.js
new file mode 100644
index 000000000000..0ef56b219900
--- /dev/null
+++ b/client/tests/jest/mockConfig.js
@@ -0,0 +1,10 @@
+import { useConfig } from "@/composables/config";
+
+jest.mock("composables/config");
+
+export function setupMockConfig(configValues, isConfigLoaded = true) {
+    return useConfig.mockReturnValue({
+        config: { value: configValues },
+        isConfigLoaded: isConfigLoaded,
+    });
+}
diff --git a/client/tests/jest/mockHelpPopovers.js b/client/tests/jest/mockHelpPopovers.js
new file mode 100644
index 000000000000..8c72aec63c05
--- /dev/null
+++ b/client/tests/jest/mockHelpPopovers.js
@@ -0,0 +1,11 @@
+// bootstrap vue will try to match targets to actual HTML elements in DOM but there
+// may be no DOM for jest tests, just stub out an alternative minimal implementation.
+jest.mock("@/components/Help/HelpPopover.vue", () => ({
+    name: "HelpPopover",
+    render: (h) => h("div", "Mocked Popover"),
+}));
+
+jest.mock("@/components/ObjectStore/ObjectStoreSelectButtonPopover.vue", () => ({
+    name: "ObjectStoreSelectButtonPopover",
+    render: (h) => h("div", "Mocked Popover"),
+}));