diff --git a/src/behaviours/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap b/src/behaviours/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap
index 9af01f0969..db6d5e7f36 100644
--- a/src/behaviours/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap
+++ b/src/behaviours/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap
@@ -24,10 +24,8 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = `
     >
       <div
         class="SidebarItem"
-        data-id-test="workloads"
         data-is-active-test="false"
-        data-test-id="workloads"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-workloads"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -60,10 +58,8 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = `
       </div>
       <div
         class="SidebarItem"
-        data-id-test="config"
         data-is-active-test="false"
-        data-test-id="config"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-config"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -89,10 +85,8 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = `
       </div>
       <div
         class="SidebarItem"
-        data-id-test="some-parent-id"
         data-is-active-test="false"
-        data-test-id="some-parent-id"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-some-parent-id"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -118,10 +112,8 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = `
       </div>
       <div
         class="SidebarItem"
-        data-id-test="network"
         data-is-active-test="false"
-        data-test-id="network"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-network"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -157,10 +149,8 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = `
       </div>
       <div
         class="SidebarItem"
-        data-id-test="storage"
         data-is-active-test="false"
-        data-test-id="storage"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-storage"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -186,10 +176,8 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = `
       </div>
       <div
         class="SidebarItem"
-        data-id-test="some-another-parent-id"
         data-is-active-test="false"
-        data-test-id="some-another-parent-id"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-some-another-parent-id"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -205,10 +193,8 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = `
       </div>
       <div
         class="SidebarItem"
-        data-id-test="helm"
         data-is-active-test="false"
-        data-test-id="helm"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-helm"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -241,10 +227,8 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = `
       </div>
       <div
         class="SidebarItem"
-        data-id-test="user-management"
         data-is-active-test="false"
-        data-test-id="user-management"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-user-management"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -270,10 +254,8 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = `
       </div>
       <div
         class="SidebarItem"
-        data-id-test="custom-resources"
         data-is-active-test="false"
-        data-test-id="custom-resources"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-custom-resources"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -309,10 +291,8 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = `
       </div>
       <div
         class="SidebarItem"
-        data-id-test="some-other-parent-id"
         data-is-active-test="false"
-        data-test-id="some-other-parent-id"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-some-other-parent-id"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -358,10 +338,8 @@ exports[`cluster - order of sidebar items when rendered when parent is expanded
     >
       <div
         class="SidebarItem"
-        data-id-test="workloads"
         data-is-active-test="false"
-        data-test-id="workloads"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-workloads"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -394,10 +372,8 @@ exports[`cluster - order of sidebar items when rendered when parent is expanded
       </div>
       <div
         class="SidebarItem"
-        data-id-test="config"
         data-is-active-test="false"
-        data-test-id="config"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-config"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -423,10 +399,8 @@ exports[`cluster - order of sidebar items when rendered when parent is expanded
       </div>
       <div
         class="SidebarItem"
-        data-id-test="some-parent-id"
         data-is-active-test="false"
-        data-test-id="some-parent-id"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-some-parent-id"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -454,11 +428,9 @@ exports[`cluster - order of sidebar items when rendered when parent is expanded
         >
           <div
             class="SidebarItem"
-            data-id-test="some-child-id"
             data-is-active-test="false"
             data-parent-id-test="some-parent-id"
-            data-test-id="some-child-id"
-            data-testid="sidebar-item"
+            data-testid="sidebar-item-some-child-id"
           >
             <a
               class="nav-item flex gaps align-center"
