diff --git a/packages/core/src/features/application-menu/application-menu-in-legacy-extension-api.test.ts b/packages/core/src/features/application-menu/application-menu-in-legacy-extension-api.test.ts
index 6b9988ab0c..c2a85d384c 100644
--- a/packages/core/src/features/application-menu/application-menu-in-legacy-extension-api.test.ts
+++ b/packages/core/src/features/application-menu/application-menu-in-legacy-extension-api.test.ts
@@ -38,7 +38,7 @@ describe("application-menu-in-legacy-extension-api", () => {
     let onClickMock: jest.Mock;
     let testExtensionOptions: FakeExtensionOptions;
 
-    beforeEach(() => {
+    beforeEach(async () => {
       onClickMock = jest.fn();
 
       testExtensionOptions = {
@@ -112,7 +112,7 @@ describe("application-menu-in-legacy-extension-api", () => {
     });
 
     describe("when the extension is disabled", () => {
-      beforeEach(() => {
+      beforeEach(async () => {
         await builder.extensions.disable(testExtensionOptions);
       });
 
@@ -125,7 +125,7 @@ describe("application-menu-in-legacy-extension-api", () => {
         expect(menuItemPathsForExtension).toEqual([]);
       });
 
-      it("when the extension is enabled again, also related menu items exist again", () => {
+      it("when the extension is enabled again, also related menu items exist again", async () => {
         await builder.extensions.enable(testExtensionOptions);
 
         const menuItemPathsForExtension = builder.applicationMenu.items.filter(
@@ -146,7 +146,7 @@ describe("application-menu-in-legacy-extension-api", () => {
 
   describe("when extension with unrecognizable application menu items is enabled", () => {
 
-    beforeEach(() => {
+    beforeEach(async () => {
       const testExtensionOptions: FakeExtensionOptions = {
         id: "some-test-extension",
         name: "some-extension-name",
diff --git a/packages/core/src/features/application-update/child-features/periodical-checking-of-updates/periodical-checking-of-updates.test.ts b/packages/core/src/features/application-update/child-features/periodical-checking-of-updates/periodical-checking-of-updates.test.ts
index 6b47473e69..cd71a552fa 100644
--- a/packages/core/src/features/application-update/child-features/periodical-checking-of-updates/periodical-checking-of-updates.test.ts
+++ b/packages/core/src/features/application-update/child-features/periodical-checking-of-updates/periodical-checking-of-updates.test.ts
@@ -17,7 +17,7 @@ describe("periodical checking of updates", () => {
   let builder: ApplicationBuilder;
   let processCheckingForUpdatesMock: jest.Mock;
 
-  beforeEach(() => {
+  beforeEach(async () => {
     testUsingFakeTime("2015-10-21T07:28:00Z");
 
     builder = getApplicationBuilder();
diff --git a/packages/core/src/features/cluster/legacy-extension-adding-cluster-frame-components.test.tsx b/packages/core/src/features/cluster/legacy-extension-adding-cluster-frame-components.test.tsx
index 9d52192e33..10f79c6911 100644
--- a/packages/core/src/features/cluster/legacy-extension-adding-cluster-frame-components.test.tsx
+++ b/packages/core/src/features/cluster/legacy-extension-adding-cluster-frame-components.test.tsx
@@ -14,7 +14,7 @@ describe("legacy extension adding cluster frame components", () => {
   let builder: ApplicationBuilder;
   let rendered: RenderResult;
 
-  beforeEach(() => {
+  beforeEach(async () => {
     builder = getApplicationBuilder();
     await builder.setEnvironmentToClusterFrame();
   });
diff --git a/packages/core/src/features/cluster/namespaces/edit-namespace-from-new-tab.test.tsx b/packages/core/src/features/cluster/namespaces/edit-namespace-from-new-tab.test.tsx
index b844bcc183..3e623ead48 100644
--- a/packages/core/src/features/cluster/namespaces/edit-namespace-from-new-tab.test.tsx
+++ b/packages/core/src/features/cluster/namespaces/edit-namespace-from-new-tab.test.tsx
@@ -35,7 +35,7 @@ describe("cluster/namespaces - edit namespace from new tab", () => {
   let showSuccessNotificationMock: jest.MockedFunction<ShowNotification>;
   let showErrorNotificationMock: jest.MockedFunction<ShowNotification>;
 
-  beforeEach(() => {
+  beforeEach(async () => {
     builder = getApplicationBuilder();
 
     await builder.setEnvironmentToClusterFrame();
diff --git a/packages/core/src/features/cluster/namespaces/edit-namespace-from-previously-opened-tab.test.tsx b/packages/core/src/features/cluster/namespaces/edit-namespace-from-previously-opened-tab.test.tsx
index 9cfb002ba5..117b978fc7 100644
--- a/packages/core/src/features/cluster/namespaces/edit-namespace-from-previously-opened-tab.test.tsx
+++ b/packages/core/src/features/cluster/namespaces/edit-namespace-from-previously-opened-tab.test.tsx
@@ -19,7 +19,7 @@ describe("cluster/namespaces - edit namespaces from previously opened tab", () =
   let builder: ApplicationBuilder;
   let requestKubeResourceMock: AsyncFnMock<RequestKubeResource>;
 
-  beforeEach(() => {
+  beforeEach(async () => {
     builder = getApplicationBuilder();
 
     await builder.setEnvironmentToClusterFrame();
diff --git a/packages/core/src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx b/packages/core/src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx
index be2837b7aa..0207d28e3f 100644
--- a/packages/core/src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx
+++ b/packages/core/src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx
@@ -27,7 +27,7 @@ describe("cluster - sidebar and tab navigation for core", () => {
   let builder: ApplicationBuilder;
   let rendered: RenderResult;
 
-  beforeEach(() => {
+  beforeEach(async () => {
     testUsingFakeTime("2015-10-21T07:28:00Z");
 
     builder = getApplicationBuilder();
@@ -40,7 +40,7 @@ describe("cluster - sidebar and tab navigation for core", () => {
   });
 
   describe("given core registrations", () => {
-    beforeEach(() => {
+    beforeEach(async () => {
       await builder.beforeWindowStart(({ windowDi }) => {
         runInAction(() => {
           windowDi.register(
diff --git a/packages/core/src/features/cluster/visibility-of-sidebar-items.test.tsx b/packages/core/src/features/cluster/visibility-of-sidebar-items.test.tsx
index bd6d44ceef..8f3b37fa45 100644
--- a/packages/core/src/features/cluster/visibility-of-sidebar-items.test.tsx
+++ b/packages/core/src/features/cluster/visibility-of-sidebar-items.test.tsx
@@ -18,7 +18,7 @@ describe("cluster - visibility of sidebar items", () => {
   let builder: ApplicationBuilder;
   let rendered: RenderResult;
 
-  beforeEach(() => {
+  beforeEach(async () => {
     builder = getApplicationBuilder();
 
     await builder.setEnvironmentToClusterFrame();
diff --git a/packages/core/src/features/cluster/workload-overview.test.tsx b/packages/core/src/features/cluster/workload-overview.test.tsx
index 90df78911e..180eb52663 100644
--- a/packages/core/src/features/cluster/workload-overview.test.tsx
+++ b/packages/core/src/features/cluster/workload-overview.test.tsx
@@ -12,7 +12,7 @@ describe("workload overview", () => {
   let builder: ApplicationBuilder;
 
   beforeEach(async () => {
-    builder = getApplicationBuilder().setEnvironmentToClusterFrame();
+    builder = await getApplicationBuilder().setEnvironmentToClusterFrame();
 
     await builder.afterWindowStart(() => {
       builder.allowKubeResource({
diff --git a/packages/core/src/features/helm-charts/installing-chart/installing-helm-chart-from-previously-opened-tab.test.ts b/packages/core/src/features/helm-charts/installing-chart/installing-helm-chart-from-previously-opened-tab.test.ts
index ac94238983..6a550c413a 100644
--- a/packages/core/src/features/helm-charts/installing-chart/installing-helm-chart-from-previously-opened-tab.test.ts
+++ b/packages/core/src/features/helm-charts/installing-chart/installing-helm-chart-from-previously-opened-tab.test.ts
@@ -23,7 +23,7 @@ describe("installing helm chart from previously opened tab", () => {
   let requestHelmChartVersionsMock: AsyncFnMock<RequestHelmChartVersions>;
   let requestHelmChartValuesMock: AsyncFnMock<RequestHelmChartValues>;
 
-  beforeEach(() => {
+  beforeEach(async () => {
     builder = getApplicationBuilder();
 
     await builder.setEnvironmentToClusterFrame();
diff --git a/packages/core/src/features/helm-charts/installing-chart/opening-dock-tab-for-installing-helm-chart.test.ts b/packages/core/src/features/helm-charts/installing-chart/opening-dock-tab-for-installing-helm-chart.test.ts
index d6d39b20fc..1ba7815363 100644
--- a/packages/core/src/features/helm-charts/installing-chart/opening-dock-tab-for-installing-helm-chart.test.ts
+++ b/packages/core/src/features/helm-charts/installing-chart/opening-dock-tab-for-installing-helm-chart.test.ts
@@ -30,7 +30,7 @@ describe("opening dock tab for installing helm chart", () => {
   let requestHelmChartReadmeMock: AsyncFnMock<RequestHelmChartReadme>;
   let requestHelmChartValuesMock: jest.Mock;
 
-  beforeEach(() => {
+  beforeEach(async () => {
     builder = getApplicationBuilder();
 
     requestHelmChartsMock = asyncFn();
diff --git a/packages/core/src/features/hotbar/storage/storage-technical.test.ts b/packages/core/src/features/hotbar/storage/storage-technical.test.ts
index b024809a78..026ef1bd5f 100644
--- a/packages/core/src/features/hotbar/storage/storage-technical.test.ts
+++ b/packages/core/src/features/hotbar/storage/storage-technical.test.ts
@@ -37,6 +37,7 @@ function getMockCatalogEntity(data: Partial<CatalogEntityData> & CatalogEntityKi
     isEnabled: jest.fn(() => data.status?.enabled ?? true),
     onContextMenuOpen: jest.fn(),
     onSettingsOpen: jest.fn(),
+    onRun: jest.fn(),
     metadata: {},
     spec: {},
     status: {},
diff --git a/packages/core/src/features/pod-logs/download-logs.test.tsx b/packages/core/src/features/pod-logs/download-logs.test.tsx
index e488cfa942..67b7265611 100644
--- a/packages/core/src/features/pod-logs/download-logs.test.tsx
+++ b/packages/core/src/features/pod-logs/download-logs.test.tsx
@@ -46,7 +46,7 @@ describe("download logs options in logs dock tab", () => {
     image: "docker.io/prom/node-exporter:v1.0.0-rc.0",
   };
 
-  beforeEach(() => {
+  beforeEach(async () => {
     const selectedPod = dockerPod;
 
     builder = getApplicationBuilder();
diff --git a/packages/core/src/features/preferences/closing-preferences.test.tsx b/packages/core/src/features/preferences/closing-preferences.test.tsx
index 78a840d5f4..83f8f215b9 100644
--- a/packages/core/src/features/preferences/closing-preferences.test.tsx
+++ b/packages/core/src/features/preferences/closing-preferences.test.tsx
@@ -22,7 +22,7 @@ import { preferenceItemInjectionToken } from "./renderer/preference-items/prefer
 describe("preferences - closing-preferences", () => {
   let builder: ApplicationBuilder;
 
-  beforeEach(() => {
+  beforeEach(async () => {
     builder = getApplicationBuilder();
 
     await builder.beforeWindowStart(({ windowDi }) => {
diff --git a/packages/core/src/features/preferences/navigation-to-application-preferences.test.tsx b/packages/core/src/features/preferences/navigation-to-application-preferences.test.tsx
index 46476dc7f8..165088f769 100644
--- a/packages/core/src/features/preferences/navigation-to-application-preferences.test.tsx
+++ b/packages/core/src/features/preferences/navigation-to-application-preferences.test.tsx
@@ -46,7 +46,7 @@ describe("preferences - navigation to application preferences", () => {
     });
 
     describe("when extension with application preference items gets enabled", () => {
-      beforeEach(() => {
+      beforeEach(async () => {
         await builder.extensions.enable(
           extensionStubWithApplicationPreferenceItems,
         );
diff --git a/packages/core/src/features/preferences/navigation-to-telemetry-preferences.test.tsx b/packages/core/src/features/preferences/navigation-to-telemetry-preferences.test.tsx
index 51c3903e0a..2bf1fd3f9b 100644
--- a/packages/core/src/features/preferences/navigation-to-telemetry-preferences.test.tsx
+++ b/packages/core/src/features/preferences/navigation-to-telemetry-preferences.test.tsx
@@ -56,7 +56,7 @@ describe("preferences - navigation to telemetry preferences", () => {
     });
 
     describe("when extension with telemetry preference items gets enabled", () => {
-      beforeEach(() => {
+      beforeEach(async () => {
         await builder.extensions.enable(
           extensionStubWithTelemetryPreferenceItems,
         );
@@ -104,7 +104,7 @@ describe("preferences - navigation to telemetry preferences", () => {
       });
     });
 
-    it("given extensions but no telemetry preference items, does not show link for telemetry preferences", () => {
+    it("given extensions but no telemetry preference items, does not show link for telemetry preferences", async () => {
       await builder.extensions.enable({
         id: "some-test-extension-id",
         name: "some-test-extension-name",
diff --git a/packages/core/src/features/user-preferences/common/preference-descriptors.injectable.ts b/packages/core/src/features/user-preferences/common/preference-descriptors.injectable.ts
index 17ee98da13..e5a71721a2 100644
--- a/packages/core/src/features/user-preferences/common/preference-descriptors.injectable.ts
+++ b/packages/core/src/features/user-preferences/common/preference-descriptors.injectable.ts
@@ -111,7 +111,7 @@ const userPreferenceDescriptorsInjectable = getInjectable({
           return res.length ? res : undefined;
         },
       }),
-      syncKubeconfigEntries: getPreferenceDescriptor<KubeconfigSyncEntry[], ObservableMap<string, Record<string, never>>>({
+      syncKubeconfigEntries: getPreferenceDescriptor<KubeconfigSyncEntry[], ObservableMap<string, object>>({
         fromStore: val => observable.map(
           val?.map(({ filePath, ...rest }) => [filePath, rest])
           ?? [[mainKubeFolderPath, {}]],
diff --git a/packages/core/src/features/welcome/banners-from-extension.test.tsx b/packages/core/src/features/welcome/banners-from-extension.test.tsx
index f2340b4be3..1ba3a7dfb1 100644
--- a/packages/core/src/features/welcome/banners-from-extension.test.tsx
+++ b/packages/core/src/features/welcome/banners-from-extension.test.tsx
@@ -19,7 +19,7 @@ describe("Banners from extensions", () => {
     renderResult = await builder.render();
   });
 
-  it("initially renderes welcome page", () => {
+  it("initially renders welcome page", () => {
     expect(renderResult.queryByTestId("welcome-page")).toBeInTheDocument();
   });
 
@@ -28,7 +28,7 @@ describe("Banners from extensions", () => {
   });
 
   describe("when an extension is enabled with a single welcome banner", () => {
-    beforeEach(() => {
+    beforeEach(async () => {
       await builder.extensions.enable({
         id: "some-id",
         name: "some-name",
@@ -52,7 +52,7 @@ describe("Banners from extensions", () => {
   });
 
   describe("when an extension is enabled with multiple banners with custom widths", () => {
-    beforeEach(() => {
+    beforeEach(async () => {
       await builder.extensions.enable({
         id: "some-id",
         name: "some-name",
diff --git a/packages/core/src/main/__test__/prometheus-handler.test.ts b/packages/core/src/main/__test__/prometheus-handler.test.ts
index 7ad3401681..a425d9a197 100644
--- a/packages/core/src/main/__test__/prometheus-handler.test.ts
+++ b/packages/core/src/main/__test__/prometheus-handler.test.ts
@@ -142,7 +142,7 @@ describe("PrometheusHandler", () => {
 
       const details = await di.inject(prometheusHandlerInjectable, cluster).getPrometheusDetails();
 
-      expect(details.provider.kind === `id_failure_${failures}`);
+      expect(details?.provider.kind === `id_failure_${failures}`);
     });
 
     it.each([
@@ -175,7 +175,7 @@ describe("PrometheusHandler", () => {
 
       const details = await di.inject(prometheusHandlerInjectable, cluster).getPrometheusDetails();
 
-      expect(details.provider.kind === "id_failure_0");
+      expect(details?.provider.kind === "id_failure_0");
     });
 
     it.each([
@@ -218,7 +218,7 @@ describe("PrometheusHandler", () => {
 
       const details = await di.inject(prometheusHandlerInjectable, cluster).getPrometheusDetails();
 
-      expect(details.provider.kind === "id_success_0");
+      expect(details?.provider.kind === "id_success_0");
     });
   });
 });
diff --git a/packages/core/src/renderer/components/config-pod-disruption-budgets/__tests__/pod-distruption-budgets.test.tsx b/packages/core/src/renderer/components/config-pod-disruption-budgets/__tests__/pod-distruption-budgets.test.tsx
index 29e8f00a46..a2f1ffb8a8 100644
--- a/packages/core/src/renderer/components/config-pod-disruption-budgets/__tests__/pod-distruption-budgets.test.tsx
+++ b/packages/core/src/renderer/components/config-pod-disruption-budgets/__tests__/pod-distruption-budgets.test.tsx
@@ -67,15 +67,18 @@ describe("<PodDisruptionBudgets />", () => {
       },
     );
 
+    beforeEach(() => {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-explicit-any
+      di.override(podDisruptionBudgetStoreInjectable, () => getPodDisruptionBudgetStoreInjectableMock(pdb) as any);
+    });
+
     it("should display minAvailable as 0", () => {
-      di.override(podDisruptionBudgetStoreInjectable, () => getPodDisruptionBudgetStoreInjectableMock(pdb));
       const result = renderFor(di)(<PodDisruptionBudgets object={pdb}/>);
 
       expect(result.container.querySelector(".TableRow .min-available")?.textContent).toEqual("0");
     });
 
     it("should display maxUnavailable as N/A", () => {
-      di.override(podDisruptionBudgetStoreInjectable, () => getPodDisruptionBudgetStoreInjectableMock(pdb));
       const result = renderFor(di)(<PodDisruptionBudgets object={pdb}/>);
 
       expect(result.container.querySelector(".TableRow .max-unavailable")?.textContent).toEqual("N/A");
@@ -89,15 +92,18 @@ describe("<PodDisruptionBudgets />", () => {
       },
     );
 
+    beforeEach(() => {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-explicit-any
+      di.override(podDisruptionBudgetStoreInjectable, () => getPodDisruptionBudgetStoreInjectableMock(pdb) as any);
+    });
+
     it("should display minAvailable as N/A", () => {
-      di.override(podDisruptionBudgetStoreInjectable, () => getPodDisruptionBudgetStoreInjectableMock(pdb));
       const result = renderFor(di)(<PodDisruptionBudgets object={pdb}/>);
 
       expect(result.container.querySelector(".TableRow .min-available")?.textContent).toEqual("N/A");
     });
 
     it("should display maxUnavailable as 0", () => {
-      di.override(podDisruptionBudgetStoreInjectable, () => getPodDisruptionBudgetStoreInjectableMock(pdb));
       const result = renderFor(di)(<PodDisruptionBudgets object={pdb}/>);
 
       expect(result.container.querySelector(".TableRow .max-unavailable")?.textContent).toEqual("0");
diff --git a/packages/core/src/renderer/components/extensions/__tests__/extensions.test.tsx b/packages/core/src/renderer/components/extensions/__tests__/extensions.test.tsx
index 37afc807e8..39ae6eb96e 100644
--- a/packages/core/src/renderer/components/extensions/__tests__/extensions.test.tsx
+++ b/packages/core/src/renderer/components/extensions/__tests__/extensions.test.tsx
@@ -78,7 +78,7 @@ describe("Extensions", () => {
   });
 
   it("disables uninstall and disable buttons while uninstalling", async () => {
-    extensionDiscovery.isLoaded = true;
+    extensionDiscovery.isLoaded.set(true);
 
     render((
       <>
@@ -154,14 +154,14 @@ describe("Extensions", () => {
   });
 
   it("displays spinner while extensions are loading", () => {
-    extensionDiscovery.isLoaded = false;
+    extensionDiscovery.isLoaded.set(false);
     const { container } = render(<Extensions />);
 
     expect(container.querySelector(".Spinner")).toBeInTheDocument();
   });
 
   it("does not display the spinner while extensions are not loading", () => {
-    extensionDiscovery.isLoaded = true;
+    extensionDiscovery.isLoaded.set(true);
     const { container } = render(<Extensions />);
 
     expect(container.querySelector(".Spinner")).not.toBeInTheDocument();