diff --git a/web/src/components/clusters/components/__tests__/ClusterCardList.test.tsx b/web/src/components/clusters/components/__tests__/ClusterCardList.test.tsx
index ed41bf3bc3..ea1419566e 100644
--- a/web/src/components/clusters/components/__tests__/ClusterCardList.test.tsx
+++ b/web/src/components/clusters/components/__tests__/ClusterCardList.test.tsx
@@ -99,7 +99,7 @@ describe('ClusterCardList', () => {
   it('calls onRefreshCluster when refresh button is clicked', () => {
     const onRefreshCluster = vi.fn()
     render(<ClusterCardList {...defaultProps} onRefreshCluster={onRefreshCluster} />)
-    const refreshButton = screen.getByRole('button', { name: /refreshClusterData/i })
+    const refreshButton = screen.getByRole('button', { name: /common\.refresh/i })
     fireEvent.click(refreshButton)
     expect(onRefreshCluster).toHaveBeenCalledTimes(1)
   })
@@ -108,7 +108,7 @@ describe('ClusterCardList', () => {
     const cluster = createMockCluster({ healthy: false, reachable: false })
     const onRefreshCluster = vi.fn()
     render(<ClusterCardList {...defaultProps} cluster={cluster} onRefreshCluster={onRefreshCluster} />)
-    const refreshButton = screen.getByRole('button', { name: /cluster.controlsDisabledOffline/i })
+    const refreshButton = screen.getByRole('button', { name: /cluster\.controlsDisabledOffline/i })
     expect(refreshButton).toBeDisabled()
   })
 
@@ -138,7 +138,7 @@ describe('ClusterCardList', () => {
       loading: true,
     })
     render(<ClusterCardList {...defaultProps} cluster={cluster} />)
-    // Loading indicator should be present
-    expect(screen.queryByText('-')).toBeInTheDocument()
+    // Loading indicator should be present — multiple fields show '-'
+    expect(screen.getAllByText('-').length).toBeGreaterThanOrEqual(1)
   })
 })
diff --git a/web/src/components/drilldown/views/__tests__/PodDrillDown.test.tsx b/web/src/components/drilldown/views/__tests__/PodDrillDown.test.tsx
index 206e72fa44..a480fd73e6 100644
--- a/web/src/components/drilldown/views/__tests__/PodDrillDown.test.tsx
+++ b/web/src/components/drilldown/views/__tests__/PodDrillDown.test.tsx
@@ -391,12 +391,12 @@ metadata:
     expect(screen.getByText('drilldown.fields.cluster')).toBeInTheDocument()
 
     // Namespace navigation
-    const nsBtn = screen.getByRole('button', { name: /drilldown.fields.namespace/ })
+    const nsBtn = screen.getByRole('button', { name: /View namespace ns1/ })
     await userEvent.click(nsBtn)
     expect(mockDrillToNamespace).toHaveBeenCalledWith('c1', 'ns1')
 
     // Cluster navigation
-    const clusterBtn = screen.getByRole('button', { name: /drilldown.fields.cluster/ })
+    const clusterBtn = screen.getByRole('button', { name: /View cluster c1/ })
     await userEvent.click(clusterBtn)
     expect(mockDrillToCluster).toHaveBeenCalledWith('c1')
   })