@@ -474,11 +446,9 @@ exports[`cluster - order of sidebar items when rendered when parent is expanded
           </div>
           <div
             class="SidebarItem"
-            data-id-test="some-another-child-id"
             data-is-active-test="false"
             data-parent-id-test="some-parent-id"
-            data-test-id="some-another-child-id"
-            data-testid="sidebar-item"
+            data-testid="sidebar-item-some-another-child-id"
           >
             <a
               class="nav-item flex gaps align-center"
@@ -494,11 +464,9 @@ exports[`cluster - order of sidebar items when rendered when parent is expanded
           </div>
           <div
             class="SidebarItem"
-            data-id-test="some-other-child-id"
             data-is-active-test="false"
             data-parent-id-test="some-parent-id"
-            data-test-id="some-other-child-id"
-            data-testid="sidebar-item"
+            data-testid="sidebar-item-some-other-child-id"
           >
             <a
               class="nav-item flex gaps align-center"
@@ -516,10 +484,8 @@ exports[`cluster - order of sidebar items when rendered when parent is expanded
       </div>
       <div
         class="SidebarItem"
-        data-id-test="network"
         data-is-active-test="false"
-        data-test-id="network"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-network"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -555,10 +521,8 @@ exports[`cluster - order of sidebar items when rendered when parent is expanded
       </div>
       <div
         class="SidebarItem"
-        data-id-test="storage"
         data-is-active-test="false"
-        data-test-id="storage"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-storage"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -584,10 +548,8 @@ exports[`cluster - order of sidebar items when rendered when parent is expanded
       </div>
       <div
         class="SidebarItem"
-        data-id-test="some-another-parent-id"
         data-is-active-test="false"
-        data-test-id="some-another-parent-id"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-some-another-parent-id"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -603,10 +565,8 @@ exports[`cluster - order of sidebar items when rendered when parent is expanded
       </div>
       <div
         class="SidebarItem"
-        data-id-test="helm"
         data-is-active-test="false"
-        data-test-id="helm"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-helm"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -639,10 +599,8 @@ exports[`cluster - order of sidebar items when rendered when parent is expanded
       </div>
       <div
         class="SidebarItem"
-        data-id-test="user-management"
         data-is-active-test="false"
-        data-test-id="user-management"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-user-management"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -668,10 +626,8 @@ exports[`cluster - order of sidebar items when rendered when parent is expanded
       </div>
       <div
         class="SidebarItem"
-        data-id-test="custom-resources"
         data-is-active-test="false"
-        data-test-id="custom-resources"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-custom-resources"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -707,10 +663,8 @@ exports[`cluster - order of sidebar items when rendered when parent is expanded
       </div>
       <div
         class="SidebarItem"
-        data-id-test="some-other-parent-id"
         data-is-active-test="false"
-        data-test-id="some-other-parent-id"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-some-other-parent-id"
       >
         <a
           class="nav-item flex gaps align-center"
diff --git a/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-core.test.tsx.snap b/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-core.test.tsx.snap
index 06d1a1e210..d4a574fde7 100644
--- a/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-core.test.tsx.snap
+++ b/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-core.test.tsx.snap
@@ -24,10 +24,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
     >
       <div
         class="SidebarItem"
-        data-id-test="workloads"
         data-is-active-test="false"
-        data-test-id="workloads"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-workloads"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -60,10 +58,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="config"
         data-is-active-test="false"
-        data-test-id="config"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-config"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -89,10 +85,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="some-parent-id"
         data-is-active-test="false"
-        data-test-id="some-parent-id"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-some-parent-id"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -121,10 +115,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="network"
         data-is-active-test="false"
-        data-test-id="network"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-network"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -160,10 +152,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="storage"
         data-is-active-test="false"
-        data-test-id="storage"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-storage"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -189,10 +179,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="helm"
         data-is-active-test="false"
-        data-test-id="helm"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-helm"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -225,10 +213,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="user-management"
         data-is-active-test="false"
-        data-test-id="user-management"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-user-management"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -254,10 +240,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="custom-resources"
         data-is-active-test="false"
-        data-test-id="custom-resources"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-custom-resources"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -323,10 +307,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
     >
       <div
         class="SidebarItem"
-        data-id-test="workloads"
         data-is-active-test="false"
-        data-test-id="workloads"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-workloads"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -359,10 +341,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="config"
         data-is-active-test="false"
-        data-test-id="config"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-config"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -388,10 +368,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="some-parent-id"
         data-is-active-test="false"
-        data-test-id="some-parent-id"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-some-parent-id"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -420,10 +398,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="network"
         data-is-active-test="false"
-        data-test-id="network"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-network"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -459,10 +435,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="storage"
         data-is-active-test="false"
-        data-test-id="storage"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-storage"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -488,10 +462,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="helm"
         data-is-active-test="false"
-        data-test-id="helm"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-helm"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -524,10 +496,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="user-management"
         data-is-active-test="false"
-        data-test-id="user-management"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-user-management"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -553,10 +523,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="custom-resources"
         data-is-active-test="false"
-        data-test-id="custom-resources"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-custom-resources"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -622,10 +590,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
     >
       <div
         class="SidebarItem"
-        data-id-test="workloads"
         data-is-active-test="false"
-        data-test-id="workloads"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-workloads"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -658,10 +624,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="config"
         data-is-active-test="false"
-        data-test-id="config"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-config"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -687,10 +651,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="some-parent-id"
         data-is-active-test="false"
-        data-test-id="some-parent-id"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-some-parent-id"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -721,11 +683,9 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
         >
           <div
             class="SidebarItem"
-            data-id-test="some-child-id"
             data-is-active-test="false"
             data-parent-id-test="some-parent-id"
-            data-test-id="some-child-id"
-            data-testid="sidebar-item"
+            data-testid="sidebar-item-some-child-id"
           >
             <a
               class="nav-item flex gaps align-center"
@@ -743,10 +703,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="network"
         data-is-active-test="false"
-        data-test-id="network"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-network"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -782,10 +740,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="storage"
         data-is-active-test="false"
-        data-test-id="storage"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-storage"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -811,10 +767,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="helm"
         data-is-active-test="false"
-        data-test-id="helm"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-helm"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -847,10 +801,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="user-management"
         data-is-active-test="false"
-        data-test-id="user-management"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-user-management"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -876,10 +828,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="custom-resources"
         data-is-active-test="false"
-        data-test-id="custom-resources"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-custom-resources"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -945,10 +895,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
     >
       <div
         class="SidebarItem"
-        data-id-test="workloads"
         data-is-active-test="false"
-        data-test-id="workloads"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-workloads"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -981,10 +929,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="config"
         data-is-active-test="false"
-        data-test-id="config"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-config"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -1010,10 +956,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="some-parent-id"
         data-is-active-test="true"
-        data-test-id="some-parent-id"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-some-parent-id"
       >
         <a
           aria-current="page"
@@ -1045,11 +989,9 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
         >
           <div
             class="SidebarItem"
-            data-id-test="some-child-id"
             data-is-active-test="true"
             data-parent-id-test="some-parent-id"
-            data-test-id="some-child-id"
-            data-testid="sidebar-item"
+            data-testid="sidebar-item-some-child-id"
           >
             <a
               aria-current="page"
@@ -1068,10 +1010,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="network"
         data-is-active-test="false"
-        data-test-id="network"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-network"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1107,10 +1047,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="storage"
         data-is-active-test="false"
-        data-test-id="storage"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-storage"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -1136,10 +1074,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="helm"
         data-is-active-test="false"
-        data-test-id="helm"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-helm"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1172,10 +1108,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="user-management"
         data-is-active-test="false"
-        data-test-id="user-management"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-user-management"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -1201,10 +1135,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="custom-resources"
         data-is-active-test="false"
-        data-test-id="custom-resources"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-custom-resources"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1273,10 +1205,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
     >
       <div
         class="SidebarItem"
-        data-id-test="workloads"
         data-is-active-test="false"
-        data-test-id="workloads"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-workloads"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1309,10 +1239,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="config"
         data-is-active-test="false"
-        data-test-id="config"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-config"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -1338,10 +1266,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="some-parent-id"
         data-is-active-test="true"
-        data-test-id="some-parent-id"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-some-parent-id"
       >
         <a
           aria-current="page"
@@ -1371,10 +1297,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="network"
         data-is-active-test="false"
-        data-test-id="network"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-network"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1410,10 +1334,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="storage"
         data-is-active-test="false"
-        data-test-id="storage"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-storage"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -1439,10 +1361,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="helm"
         data-is-active-test="false"
-        data-test-id="helm"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-helm"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1475,10 +1395,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="user-management"
         data-is-active-test="false"
-        data-test-id="user-management"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-user-management"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -1504,10 +1422,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="custom-resources"
         data-is-active-test="false"
-        data-test-id="custom-resources"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-custom-resources"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1576,10 +1492,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
     >
       <div
         class="SidebarItem"
-        data-id-test="workloads"
         data-is-active-test="false"
-        data-test-id="workloads"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-workloads"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1612,10 +1526,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="config"
         data-is-active-test="false"
-        data-test-id="config"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-config"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -1641,10 +1553,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="some-parent-id"
         data-is-active-test="false"
-        data-test-id="some-parent-id"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-some-parent-id"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1675,11 +1585,9 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
         >
           <div
             class="SidebarItem"
-            data-id-test="some-child-id"
             data-is-active-test="false"
             data-parent-id-test="some-parent-id"
-            data-test-id="some-child-id"
-            data-testid="sidebar-item"
+            data-testid="sidebar-item-some-child-id"
           >
             <a
               class="nav-item flex gaps align-center"
@@ -1697,10 +1605,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="network"
         data-is-active-test="false"
-        data-test-id="network"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-network"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1736,10 +1642,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="storage"
         data-is-active-test="false"
-        data-test-id="storage"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-storage"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -1765,10 +1669,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="helm"
         data-is-active-test="false"
-        data-test-id="helm"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-helm"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1801,10 +1703,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="user-management"
         data-is-active-test="false"
-        data-test-id="user-management"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-user-management"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -1830,10 +1730,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="custom-resources"
         data-is-active-test="false"
-        data-test-id="custom-resources"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-custom-resources"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1899,10 +1797,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
     >
       <div
         class="SidebarItem"
-        data-id-test="workloads"
         data-is-active-test="false"
-        data-test-id="workloads"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-workloads"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1935,10 +1831,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="config"
         data-is-active-test="false"
-        data-test-id="config"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-config"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -1964,10 +1858,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="some-parent-id"
         data-is-active-test="false"
-        data-test-id="some-parent-id"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-some-parent-id"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1996,10 +1888,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="network"
         data-is-active-test="false"
-        data-test-id="network"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-network"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -2035,10 +1925,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="storage"
         data-is-active-test="false"
-        data-test-id="storage"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-storage"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -2064,10 +1952,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="helm"
         data-is-active-test="false"
-        data-test-id="helm"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-helm"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -2100,10 +1986,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="user-management"
         data-is-active-test="false"
-        data-test-id="user-management"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-user-management"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -2129,10 +2013,8 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
       </div>
       <div
         class="SidebarItem"
-        data-id-test="custom-resources"
         data-is-active-test="false"
-        data-test-id="custom-resources"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-custom-resources"
       >
         <a
           class="nav-item flex gaps align-center expandable"
diff --git a/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap b/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap
index 19cb615cce..60d3be5320 100644
--- a/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap
+++ b/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap
@@ -24,10 +24,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
     >
       <div
         class="SidebarItem"
-        data-id-test="workloads"
         data-is-active-test="false"
-        data-test-id="workloads"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-workloads"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -60,10 +58,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="config"
         data-is-active-test="false"
-        data-test-id="config"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-config"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -89,10 +85,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="network"
         data-is-active-test="false"
-        data-test-id="network"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-network"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -128,10 +122,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="storage"
         data-is-active-test="false"
-        data-test-id="storage"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-storage"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -157,10 +149,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="helm"
         data-is-active-test="false"
-        data-test-id="helm"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-helm"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -193,10 +183,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="user-management"
         data-is-active-test="false"
-        data-test-id="user-management"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-user-management"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -222,10 +210,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="custom-resources"
         data-is-active-test="false"
-        data-test-id="custom-resources"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-custom-resources"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -261,10 +247,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="some-extension-name-some-parent-id"
         data-is-active-test="false"
-        data-test-id="some-extension-name-some-parent-id"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-some-extension-name-some-parent-id"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -323,10 +307,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
     >
       <div
         class="SidebarItem"
-        data-id-test="workloads"
         data-is-active-test="false"
-        data-test-id="workloads"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-workloads"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -359,10 +341,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="config"
         data-is-active-test="false"
-        data-test-id="config"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-config"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -388,10 +368,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="network"
         data-is-active-test="false"
-        data-test-id="network"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-network"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -427,10 +405,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="storage"
         data-is-active-test="false"
-        data-test-id="storage"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-storage"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -456,10 +432,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="helm"
         data-is-active-test="false"
-        data-test-id="helm"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-helm"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -492,10 +466,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="user-management"
         data-is-active-test="false"
-        data-test-id="user-management"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-user-management"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -521,10 +493,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="custom-resources"
         data-is-active-test="false"
-        data-test-id="custom-resources"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-custom-resources"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -560,10 +530,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="some-extension-name-some-parent-id"
         data-is-active-test="false"
-        data-test-id="some-extension-name-some-parent-id"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-some-extension-name-some-parent-id"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -622,10 +590,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
     >
       <div
         class="SidebarItem"
-        data-id-test="workloads"
         data-is-active-test="false"
-        data-test-id="workloads"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-workloads"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -658,10 +624,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="config"
         data-is-active-test="false"
-        data-test-id="config"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-config"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -687,10 +651,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="network"
         data-is-active-test="false"
-        data-test-id="network"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-network"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -726,10 +688,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="storage"
         data-is-active-test="false"
-        data-test-id="storage"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-storage"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -755,10 +715,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="helm"
         data-is-active-test="false"
-        data-test-id="helm"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-helm"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -791,10 +749,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="user-management"
         data-is-active-test="false"
-        data-test-id="user-management"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-user-management"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -820,10 +776,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="custom-resources"
         data-is-active-test="false"
-        data-test-id="custom-resources"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-custom-resources"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -859,10 +813,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="some-extension-name-some-parent-id"
         data-is-active-test="false"
-        data-test-id="some-extension-name-some-parent-id"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-some-extension-name-some-parent-id"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -893,11 +845,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
         >
           <div
             class="SidebarItem"
-            data-id-test="some-extension-name-some-child-id"
             data-is-active-test="false"
             data-parent-id-test="some-extension-name-some-parent-id"
-            data-test-id="some-extension-name-some-child-id"
-            data-testid="sidebar-item"
+            data-testid="sidebar-item-some-extension-name-some-child-id"
           >
             <a
               class="nav-item flex gaps align-center"
@@ -913,11 +863,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
           </div>
           <div
             class="SidebarItem"
-            data-id-test="some-extension-name-some-other-child-id"
             data-is-active-test="false"
             data-parent-id-test="some-extension-name-some-parent-id"
-            data-test-id="some-extension-name-some-other-child-id"
-            data-testid="sidebar-item"
+            data-testid="sidebar-item-some-extension-name-some-other-child-id"
           >
             <a
               class="nav-item flex gaps align-center"
@@ -965,10 +913,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
     >
       <div
         class="SidebarItem"
-        data-id-test="workloads"
         data-is-active-test="false"
-        data-test-id="workloads"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-workloads"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1001,10 +947,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="config"
         data-is-active-test="false"
-        data-test-id="config"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-config"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -1030,10 +974,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="network"
         data-is-active-test="false"
-        data-test-id="network"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-network"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1069,10 +1011,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="storage"
         data-is-active-test="false"
-        data-test-id="storage"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-storage"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -1098,10 +1038,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="helm"
         data-is-active-test="false"
-        data-test-id="helm"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-helm"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1134,10 +1072,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="user-management"
         data-is-active-test="false"
-        data-test-id="user-management"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-user-management"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -1163,10 +1099,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="custom-resources"
         data-is-active-test="false"
-        data-test-id="custom-resources"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-custom-resources"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1202,10 +1136,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="some-extension-name-some-parent-id"
         data-is-active-test="true"
-        data-test-id="some-extension-name-some-parent-id"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-some-extension-name-some-parent-id"
       >
         <a
           aria-current="page"
@@ -1237,11 +1169,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
         >
           <div
             class="SidebarItem"
-            data-id-test="some-extension-name-some-child-id"
             data-is-active-test="true"
             data-parent-id-test="some-extension-name-some-parent-id"
-            data-test-id="some-extension-name-some-child-id"
-            data-testid="sidebar-item"
+            data-testid="sidebar-item-some-extension-name-some-child-id"
           >
             <a
               aria-current="page"
@@ -1258,11 +1188,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
           </div>
           <div
             class="SidebarItem"
-            data-id-test="some-extension-name-some-other-child-id"
             data-is-active-test="false"
             data-parent-id-test="some-extension-name-some-parent-id"
-            data-test-id="some-extension-name-some-other-child-id"
-            data-testid="sidebar-item"
+            data-testid="sidebar-item-some-extension-name-some-other-child-id"
           >
             <a
               class="nav-item flex gaps align-center"
@@ -1352,10 +1280,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
     >
       <div
         class="SidebarItem"
-        data-id-test="workloads"
         data-is-active-test="false"
-        data-test-id="workloads"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-workloads"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1388,10 +1314,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="config"
         data-is-active-test="false"
-        data-test-id="config"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-config"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -1417,10 +1341,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="network"
         data-is-active-test="false"
-        data-test-id="network"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-network"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1456,10 +1378,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="storage"
         data-is-active-test="false"
-        data-test-id="storage"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-storage"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -1485,10 +1405,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="helm"
         data-is-active-test="false"
-        data-test-id="helm"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-helm"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1521,10 +1439,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="user-management"
         data-is-active-test="false"
-        data-test-id="user-management"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-user-management"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -1550,10 +1466,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="custom-resources"
         data-is-active-test="false"
-        data-test-id="custom-resources"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-custom-resources"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1589,10 +1503,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="some-extension-name-some-parent-id"
         data-is-active-test="true"
-        data-test-id="some-extension-name-some-parent-id"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-some-extension-name-some-parent-id"
       >
         <a
           aria-current="page"
@@ -1624,11 +1536,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
         >
           <div
             class="SidebarItem"
-            data-id-test="some-extension-name-some-child-id"
             data-is-active-test="false"
             data-parent-id-test="some-extension-name-some-parent-id"
-            data-test-id="some-extension-name-some-child-id"
-            data-testid="sidebar-item"
+            data-testid="sidebar-item-some-extension-name-some-child-id"
           >
             <a
               class="nav-item flex gaps align-center"
@@ -1644,11 +1554,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
           </div>
           <div
             class="SidebarItem"
-            data-id-test="some-extension-name-some-other-child-id"
             data-is-active-test="true"
             data-parent-id-test="some-extension-name-some-parent-id"
-            data-test-id="some-extension-name-some-other-child-id"
-            data-testid="sidebar-item"
+            data-testid="sidebar-item-some-extension-name-some-other-child-id"
           >
             <a
               aria-current="page"
@@ -1739,10 +1647,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
     >
       <div
         class="SidebarItem"
-        data-id-test="workloads"
         data-is-active-test="false"
-        data-test-id="workloads"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-workloads"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1775,10 +1681,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="config"
         data-is-active-test="false"
-        data-test-id="config"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-config"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -1804,10 +1708,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="network"
         data-is-active-test="false"
-        data-test-id="network"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-network"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1843,10 +1745,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="storage"
         data-is-active-test="false"
-        data-test-id="storage"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-storage"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -1872,10 +1772,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="helm"
         data-is-active-test="false"
-        data-test-id="helm"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-helm"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1908,10 +1806,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="user-management"
         data-is-active-test="false"
-        data-test-id="user-management"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-user-management"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -1937,10 +1833,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="custom-resources"
         data-is-active-test="false"
-        data-test-id="custom-resources"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-custom-resources"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -1976,10 +1870,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="some-extension-name-some-parent-id"
         data-is-active-test="true"
-        data-test-id="some-extension-name-some-parent-id"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-some-extension-name-some-parent-id"
       >
         <a
           aria-current="page"
@@ -2081,10 +1973,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
     >
       <div
         class="SidebarItem"
-        data-id-test="workloads"
         data-is-active-test="false"
-        data-test-id="workloads"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-workloads"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -2117,10 +2007,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="config"
         data-is-active-test="false"
-        data-test-id="config"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-config"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -2146,10 +2034,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="network"
         data-is-active-test="false"
-        data-test-id="network"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-network"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -2185,10 +2071,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="storage"
         data-is-active-test="false"
-        data-test-id="storage"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-storage"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -2214,10 +2098,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="helm"
         data-is-active-test="false"
-        data-test-id="helm"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-helm"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -2250,10 +2132,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="user-management"
         data-is-active-test="false"
-        data-test-id="user-management"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-user-management"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -2279,10 +2159,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="custom-resources"
         data-is-active-test="false"
-        data-test-id="custom-resources"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-custom-resources"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -2318,10 +2196,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="some-extension-name-some-parent-id"
         data-is-active-test="false"
-        data-test-id="some-extension-name-some-parent-id"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-some-extension-name-some-parent-id"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -2352,11 +2228,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
         >
           <div
             class="SidebarItem"
-            data-id-test="some-extension-name-some-child-id"
             data-is-active-test="false"
             data-parent-id-test="some-extension-name-some-parent-id"
-            data-test-id="some-extension-name-some-child-id"
-            data-testid="sidebar-item"
+            data-testid="sidebar-item-some-extension-name-some-child-id"
           >
             <a
               class="nav-item flex gaps align-center"
@@ -2372,11 +2246,9 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
           </div>
           <div
             class="SidebarItem"
-            data-id-test="some-extension-name-some-other-child-id"
             data-is-active-test="false"
             data-parent-id-test="some-extension-name-some-parent-id"
-            data-test-id="some-extension-name-some-other-child-id"
-            data-testid="sidebar-item"
+            data-testid="sidebar-item-some-extension-name-some-other-child-id"
           >
             <a
               class="nav-item flex gaps align-center"
@@ -2424,10 +2296,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
     >
       <div
         class="SidebarItem"
-        data-id-test="workloads"
         data-is-active-test="false"
-        data-test-id="workloads"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-workloads"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -2460,10 +2330,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="config"
         data-is-active-test="false"
-        data-test-id="config"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-config"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -2489,10 +2357,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="network"
         data-is-active-test="false"
-        data-test-id="network"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-network"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -2528,10 +2394,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="storage"
         data-is-active-test="false"
-        data-test-id="storage"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-storage"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -2557,10 +2421,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="helm"
         data-is-active-test="false"
-        data-test-id="helm"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-helm"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -2593,10 +2455,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="user-management"
         data-is-active-test="false"
-        data-test-id="user-management"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-user-management"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -2622,10 +2482,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="custom-resources"
         data-is-active-test="false"
-        data-test-id="custom-resources"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-custom-resources"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -2661,10 +2519,8 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
       </div>
       <div
         class="SidebarItem"
-        data-id-test="some-extension-name-some-parent-id"
         data-is-active-test="false"
-        data-test-id="some-extension-name-some-parent-id"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-some-extension-name-some-parent-id"
       >
         <a
           class="nav-item flex gaps align-center expandable"
diff --git a/src/behaviours/cluster/__snapshots__/visibility-of-sidebar-items.test.tsx.snap b/src/behaviours/cluster/__snapshots__/visibility-of-sidebar-items.test.tsx.snap
index cc44f56496..60b2a6a501 100644
--- a/src/behaviours/cluster/__snapshots__/visibility-of-sidebar-items.test.tsx.snap
+++ b/src/behaviours/cluster/__snapshots__/visibility-of-sidebar-items.test.tsx.snap
@@ -24,10 +24,8 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
     >
       <div
         class="SidebarItem"
-        data-id-test="workloads"
         data-is-active-test="false"
-        data-test-id="workloads"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-workloads"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -60,10 +58,8 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
       </div>
       <div
         class="SidebarItem"
-        data-id-test="config"
         data-is-active-test="false"
-        data-test-id="config"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-config"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -89,10 +85,8 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
       </div>
       <div
         class="SidebarItem"
-        data-id-test="network"
         data-is-active-test="false"
-        data-test-id="network"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-network"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -128,10 +122,8 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
       </div>
       <div
         class="SidebarItem"
-        data-id-test="storage"
         data-is-active-test="false"
-        data-test-id="storage"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-storage"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -157,10 +149,8 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
       </div>
       <div
         class="SidebarItem"
-        data-id-test="helm"
         data-is-active-test="false"
-        data-test-id="helm"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-helm"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -193,10 +183,8 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
       </div>
       <div
         class="SidebarItem"
-        data-id-test="user-management"
         data-is-active-test="false"
-        data-test-id="user-management"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-user-management"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -222,10 +210,8 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
       </div>
       <div
         class="SidebarItem"
-        data-id-test="custom-resources"
         data-is-active-test="false"
-        data-test-id="custom-resources"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-custom-resources"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -291,10 +277,8 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
     >
       <div
         class="SidebarItem"
-        data-id-test="workloads"
         data-is-active-test="false"
-        data-test-id="workloads"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-workloads"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -327,10 +311,8 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
       </div>
       <div
         class="SidebarItem"
-        data-id-test="config"
         data-is-active-test="false"
-        data-test-id="config"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-config"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -356,10 +338,8 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
       </div>
       <div
         class="SidebarItem"
-        data-id-test="some-item-id"
         data-is-active-test="false"
-        data-test-id="some-item-id"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-some-item-id"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -375,10 +355,8 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
       </div>
       <div
         class="SidebarItem"
-        data-id-test="network"
         data-is-active-test="false"
-        data-test-id="network"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-network"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -414,10 +392,8 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
       </div>
       <div
         class="SidebarItem"
-        data-id-test="storage"
         data-is-active-test="false"
-        data-test-id="storage"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-storage"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -443,10 +419,8 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
       </div>
       <div
         class="SidebarItem"
-        data-id-test="namespaces"
         data-is-active-test="false"
-        data-test-id="namespaces"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-namespaces"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -472,10 +446,8 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
       </div>
       <div
         class="SidebarItem"
-        data-id-test="helm"
         data-is-active-test="false"
-        data-test-id="helm"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-helm"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -508,10 +480,8 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
       </div>
       <div
         class="SidebarItem"
-        data-id-test="user-management"
         data-is-active-test="false"
-        data-test-id="user-management"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-user-management"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -537,10 +507,8 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
       </div>
       <div
         class="SidebarItem"
-        data-id-test="custom-resources"
         data-is-active-test="false"
-        data-test-id="custom-resources"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-custom-resources"
       >
         <a
           class="nav-item flex gaps align-center expandable"
diff --git a/src/behaviours/cluster/order-of-sidebar-items.test.tsx b/src/behaviours/cluster/order-of-sidebar-items.test.tsx
index 77bf395de7..368b1b065d 100644
--- a/src/behaviours/cluster/order-of-sidebar-items.test.tsx
+++ b/src/behaviours/cluster/order-of-sidebar-items.test.tsx
@@ -8,7 +8,7 @@ import { fireEvent } from "@testing-library/react";
 import type { SidebarItemRegistration } from "../../renderer/components/layout/sidebar-items.injectable";
 import { sidebarItemsInjectionToken } from "../../renderer/components/layout/sidebar-items.injectable";
 import { computed } from "mobx";
-import { get, includes, noop } from "lodash/fp";
+import { noop } from "lodash/fp";
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 
@@ -35,22 +35,13 @@ describe("cluster - order of sidebar items", () => {
 
     it("has parent items in order", () => {
       const actual = rendered
-        .queryAllByTestId("sidebar-item")
-
-        .filter((element) =>
-          includes(element.dataset.idTest)([
-            "some-parent-id",
-            "some-other-parent-id",
-            "some-another-parent-id",
-          ]),
-        )
-
-        .map(get("dataset.idTest"));
+        .queryAllByTestId(/^sidebar-item-(some-parent-id|some-other-parent-id|some-another-parent-id)/)
+        .map(elem => elem.dataset.testid);
 
       expect(actual).toEqual([
-        "some-parent-id",
-        "some-another-parent-id",
-        "some-other-parent-id",
+        "sidebar-item-some-parent-id",
+        "sidebar-item-some-another-parent-id",
+        "sidebar-item-some-other-parent-id",
       ]);
     });
 
@@ -69,16 +60,14 @@ describe("cluster - order of sidebar items", () => {
 
       it("has child items in order", () => {
         const actual = rendered
-          .queryAllByTestId("sidebar-item")
-          .filter(
-            (element) => element.dataset.parentIdTest === "some-parent-id",
-          )
-          .map(get("dataset.idTest"));
+          .queryAllByTestId(/^sidebar-item-*/)
+          .filter((element) => element.dataset.parentIdTest === "some-parent-id")
+          .map(elem => elem.dataset.testid);
 
         expect(actual).toEqual([
-          "some-child-id",
-          "some-another-child-id",
-          "some-other-child-id",
+          "sidebar-item-some-child-id",
+          "sidebar-item-some-another-child-id",
+          "sidebar-item-some-other-child-id",
         ]);
       });
     });
diff --git a/src/behaviours/cluster/sidebar-and-tab-navigation-for-core.test.tsx b/src/behaviours/cluster/sidebar-and-tab-navigation-for-core.test.tsx
index a8c26acc2a..5258a51d88 100644
--- a/src/behaviours/cluster/sidebar-and-tab-navigation-for-core.test.tsx
+++ b/src/behaviours/cluster/sidebar-and-tab-navigation-for-core.test.tsx
@@ -21,7 +21,6 @@ import writeJsonFileInjectable from "../../common/fs/write-json-file.injectable"
 import pathExistsInjectable from "../../common/fs/path-exists.injectable";
 import readJsonFileInjectable from "../../common/fs/read-json-file.injectable";
 import { navigateToRouteInjectionToken } from "../../common/front-end-routing/navigate-to-route-injection-token";
-import { getSidebarItem } from "../utils";
 import sidebarStorageInjectable from "../../renderer/components/layout/sidebar-storage/sidebar-storage.injectable";
 
 describe("cluster - sidebar and tab navigation for core", () => {
@@ -72,15 +71,15 @@ describe("cluster - sidebar and tab navigation for core", () => {
       });
 
       it("parent is highlighted", () => {
-        const parent = getSidebarItem(rendered, "some-parent-id");
+        const parent = rendered.queryByTestId("sidebar-item-some-parent-id");
 
         expect(parent?.dataset.isActiveTest).toBe("true");
       });
 
       it("parent sidebar item is not expanded", () => {
-        const child = getSidebarItem(rendered, "some-child-id");
+        const child = rendered.queryByTestId("sidebar-item-some-child-id");
 
-        expect(child).toBeUndefined();
+        expect(child).toBeNull();
       });
 
       it("child page is shown", () => {
@@ -118,15 +117,15 @@ describe("cluster - sidebar and tab navigation for core", () => {
       });
 
       it("parent sidebar item is not highlighted", () => {
-        const parent = getSidebarItem(rendered, "some-parent-id");
+        const parent = rendered.queryByTestId("sidebar-item-some-parent-id");
 
         expect(parent?.dataset.isActiveTest).toBe("false");
       });
 
       it("parent sidebar item is expanded", () => {
-        const child = getSidebarItem(rendered, "some-child-id");
+        const child = rendered.queryByTestId("sidebar-item-some-child-id");
 
-        expect(child).not.toBeUndefined();
+        expect(child).not.toBeNull();
       });
     });
 
@@ -154,9 +153,9 @@ describe("cluster - sidebar and tab navigation for core", () => {
       });
 
       it("parent sidebar item is not expanded", () => {
-        const child = getSidebarItem(rendered, "some-child-id");
+        const child = rendered.queryByTestId("sidebar-item-some-child-id");
 
-        expect(child).toBeUndefined();
+        expect(child).toBeNull();
       });
     });
 
@@ -181,9 +180,9 @@ describe("cluster - sidebar and tab navigation for core", () => {
       });
 
       it("parent sidebar item is not expanded", () => {
-        const child = getSidebarItem(rendered, "some-child-id");
+        const child = rendered.queryByTestId("sidebar-item-some-child-id");
 
-        expect(child).toBeUndefined();
+        expect(child).toBeNull();
       });
     });
 
@@ -197,15 +196,15 @@ describe("cluster - sidebar and tab navigation for core", () => {
       });
 
       it("parent sidebar item is not highlighted", () => {
-        const parent = getSidebarItem(rendered, "some-parent-id");
+        const parent = rendered.queryByTestId("sidebar-item-some-parent-id");
 
         expect(parent?.dataset.isActiveTest).toBe("false");
       });
 
       it("parent sidebar item is not expanded", () => {
-        const child = getSidebarItem(rendered, "some-child-id");
+        const child = rendered.queryByTestId("sidebar-item-some-child-id");
 
-        expect(child).toBeUndefined();
+        expect(child).toBeNull();
       });
 
       describe("when a parent sidebar item is expanded", () => {
@@ -222,15 +221,15 @@ describe("cluster - sidebar and tab navigation for core", () => {
         });
 
         it("parent sidebar item is not highlighted", () => {
-          const parent = getSidebarItem(rendered, "some-parent-id");
+          const parent = rendered.queryByTestId("sidebar-item-some-parent-id");
 
           expect(parent?.dataset.isActiveTest).toBe("false");
         });
 
         it("parent sidebar item is expanded", () => {
-          const child = getSidebarItem(rendered, "some-child-id");
+          const child = rendered.queryByTestId("sidebar-item-some-child-id");
 
-          expect(child).not.toBeUndefined();
+          expect(child).not.toBeNull();
         });
 
         describe("when a child of the parent is selected", () => {
@@ -247,13 +246,13 @@ describe("cluster - sidebar and tab navigation for core", () => {
           });
 
           it("parent is highlighted", () => {
-            const parent = getSidebarItem(rendered, "some-parent-id");
+            const parent = rendered.queryByTestId("sidebar-item-some-parent-id");
 
             expect(parent?.dataset.isActiveTest).toBe("true");
           });
 
           it("child is highlighted", () => {
-            const child = getSidebarItem(rendered, "some-child-id");
+            const child = rendered.queryByTestId("sidebar-item-some-child-id");
 
             expect(child?.dataset.isActiveTest).toBe("true");
           });
diff --git a/src/behaviours/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx b/src/behaviours/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx
index eb7fd0bc05..bfd59d55f6 100644
--- a/src/behaviours/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx
+++ b/src/behaviours/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx
@@ -16,7 +16,6 @@ import readJsonFileInjectable from "../../common/fs/read-json-file.injectable";
 import type { DiContainer } from "@ogre-tools/injectable";
 import { navigateToRouteInjectionToken } from "../../common/front-end-routing/navigate-to-route-injection-token";
 import assert from "assert";
-import { getSidebarItem } from "../utils";
 import type { FakeExtensionData } from "../../renderer/components/test-utils/get-renderer-extension-fake";
 import { getRendererExtensionFakeFor } from "../../renderer/components/test-utils/get-renderer-extension-fake";
 
@@ -74,21 +73,15 @@ describe("cluster - sidebar and tab navigation for extensions", () => {
       });
 
       it("parent is highlighted", () => {
-        const parent = getSidebarItem(
-          rendered,
-          "some-extension-name-some-parent-id",
-        );
+        const parent = rendered.getByTestId("sidebar-item-some-extension-name-some-parent-id");
 
         expect(parent?.dataset.isActiveTest).toBe("true");
       });
 
       it("parent sidebar item is not expanded", () => {
-        const child = getSidebarItem(
-          rendered,
-          "some-extension-name-some-child-id",
-        );
+        const child = rendered.queryByTestId("sidebar-item-some-extension-name-some-child-id");
 
-        expect(child).toBeUndefined();
+        expect(child).toBeNull();
       });
 
       it("child page is shown", () => {
@@ -120,21 +113,15 @@ describe("cluster - sidebar and tab navigation for extensions", () => {
       });
 
       it("parent sidebar item is not highlighted", () => {
-        const parent = getSidebarItem(
-          rendered,
-          "some-extension-name-some-parent-id",
-        );
+        const parent = rendered.getByTestId("sidebar-item-some-extension-name-some-parent-id");
 
         expect(parent?.dataset.isActiveTest).toBe("false");
       });
 
       it("parent sidebar item is expanded", () => {
-        const child = getSidebarItem(
-          rendered,
-          "some-extension-name-some-child-id",
-        );
+        const child = rendered.queryByTestId("sidebar-item-some-extension-name-some-child-id");
 
-        expect(child).not.toBeUndefined();
+        expect(child).not.toBeNull();
       });
     });
 
@@ -162,12 +149,9 @@ describe("cluster - sidebar and tab navigation for extensions", () => {
       });
 
       it("parent sidebar item is not expanded", () => {
-        const child = getSidebarItem(
-          rendered,
-          "some-extension-name-some-child-id",
-        );
+        const child = rendered.queryByTestId("sidebar-item-some-extension-name-some-child-id");
 
-        expect(child).toBeUndefined();
+        expect(child).toBeNull();
       });
     });
 
@@ -192,12 +176,9 @@ describe("cluster - sidebar and tab navigation for extensions", () => {
       });
 
       it("parent sidebar item is not expanded", () => {
-        const child = getSidebarItem(
-          rendered,
-          "some-extension-name-some-child-id",
-        );
+        const child = rendered.queryByTestId("sidebar-item-some-extension-name-some-child-id");
 
-        expect(child).toBeUndefined();
+        expect(child).toBeNull();
       });
     });
 
@@ -211,21 +192,15 @@ describe("cluster - sidebar and tab navigation for extensions", () => {
       });
 
       it("parent sidebar item is not highlighted", () => {
-        const parent = getSidebarItem(
-          rendered,
-          "some-extension-name-some-parent-id",
-        );
+        const parent = rendered.getByTestId("sidebar-item-some-extension-name-some-parent-id");
 
         expect(parent?.dataset.isActiveTest).toBe("false");
       });
 
       it("parent sidebar item is not expanded", () => {
-        const child = getSidebarItem(
-          rendered,
-          "some-extension-name-some-child-id",
-        );
+        const child = rendered.queryByTestId("sidebar-item-some-extension-name-some-child-id");
 
-        expect(child).toBeUndefined();
+        expect(child).toBeNull();
       });
 
       describe("when a parent sidebar item is expanded", () => {
@@ -242,21 +217,15 @@ describe("cluster - sidebar and tab navigation for extensions", () => {
         });
 
         it("parent sidebar item is not highlighted", () => {
-          const parent = getSidebarItem(
-            rendered,
-            "some-extension-name-some-parent-id",
-          );
+          const parent = rendered.getByTestId("sidebar-item-some-extension-name-some-parent-id");
 
           expect(parent?.dataset.isActiveTest).toBe("false");
         });
 
         it("parent sidebar item is expanded", () => {
-          const child = getSidebarItem(
-            rendered,
-            "some-extension-name-some-child-id",
-          );
+          const child = rendered.queryByTestId("sidebar-item-some-extension-name-some-child-id");
 
-          expect(child).not.toBeUndefined();
+          expect(child).not.toBeNull();
         });
 
         describe("when a child of the parent is selected", () => {
@@ -273,19 +242,13 @@ describe("cluster - sidebar and tab navigation for extensions", () => {
           });
 
           it("parent is highlighted", () => {
-            const parent = getSidebarItem(
-              rendered,
-              "some-extension-name-some-parent-id",
-            );
+            const parent = rendered.getByTestId("sidebar-item-some-extension-name-some-parent-id");
 
             expect(parent?.dataset.isActiveTest).toBe("true");
           });
 
           it("child is highlighted", () => {
-            const child = getSidebarItem(
-              rendered,
-              "some-extension-name-some-child-id",
-            );
+            const child = rendered.getByTestId("sidebar-item-some-extension-name-some-child-id");
 
             expect(child?.dataset.isActiveTest).toBe("true");
           });
diff --git a/src/behaviours/cluster/visibility-of-sidebar-items.test.tsx b/src/behaviours/cluster/visibility-of-sidebar-items.test.tsx
index c0e0cc88f3..2fb837b9ed 100644
--- a/src/behaviours/cluster/visibility-of-sidebar-items.test.tsx
+++ b/src/behaviours/cluster/visibility-of-sidebar-items.test.tsx
@@ -14,7 +14,6 @@ import { frontEndRouteInjectionToken } from "../../common/front-end-routing/fron
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { navigateToRouteInjectionToken } from "../../common/front-end-routing/navigate-to-route-injection-token";
-import { getSidebarItem } from "../utils";
 
 describe("cluster - visibility of sidebar items", () => {
   let applicationBuilder: ApplicationBuilder;
@@ -42,9 +41,9 @@ describe("cluster - visibility of sidebar items", () => {
     });
 
     it("related sidebar item does not exist", () => {
-      const item = getSidebarItem(rendered, "some-item-id");
+      const item = rendered.queryByTestId("sidebar-item-some-item-id");
 
-      expect(item).toBeUndefined();
+      expect(item).toBeNull();
     });
 
     describe("when kube resource becomes allowed", () => {
@@ -57,9 +56,9 @@ describe("cluster - visibility of sidebar items", () => {
       });
 
       it("related sidebar item exists", () => {
-        const item = getSidebarItem(rendered, "some-item-id");
+        const item = rendered.queryByTestId("sidebar-item-some-item-id");
 
-        expect(item).not.toBeUndefined();
+        expect(item).not.toBeNull();
       });
     });
   });
diff --git a/src/behaviours/helm-charts/__snapshots__/navigation-to-helm-charts.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/navigation-to-helm-charts.test.ts.snap
index 72075146e7..27fc9c463b 100644
--- a/src/behaviours/helm-charts/__snapshots__/navigation-to-helm-charts.test.ts.snap
+++ b/src/behaviours/helm-charts/__snapshots__/navigation-to-helm-charts.test.ts.snap
@@ -24,10 +24,8 @@ exports[`helm-charts - navigation to Helm charts when navigating to Helm charts
     >
       <div
         class="SidebarItem"
-        data-id-test="workloads"
         data-is-active-test="false"
-        data-test-id="workloads"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-workloads"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -60,10 +58,8 @@ exports[`helm-charts - navigation to Helm charts when navigating to Helm charts
       </div>
       <div
         class="SidebarItem"
-        data-id-test="config"
         data-is-active-test="false"
-        data-test-id="config"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-config"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -89,10 +85,8 @@ exports[`helm-charts - navigation to Helm charts when navigating to Helm charts
       </div>
       <div
         class="SidebarItem"
-        data-id-test="network"
         data-is-active-test="false"
-        data-test-id="network"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-network"
       >
         <a
           class="nav-item flex gaps align-center expandable"
@@ -128,10 +122,8 @@ exports[`helm-charts - navigation to Helm charts when navigating to Helm charts
       </div>
       <div
         class="SidebarItem"
-        data-id-test="storage"
         data-is-active-test="false"
-        data-test-id="storage"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-storage"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -157,10 +149,8 @@ exports[`helm-charts - navigation to Helm charts when navigating to Helm charts
       </div>
       <div
         class="SidebarItem"
-        data-id-test="helm"
         data-is-active-test="true"
-        data-test-id="helm"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-helm"
       >
         <a
           aria-current="page"
@@ -194,10 +184,8 @@ exports[`helm-charts - navigation to Helm charts when navigating to Helm charts
       </div>
       <div
         class="SidebarItem"
-        data-id-test="user-management"
         data-is-active-test="false"
-        data-test-id="user-management"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-user-management"
       >
         <a
           class="nav-item flex gaps align-center"
@@ -223,10 +211,8 @@ exports[`helm-charts - navigation to Helm charts when navigating to Helm charts
       </div>
       <div
         class="SidebarItem"
-        data-id-test="custom-resources"
         data-is-active-test="false"
-        data-test-id="custom-resources"
-        data-testid="sidebar-item"
+        data-testid="sidebar-item-custom-resources"
       >
         <a
           class="nav-item flex gaps align-center expandable"
diff --git a/src/behaviours/utils.ts b/src/behaviours/utils.ts
deleted file mode 100644
index 1a20ab249b..0000000000
--- a/src/behaviours/utils.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import type { RenderResult } from "@testing-library/react";
-
-export function getSidebarItem(rendered: RenderResult, itemId: string) {
-  return rendered
-    .queryAllByTestId("sidebar-item")
-    .find((x) => x.dataset.idTest === itemId);
-}
diff --git a/src/common/__tests__/kube-helpers.test.ts b/src/common/__tests__/kube-helpers.test.ts
index 26a64c3995..ec466b5c56 100644
--- a/src/common/__tests__/kube-helpers.test.ts
+++ b/src/common/__tests__/kube-helpers.test.ts
@@ -78,12 +78,12 @@ describe("kube helpers", () => {
     describe("with default validation options", () => {
       describe("with valid kubeconfig", () => {
         it("does not return an error", () => {
-          expect(validateKubeConfig(kc, "valid")).toBeUndefined();
+          expect(validateKubeConfig(kc, "valid")).toBeDefined();
         });
       });
       describe("with invalid context object", () => {
         it("returns an error", () => {
-          expect(String(validateKubeConfig(kc, "invalid"))).toEqual(
+          expect(validateKubeConfig(kc, "invalid").error?.toString()).toEqual(
             expect.stringContaining("No valid context object provided in kubeconfig for context 'invalid'"),
           );
         });
@@ -91,7 +91,7 @@ describe("kube helpers", () => {
 
       describe("with invalid cluster object", () => {
         it("returns an error", () => {
-          expect(String(validateKubeConfig(kc, "invalidCluster"))).toEqual(
+          expect(validateKubeConfig(kc, "invalidCluster").error?.toString()).toEqual(
             expect.stringContaining("No valid cluster object provided in kubeconfig for context 'invalidCluster'"),
           );
         });
@@ -99,7 +99,7 @@ describe("kube helpers", () => {
 
       describe("with invalid user object", () => {
         it("returns an error", () => {
-          expect(String(validateKubeConfig(kc, "invalidUser"))).toEqual(
+          expect(validateKubeConfig(kc, "invalidUser").error?.toString()).toEqual(
             expect.stringContaining("No valid user object provided in kubeconfig for context 'invalidUser'"),
           );
         });
diff --git a/src/common/cluster-store/cluster-store.injectable.ts b/src/common/cluster-store/cluster-store.injectable.ts
index 58b540495a..f9e7f40be9 100644
--- a/src/common/cluster-store/cluster-store.injectable.ts
+++ b/src/common/cluster-store/cluster-store.injectable.ts
@@ -5,6 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { ClusterStore } from "./cluster-store";
 import { createClusterInjectionToken } from "../cluster/create-cluster-injection-token";
+import readFileSyncInjectable from "../fs/read-file-sync.injectable";
 
 const clusterStoreInjectable = getInjectable({
   id: "cluster-store",
@@ -14,6 +15,7 @@ const clusterStoreInjectable = getInjectable({
 
     return ClusterStore.createInstance({
       createCluster: di.inject(createClusterInjectionToken),
+      readFileSync: di.inject(readFileSyncInjectable),
     });
   },
 
diff --git a/src/common/cluster-types.ts b/src/common/cluster-types.ts
index 9c7e49b662..f0862e07b8 100644
--- a/src/common/cluster-types.ts
+++ b/src/common/cluster-types.ts
@@ -3,7 +3,6 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-
 /**
  * JSON serializable metadata type
  */
diff --git a/src/main/__test__/cluster.test.ts b/src/main/__test__/cluster.test.ts
index 4086adefbd..5e42c8e5fe 100644
--- a/src/main/__test__/cluster.test.ts
+++ b/src/main/__test__/cluster.test.ts
@@ -8,11 +8,10 @@ jest.mock("request");
 jest.mock("request-promise-native");
 
 import { Console } from "console";
-import mockFs from "mock-fs";
 import type { Cluster } from "../../common/cluster/cluster";
 import { Kubectl } from "../kubectl/kubectl";
 import { getDiForUnitTesting } from "../getDiForUnitTesting";
-import type { ClusterModel } from "../../common/cluster-types";
+import type { CreateCluster } from "../../common/cluster/create-cluster-injection-token";
 import { createClusterInjectionToken } from "../../common/cluster/create-cluster-injection-token";
 import authorizationReviewInjectable from "../../common/cluster/authorization-review.injectable";
 import listNamespacesInjectable from "../../common/cluster/list-namespaces.injectable";
@@ -29,36 +28,13 @@ console = new Console(process.stdout, process.stderr); // fix mockFS
 
 describe("create clusters", () => {
   let cluster: Cluster;
-  let createCluster: (model: ClusterModel) => Cluster;
+  let createCluster: CreateCluster;
 
   beforeEach(() => {
     jest.clearAllMocks();
 
     const di = getDiForUnitTesting({ doGeneralOverrides: true });
-
-    mockFs({
-      "minikube-config.yml": JSON.stringify({
-        apiVersion: "v1",
-        clusters: [{
-          name: "minikube",
-          cluster: {
-            server: "https://192.168.64.3:8443",
-          },
-        }],
-        contexts: [{
-          context: {
-            cluster: "minikube",
-            user: "minikube",
-          },
-          name: "minikube",
-        }],
-        users: [{
-          name: "minikube",
-        }],
-        kind: "Config",
-        preferences: {},
-      }),
-    });
+    const clusterServerUrl = "https://192.168.64.3:8443";
 
     di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
     di.override(directoryForTempInjectable, () => "some-directory-for-temp");
@@ -87,12 +63,13 @@ describe("create clusters", () => {
       id: "foo",
       contextName: "minikube",
       kubeConfigPath: "minikube-config.yml",
+    }, {
+      clusterServerUrl,
     });
   });
 
   afterEach(() => {
     cluster.disconnect();
-    mockFs.restore();
   });
 
   it("should be able to create a cluster from a cluster model and apiURL should be decoded", () => {
@@ -108,12 +85,6 @@ describe("create clusters", () => {
   });
 
   it("activating cluster should try to connect to cluster and do a refresh", async () => {
-    const cluster = createCluster({
-      id: "foo",
-      contextName: "minikube",
-      kubeConfigPath: "minikube-config.yml",
-    });
-
     jest.spyOn(cluster, "reconnect");
     jest.spyOn(cluster, "refreshConnectionStatus");
 
diff --git a/src/main/__test__/kube-auth-proxy.test.ts b/src/main/__test__/kube-auth-proxy.test.ts
index 9737c3925d..ffb1892da2 100644
--- a/src/main/__test__/kube-auth-proxy.test.ts
+++ b/src/main/__test__/kube-auth-proxy.test.ts
@@ -3,8 +3,6 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import type { ClusterModel } from "../../common/cluster-types";
-
 jest.mock("winston", () => ({
   format: {
     colorize: jest.fn(),
@@ -51,6 +49,7 @@ import { stdout, stderr } from "process";
 import mockFs from "mock-fs";
 import { getDiForUnitTesting } from "../getDiForUnitTesting";
 import createKubeAuthProxyInjectable from "../kube-auth-proxy/create-kube-auth-proxy.injectable";
+import type { CreateCluster } from "../../common/cluster/create-cluster-injection-token";
 import { createClusterInjectionToken } from "../../common/cluster/create-cluster-injection-token";
 import path from "path";
 import spawnInjectable from "../child-process/spawn.injectable";
@@ -67,9 +66,10 @@ console = new Console(stdout, stderr);
 const mockBroadcastIpc = broadcastMessage as jest.MockedFunction<typeof broadcastMessage>;
 const mockSpawn = spawn as jest.MockedFunction<typeof spawn>;
 const mockWaitUntilUsed = waitUntilUsed as jest.MockedFunction<typeof waitUntilUsed>;
+const clusterServerUrl = "https://192.168.64.3:8443";
 
 describe("kube auth proxy tests", () => {
-  let createCluster: (model: ClusterModel) => Cluster;
+  let createCluster: CreateCluster;
   let createKubeAuthProxy: (cluster: Cluster, environmentVariables: NodeJS.ProcessEnv) => KubeAuthProxy;
 
   beforeEach(async () => {
@@ -81,7 +81,7 @@ describe("kube auth proxy tests", () => {
         clusters: [{
           name: "minikube",
           cluster: {
-            server: "https://192.168.64.3:8443",
+            server: clusterServerUrl,
           },
         }],
         "current-context": "minikube",
@@ -130,6 +130,8 @@ describe("kube auth proxy tests", () => {
       id: "foobar",
       kubeConfigPath: "minikube-config.yml",
       contextName: "minikube",
+    }, {
+      clusterServerUrl,
     });
 
     const kap = createKubeAuthProxy(cluster, {});
@@ -222,6 +224,8 @@ describe("kube auth proxy tests", () => {
         id: "foobar",
         kubeConfigPath: "minikube-config.yml",
         contextName: "minikube",
+      }, {
+        clusterServerUrl,
       });
 
       proxy = createKubeAuthProxy(cluster, {});
diff --git a/src/main/__test__/kubeconfig-manager.test.ts b/src/main/__test__/kubeconfig-manager.test.ts
index 604608bb25..9cac0063ee 100644
--- a/src/main/__test__/kubeconfig-manager.test.ts
+++ b/src/main/__test__/kubeconfig-manager.test.ts
@@ -26,6 +26,8 @@ import kubectlDownloadingNormalizedArchInjectable from "../kubectl/normalized-ar
 
 console = new Console(process.stdout, process.stderr); // fix mockFS
 
+const clusterServerUrl = "https://192.168.64.3:8443";
+
 describe("kubeconfig manager tests", () => {
   let clusterFake: Cluster;
   let createKubeconfigManager: (cluster: Cluster) => KubeconfigManager | undefined;
@@ -57,7 +59,7 @@ describe("kubeconfig manager tests", () => {
         clusters: [{
           name: "minikube",
           cluster: {
-            server: "https://192.168.64.3:8443",
+            server: clusterServerUrl,
           },
         }],
         contexts: [{
@@ -95,6 +97,8 @@ describe("kubeconfig manager tests", () => {
       id: "foo",
       contextName: "minikube",
       kubeConfigPath: "minikube-config.yml",
+    }, {
+      clusterServerUrl,
     });
 
     jest.spyOn(KubeconfigManager.prototype, "resolveProxyUrl", "get").mockReturnValue("http://127.0.0.1:9191/foo");
diff --git a/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts b/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts
index 5946a113a0..72acbb3c03 100644
--- a/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts
+++ b/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts
@@ -14,7 +14,6 @@ import clusterStoreInjectable from "../../../common/cluster-store/cluster-store.
 import { getDiForUnitTesting } from "../../getDiForUnitTesting";
 import { createClusterInjectionToken } from "../../../common/cluster/create-cluster-injection-token";
 import directoryForKubeConfigsInjectable from "../../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable";
-import { ClusterStore } from "../../../common/cluster-store/cluster-store";
 import getConfigurationFileModelInjectable from "../../../common/get-configuration-file-model/get-configuration-file-model.injectable";
 import appVersionInjectable from "../../../common/get-configuration-file-model/app-version/app-version.injectable";
 import clusterManagerInjectable from "../../cluster-manager.injectable";
@@ -23,6 +22,8 @@ import directoryForTempInjectable from "../../../common/app-paths/directory-for-
 import kubectlBinaryNameInjectable from "../../kubectl/binary-name.injectable";
 import kubectlDownloadingNormalizedArchInjectable from "../../kubectl/normalized-arch.injectable";
 import normalizedPlatformInjectable from "../../../common/vars/normalized-platform.injectable";
+import { iter } from "../../../common/utils";
+import fsInjectable from "../../../common/fs/fs.injectable";
 
 jest.mock("electron", () => ({
   app: {
@@ -54,10 +55,9 @@ describe("kubeconfig-sync.source tests", () => {
     di.override(kubectlDownloadingNormalizedArchInjectable, () => "amd64");
     di.override(normalizedPlatformInjectable, () => "darwin");
 
-    di.override(clusterStoreInjectable, () =>
-      ClusterStore.createInstance({ createCluster: () => null as never }),
-    );
-
+    di.permitSideEffects(fsInjectable);
+    di.unoverride(clusterStoreInjectable);
+    di.permitSideEffects(clusterStoreInjectable);
     di.permitSideEffects(getConfigurationFileModelInjectable);
     di.permitSideEffects(appVersionInjectable);
 
@@ -66,13 +66,10 @@ describe("kubeconfig-sync.source tests", () => {
       createCluster: di.inject(createClusterInjectionToken),
       clusterManager: di.inject(clusterManagerInjectable),
     });
-
-    di.inject(clusterStoreInjectable);
   });
 
   afterEach(() => {
     mockFs.restore();
-    ClusterStore.resetInstance();
   });
 
   describe("configsToModels", () => {
@@ -108,8 +105,8 @@ describe("kubeconfig-sync.source tests", () => {
       const models = configToModels(config, "/bar");
 
       expect(models.length).toBe(1);
-      expect(models[0].contextName).toBe("context-name");
-      expect(models[0].kubeConfigPath).toBe("/bar");
+      expect(models[0][0].contextName).toBe("context-name");
+      expect(models[0][0].kubeConfigPath).toBe("/bar");
     });
   });
 
@@ -160,7 +157,8 @@ describe("kubeconfig-sync.source tests", () => {
 
       expect(rootSource.size).toBe(1);
 
-      const c = rootSource.values().next().value[0] as Cluster;
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const c = (iter.first(rootSource.values())!)[0];
 
       expect(c.kubeConfigPath).toBe("/bar");
       expect(c.contextName).toBe("context-name");
diff --git a/src/main/catalog-sources/kubeconfig-sync/manager.ts b/src/main/catalog-sources/kubeconfig-sync/manager.ts
index 6b841389e2..892fa97eb9 100644
--- a/src/main/catalog-sources/kubeconfig-sync/manager.ts
+++ b/src/main/catalog-sources/kubeconfig-sync/manager.ts
@@ -29,7 +29,6 @@ import type { ClusterConfigData, UpdateClusterModel } from "../../../common/clus
 import type { Cluster } from "../../../common/cluster/cluster";
 import type { CatalogEntityRegistry } from "../../catalog/entity-registry";
 import type { CreateCluster } from "../../../common/cluster/create-cluster-injection-token";
-import assert from "assert";
 
 const logPrefix = "[KUBECONFIG-SYNC]:";
 
@@ -152,21 +151,17 @@ export class KubeconfigSyncManager {
 export function configToModels(rootConfig: KubeConfig, filePath: string): [UpdateClusterModel, ClusterConfigData][] {
   const validConfigs: ReturnType<typeof configToModels> = [];
 
-  for (const { config, error } of splitConfig(rootConfig)) {
-    if (error) {
-      logger.debug(`${logPrefix} context failed validation: ${error}`, { context: config.currentContext, filePath });
+  for (const { config, validationResult } of splitConfig(rootConfig)) {
+    if (validationResult.error) {
+      logger.debug(`${logPrefix} context failed validation: ${validationResult.error}`, { context: config.currentContext, filePath });
     } else {
-      const cluster = config.getCluster(config.currentContext);
-
-      assert(cluster, "Config somehow passed validations but still doesn't have a cluster");
-
       validConfigs.push([
         {
           kubeConfigPath: filePath,
           contextName: config.currentContext,
         },
         {
-          clusterServerUrl: cluster.server,
+          clusterServerUrl: validationResult.cluster.server,
         },
       ]);
     }
diff --git a/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx b/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx
index 02d1c7e96c..09bf3a0700 100644
--- a/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx
+++ b/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx
@@ -9,9 +9,8 @@ import type { RenderResult } from "@testing-library/react";
 import mockFs from "mock-fs";
 import React from "react";
 import * as selectEvent from "react-select-event";
-import type { Cluster } from "../../../../common/cluster/cluster";
 import { DeleteClusterDialog } from "../view";
-import type { ClusterModel } from "../../../../common/cluster-types";
+import type { CreateCluster } from "../../../../common/cluster/create-cluster-injection-token";
 import { createClusterInjectionToken } from "../../../../common/cluster/create-cluster-injection-token";
 import createContextHandlerInjectable from "../../../../main/context-handler/create-context-handler.injectable";
 import type { OpenDeleteClusterDialog } from "../open.injectable";
@@ -46,14 +45,16 @@ jest.mock("electron", () => ({
   },
 }));
 
+const currentClusterServerUrl = "https://localhost";
+const nonCurrentClusterServerUrl = "http://localhost";
 const multiClusterConfig = `
 apiVersion: v1
 clusters:
 - cluster:
-    server: https://localhost
+    server: ${currentClusterServerUrl}
   name: some-current-context-cluster
 - cluster:
-    server: http://localhost
+    server: ${nonCurrentClusterServerUrl}
   name: some-non-current-context-cluster
 contexts:
 - context:
@@ -73,11 +74,12 @@ users:
     token: kubeconfig-user-q4lm4:xxxyyyy
 `;
 
+const singleClusterServerUrl = "http://localhost";
 const singleClusterConfig = `
 apiVersion: v1
 clusters:
 - cluster:
-    server: http://localhost
+    server: ${singleClusterServerUrl}
   name: some-cluster
 contexts:
 - context:
@@ -97,7 +99,7 @@ let config: KubeConfig;
 
 describe("<DeleteClusterDialog />", () => {
   let applicationBuilder: ApplicationBuilder;
-  let createCluster: (model: ClusterModel) => Cluster;
+  let createCluster: CreateCluster;
   let openDeleteClusterDialog: OpenDeleteClusterDialog;
 
   beforeEach(async () => {
@@ -157,6 +159,8 @@ describe("<DeleteClusterDialog />", () => {
           clusterName: "some-current-context-cluster",
         },
         kubeConfigPath: "./temp-kube-config",
+      }, {
+        clusterServerUrl: currentClusterServerUrl,
       });
 
       openDeleteClusterDialog({ cluster, config });
@@ -204,6 +208,8 @@ describe("<DeleteClusterDialog />", () => {
           clusterName: "minikube",
         },
         kubeConfigPath: "./temp-kube-config",
+      }, {
+        clusterServerUrl: nonCurrentClusterServerUrl,
       });
 
       openDeleteClusterDialog({ cluster, config });
@@ -221,6 +227,8 @@ describe("<DeleteClusterDialog />", () => {
           clusterName: "some-current-context-cluster",
         },
         kubeConfigPath: "./temp-kube-config",
+      }, {
+        clusterServerUrl: currentClusterServerUrl,
       });
 
       openDeleteClusterDialog({ cluster, config });
@@ -236,6 +244,8 @@ describe("<DeleteClusterDialog />", () => {
           clusterName: "some-current-context-cluster",
         },
         kubeConfigPath: "./temp-kube-config",
+      }, {
+        clusterServerUrl: currentClusterServerUrl,
       });
 
       openDeleteClusterDialog({ cluster, config });
@@ -259,12 +269,12 @@ describe("<DeleteClusterDialog />", () => {
       const cluster = createCluster({
         id: "some-non-current-context-cluster",
         contextName: "some-non-current-context",
-
         preferences: {
           clusterName: "some-non-current-context-cluster",
         },
-
         kubeConfigPath: "./temp-kube-config",
+      }, {
+        clusterServerUrl: nonCurrentClusterServerUrl,
       });
 
       const spy = jest.spyOn(cluster, "isInLocalKubeconfig").mockImplementation(() => true);
@@ -301,6 +311,8 @@ describe("<DeleteClusterDialog />", () => {
           clusterName: "some-cluster",
         },
         kubeConfigPath: "./temp-kube-config",
+      }, {
+        clusterServerUrl: singleClusterServerUrl,
       });
 
       openDeleteClusterDialog({ cluster, config });