diff --git a/tnoodle-ui/src/test/App.test.js b/tnoodle-ui/src/test/App.test.js
index f032627d7..beac717e2 100644
--- a/tnoodle-ui/src/test/App.test.js
+++ b/tnoodle-ui/src/test/App.test.js
@@ -41,9 +41,7 @@ beforeEach(() => {
     ).mockImplementation(() => Promise.resolve(languages));
 
     jest.spyOn(tnoodleApi, "fetchRunningVersion").mockImplementation(() =>
-        Promise.resolve({
-            json: () => Promise.resolve(version),
-        })
+        Promise.resolve(version)
     );
 
     jest.spyOn(tnoodleApi, "fetchZip").mockImplementation((...payload) => {
@@ -51,7 +49,7 @@ beforeEach(() => {
         mbld = payload[1];
         password = payload[2];
         translations = payload[3];
-        return Promise.resolve(scrambleProgram);
+        return Promise.resolve(new Blob([]));
     });
 
     jest.spyOn(wcaApi, "fetchVersionInfo").mockImplementation(() =>
@@ -293,11 +291,6 @@ it("Online user", async () => {
         "fetchSuggestedFmcTranslations"
     ).mockImplementation(() => Promise.resolve(["de", "es", "pt-BR"]));
 
-    jest.spyOn(tnoodleApi, "fetchZip").mockImplementation(() => {
-        console.log("Generating zip");
-        return Promise.resolve(new Blob());
-    });
-
     // Render component
     await act(async () => {
         render(
@@ -331,6 +324,5 @@ it("Online user", async () => {
     wcaApi.fetchMe.mockRestore();
     wcaApi.getCompetitionJson.mockRestore();
     tnoodleApi.fetchBestMbldAttempt.mockRestore();
-    tnoodleApi.fetchSuggestedFmcTranslations.mockRestore();
-    tnoodleApi.fetchZip.mockRestore();*/
+    tnoodleApi.fetchSuggestedFmcTranslations.mockRestore();*/
 });
diff --git a/tnoodle-ui/src/test/Main.test.js b/tnoodle-ui/src/test/Main.test.js
index afc6ac7a7..fc0d7c31c 100644
--- a/tnoodle-ui/src/test/Main.test.js
+++ b/tnoodle-ui/src/test/Main.test.js
@@ -13,15 +13,25 @@ import {
 
 import Main from "../main/components/Main";
 
-import { events, languages, formats } from "./mock/tnoodle.api.mock";
+import { events, languages, formats, version } from "./mock/tnoodle.api.mock";
+import { scrambleProgram } from "./mock/wca.api.mock";
 
 const tnoodleApi = require("../main/api/tnoodle.api");
+const wcaApi = require("../main/api/wca.api");
 
 let container = null;
 beforeEach(() => {
     // setup a DOM element as a render target
     container = document.createElement("div");
     document.body.appendChild(container);
+
+    jest.spyOn(tnoodleApi, "fetchRunningVersion").mockImplementation(() =>
+        Promise.resolve(version)
+    );
+
+    jest.spyOn(wcaApi, "fetchVersionInfo").mockImplementation(() =>
+        Promise.resolve(scrambleProgram)
+    );
 });
 
 afterEach(() => {
@@ -29,6 +39,9 @@ afterEach(() => {
     unmountComponentAtNode(container);
     container.remove();
     container = null;
+
+    tnoodleApi.fetchRunningVersion.mockRestore();
+    wcaApi.fetchVersionInfo.mockRestore();
 });
 
 it("There should be only 1 button of type submit, check FMC changes", async () => {