diff --git a/apps/api/src/modules/groups/groups.controller.spec.ts b/apps/api/src/modules/groups/groups.controller.spec.ts
index fa81063..6e3770a 100644
--- a/apps/api/src/modules/groups/groups.controller.spec.ts
+++ b/apps/api/src/modules/groups/groups.controller.spec.ts
@@ -10,6 +10,10 @@ const mockService = { list: jest.fn().mockResolvedValue(mockGroups) };
 describe('GroupsController', () => {
   let controller: GroupsController;
 
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
       controllers: [GroupsController],
diff --git a/apps/api/src/modules/groups/groups.service.spec.ts b/apps/api/src/modules/groups/groups.service.spec.ts
index d7bdb1a..3fda63e 100644
--- a/apps/api/src/modules/groups/groups.service.spec.ts
+++ b/apps/api/src/modules/groups/groups.service.spec.ts
@@ -11,6 +11,10 @@ describe('GroupsService', () => {
   let service: GroupsService;
   const mockPrisma = { group: { findMany: jest.fn().mockResolvedValue(mockGroups) } };
 
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
       providers: [
diff --git a/apps/api/src/modules/groups/groups.service.ts b/apps/api/src/modules/groups/groups.service.ts
index 4720430..994c65b 100644
--- a/apps/api/src/modules/groups/groups.service.ts
+++ b/apps/api/src/modules/groups/groups.service.ts
@@ -1,11 +1,20 @@
 import { Injectable } from '@nestjs/common';
 import { PrismaService } from '../../prisma/prisma.service';
 
+interface GroupSummary {
+  id: string;
+  name: string;
+  platform: string;
+  platformId: string;
+  isActive: boolean;
+  accountId: string | null;
+}
+
 @Injectable()
 export class GroupsService {
   constructor(private readonly prisma: PrismaService) {}
 
-  list() {
+  list(): Promise<GroupSummary[]> {
     return this.prisma.group.findMany({
       orderBy: { name: 'asc' },
       select: { id: true, name: true, platform: true, platformId: true, isActive: true, accountId: true },