diff --git a/web/src/contexts/__tests__/AlertsContext.core.test.tsx b/web/src/contexts/__tests__/AlertsContext.core.test.tsx
deleted file mode 100644
index 11b2500ef0..0000000000
--- a/web/src/contexts/__tests__/AlertsContext.core.test.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * AlertsContext Core Tests (Refactored)
- * 
- * This file has been split into focused test modules for better maintainability.
- * See: AlertsContext.lifecycle, AlertsContext.rules, AlertsContext.conditions, etc.
- * Common infrastructure: AlertsContext.test-helpers.ts
- */
diff --git a/web/src/contexts/__tests__/AlertsContext.wave2.test.tsx b/web/src/contexts/__tests__/AlertsContext.wave2.test.tsx
deleted file mode 100644
index e6924424b3..0000000000
--- a/web/src/contexts/__tests__/AlertsContext.wave2.test.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * AlertsContext Wave2 Tests (Refactored)
- * 
- * This file has been split into focused test modules for better maintainability.
- * See: AlertsContext.wave2-conditions, AlertsContext.conditions-network, etc.
- * Common infrastructure: AlertsContext.test-helpers.ts
- */
diff --git a/web/src/hooks/__tests__/useDeployMissions.test.ts b/web/src/hooks/__tests__/useDeployMissions.test.ts
deleted file mode 100644
index 82fcea536f..0000000000
--- a/web/src/hooks/__tests__/useDeployMissions.test.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * useDeployMissions Tests (Refactored)
- * 
- * This file has been split into focused test modules for better maintainability.
- * See: useDeployMissions-expand, useDeployMissions-funcs, useDeployMissions-pure, etc.
- */
diff --git a/web/src/hooks/__tests__/useSnoozeHooks.test.ts b/web/src/hooks/__tests__/useSnoozeHooks.test.ts
deleted file mode 100644
index 9ca7020ebe..0000000000
--- a/web/src/hooks/__tests__/useSnoozeHooks.test.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * useSnoozeHooks Tests (Refactored)
- * 
- * This file has been split into focused test modules for better maintainability.
- * See: useSnoozeHooks-alerts, useSnoozeHooks-cards, useSnoozeHooks-missions, useSnoozeHooks-recommendations
- */
diff --git a/web/src/hooks/__tests__/useTokenUsage.test.ts b/web/src/hooks/__tests__/useTokenUsage.test.ts
deleted file mode 100644
index a3ab5a7035..0000000000
--- a/web/src/hooks/__tests__/useTokenUsage.test.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * useTokenUsage Tests (Refactored)
- * 
- * This file has been split into focused test modules for better maintainability.
- * See: useTokenUsage-funcs, useTokenUsage-pure
- */
diff --git a/web/src/hooks/__tests__/useUniversalStats.hook.test.ts b/web/src/hooks/__tests__/useUniversalStats.hook.test.ts
deleted file mode 100644
index 3d03582d02..0000000000
--- a/web/src/hooks/__tests__/useUniversalStats.hook.test.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * useUniversalStats Hook Tests (Refactored)
- * 
- * This file has been refactored to reduce size.
- * Additional utility tests moved to: useUniversalStats.util
- */
diff --git a/web/src/hooks/__tests__/useUniversalStats.test.ts b/web/src/hooks/__tests__/useUniversalStats.test.ts
deleted file mode 100644
index bdfe544670..0000000000
--- a/web/src/hooks/__tests__/useUniversalStats.test.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * useUniversalStats Tests (Refactored)
- * 
- * This file has been split into focused test modules for better maintainability.
- * See: useUniversalStats.util, useUniversalStats.hook
- */
diff --git a/web/src/hooks/mcp/__tests__/kagent_crds.test.ts b/web/src/hooks/mcp/__tests__/kagent_crds.test.ts
deleted file mode 100644
index 6ae0450990..0000000000
--- a/web/src/hooks/mcp/__tests__/kagent_crds.test.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * kagent_crds Tests (Refactored)
- * 
- * This file is being refactored to split by operation type and resource.
- * Split modules to be added in follow-up commits.
- */
diff --git a/web/src/hooks/mcp/__tests__/kagenti.test.ts b/web/src/hooks/mcp/__tests__/kagenti.test.ts
deleted file mode 100644
index ffe56fc9af..0000000000
--- a/web/src/hooks/mcp/__tests__/kagenti.test.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * kagenti Tests (Refactored)
- * 
- * This file is being refactored to split by feature area.
- * Split modules to be added in follow-up commits.
- */
diff --git a/web/src/hooks/mcp/__tests__/networking.test.ts b/web/src/hooks/mcp/__tests__/networking.test.ts
deleted file mode 100644
index 2f1019c9ee..0000000000
--- a/web/src/hooks/mcp/__tests__/networking.test.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * networking Tests (Refactored)
- * 
- * This file is being refactored to split by network resource type.
- * Split modules to be added in follow-up commits.
- */
diff --git a/web/src/hooks/mcp/__tests__/shared-coverage.test.ts b/web/src/hooks/mcp/__tests__/shared-coverage.test.ts
deleted file mode 100644
index daf491ee65..0000000000
--- a/web/src/hooks/mcp/__tests__/shared-coverage.test.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * shared-coverage Tests (Refactored)
- * 
- * This file is being refactored to split by coverage area.
- * Split modules to be added in follow-up commits.
- */
diff --git a/web/src/hooks/mcp/__tests__/storage.test.ts b/web/src/hooks/mcp/__tests__/storage.test.ts
deleted file mode 100644
index 95e593fe1c..0000000000
--- a/web/src/hooks/mcp/__tests__/storage.test.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * storage Tests (Refactored)
- * 
- * This file is being refactored to split by storage operation type.
- * Split modules to be added in follow-up commits.
- */
diff --git a/web/src/lib/__tests__/kubectlProxy.additional.edge.test.ts b/web/src/lib/__tests__/kubectlProxy.additional.edge.test.ts
deleted file mode 100644
index fb48a16587..0000000000
--- a/web/src/lib/__tests__/kubectlProxy.additional.edge.test.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * kubectlProxy Edge Case Tests (Refactored)
- * 
- * This file has been split into focused test modules for better maintainability.
- * See: kubectlProxy.edge-cluster, kubectlProxy.edge-pods, kubectlProxy.edge-workloads, etc.
- * Common infrastructure: kubectlProxy.test-helpers.ts
- */
diff --git a/web/src/lib/__tests__/kubectlProxy.core.resources.test.ts b/web/src/lib/__tests__/kubectlProxy.core.resources.test.ts
deleted file mode 100644
index df3164ba78..0000000000
--- a/web/src/lib/__tests__/kubectlProxy.core.resources.test.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * kubectlProxy Resource Tests (Refactored)
- * 
- * This file has been split into focused test modules for better maintainability.
- * See: kubectlProxy.pods, kubectlProxy.workloads, kubectlProxy.cluster, etc.
- * Common infrastructure: kubectlProxy.test-helpers.ts
- */
diff --git a/web/src/lib/cache/__tests__/cache-coverage.test.ts b/web/src/lib/cache/__tests__/cache-coverage.test.ts
deleted file mode 100644
index 45c845fc29..0000000000
--- a/web/src/lib/cache/__tests__/cache-coverage.test.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * cache-coverage Tests (Refactored)
- * 
- * This file has been split into focused test modules for better maintainability.
- * See: cache-coverage2, cache.deepcover.*
- */
diff --git a/web/src/lib/cache/__tests__/worker.test.ts b/web/src/lib/cache/__tests__/worker.test.ts
deleted file mode 100644
index 9e2e1a676b..0000000000
--- a/web/src/lib/cache/__tests__/worker.test.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * worker Tests (Refactored)
- * 
- * This file has been split into focused test modules for better maintainability.
- * See: worker.handlers, worker.module
- */