diff --git a/plugins/org/package.json b/plugins/org/package.json
index 08d8f4bf9a..be270ff041 100644
--- a/plugins/org/package.json
+++ b/plugins/org/package.json
@@ -28,7 +28,6 @@
     "clean": "backstage-cli package clean"
   },
   "dependencies": {
-    "@backstage/catalog-client": "workspace:^",
     "@backstage/catalog-model": "workspace:^",
     "@backstage/core-components": "workspace:^",
     "@backstage/core-plugin-api": "workspace:^",
@@ -48,6 +47,7 @@
     "react-router-dom": "6.0.0-beta.0 || ^6.3.0"
   },
   "devDependencies": {
+    "@backstage/catalog-client": "workspace:^",
     "@backstage/cli": "workspace:^",
     "@backstage/core-app-api": "workspace:^",
     "@backstage/dev-utils": "workspace:^",
diff --git a/plugins/org/src/test-helpers/catalogMocks.ts b/plugins/org/src/__testUtils__/catalogMocks.ts
similarity index 100%
rename from plugins/org/src/test-helpers/catalogMocks.ts
rename to plugins/org/src/__testUtils__/catalogMocks.ts
diff --git a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.stories.tsx b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.stories.tsx
index ec5718349d..a52752057b 100644
--- a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.stories.tsx
+++ b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.stories.tsx
@@ -23,7 +23,7 @@ import { MemoryRouter } from 'react-router-dom';
 import {
   groupA,
   mockedCatalogApiSupportingGroups,
-} from '../../../../test-helpers/catalogMocks';
+} from '../../../../__testUtils__/catalogMocks';
 import { MembersListCard } from './MembersListCard';
 
 export default {
diff --git a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.test.tsx b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.test.tsx
index fa823e1678..47e954eb17 100644
--- a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.test.tsx
+++ b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.test.tsx
@@ -33,7 +33,7 @@ import { MembersListCard } from './MembersListCard';
 import {
   groupA,
   mockedCatalogApiSupportingGroups,
-} from '../../../../test-helpers/catalogMocks';
+} from '../../../../__testUtils__/catalogMocks';
 import { permissionApiRef } from '@backstage/plugin-permission-react';
 import { EntityLayout } from '@backstage/plugin-catalog';
 import { screen } from '@testing-library/react';
diff --git a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
index a27c9ab8ca..0283bf8588 100644
--- a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
+++ b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
@@ -167,7 +167,7 @@ export const MembersListCard = (props: {
         groupEntity,
         catalogApi,
       );
-    }, [catalogApi, groupEntity]);
+    }, [catalogApi, groupEntity, showAggregateMembersToggle]);
   const {
     loading,
     error,
diff --git a/plugins/org/src/helpers/helpers.test.ts b/plugins/org/src/helpers/helpers.test.ts
index 714371d83d..4cee5422ce 100644
--- a/plugins/org/src/helpers/helpers.test.ts
+++ b/plugins/org/src/helpers/helpers.test.ts
@@ -38,7 +38,7 @@ import {
   groupEUserOne,
   duplicatedUser,
   mockedCatalogApiSupportingGroups,
-} from '../test-helpers/catalogMocks';
+} from '../__testUtils__/catalogMocks';
 
 describe('Helper functions', () => {
   it('getAllDesendantMembersForGroupEntity correctly recursively returns all descendant members', async () => {