diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8bb26407..ced9c802 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,6 +30,34 @@ Theses are just some examples of the hidden costs that are not so apparent from
 
 * Do not open an issue on GitHub until you have collected positive feedback about the change. GitHub issues are primarily intended for bug reports and fixes.
 
+
+#### **How can i create my first contribution ?**
+
+- **Find an Issue:**
+  Start by finding an issue to work on. You can either create a new GitHub issue or pick one that has been assigned to you.
+
+- **Create a Branch:**
+  Create a new branch for your work. Use a descriptive name that reflects the issue or feature you're addressing (e.g., fix/login-bug or add/feature-x).
+
+- **Make Changes:**
+  Write or fix the code in your branch. Ensure your changes align with the project's coding standards and guidelines.
+
+- **Push Changes:**
+  Once your changes are ready, push your branch to GitHub.
+
+- **Open a Pull Request (PR):**
+  Create a pull request (PR) from your branch. Include a clear and concise description of your changes, explaining what the PR does and why it’s needed. Make sure to reference the related issue (e.g., "Fixes #123").
+  Note: At least two reviewers are required to approve the PR before it can be merged.
+
+- **Review Process:**
+  Team members will review your code, provide feedback, and suggest improvements. Be open to constructive criticism and ready to iterate on your work.
+
+- **Address Feedback:**
+  Make any necessary changes based on the feedback. Once you’ve addressed the comments, tag the reviewers to let them know your updates are ready for another review.
+
+- **Merge:**
+  Once your PR is approved by at least two reviewers, it will be merged into the main project. Congratulations, your code is now part of the project!
+
 #### **Do you have questions about the source code?**
 
 * Ask any question about how to use Hexabot in our [Discord Channel](https://discord.gg/rNb9t2MFkG).
diff --git a/api/src/analytics/controllers/bot-stats.controller.spec.ts b/api/src/analytics/controllers/bot-stats.controller.spec.ts
index 636c3aef..c5b2456a 100644
--- a/api/src/analytics/controllers/bot-stats.controller.spec.ts
+++ b/api/src/analytics/controllers/bot-stats.controller.spec.ts
@@ -1,16 +1,13 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
-import { LoggerService } from '@/logger/logger.service';
 import {
   botstatsFixtures,
   installBotStatsFixtures,
@@ -19,6 +16,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { BotStatsRepository } from '../repositories/bot-stats.repository';
 import { BotStatsModel, BotStatsType } from '../schemas/bot-stats.schema';
@@ -30,25 +28,18 @@ describe('BotStatsController', () => {
   let botStatsController: BotStatsController;
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       controllers: [BotStatsController],
       imports: [
         rootMongooseTestModule(installBotStatsFixtures),
         MongooseModule.forFeature([BotStatsModel]),
       ],
-      providers: [
-        LoggerService,
-        BotStatsService,
-        BotStatsRepository,
-        EventEmitter2,
-      ],
-    }).compile();
-    botStatsController = module.get<BotStatsController>(BotStatsController);
+      providers: [BotStatsService, BotStatsRepository],
+    });
+    [botStatsController] = await getMocks([BotStatsController]);
   });
 
-  afterAll(async () => {
-    await closeInMongodConnection();
-  });
+  afterAll(closeInMongodConnection);
 
   afterEach(jest.clearAllMocks);
 
diff --git a/api/src/analytics/repositories/bot-stats.repository.spec.ts b/api/src/analytics/repositories/bot-stats.repository.spec.ts
index 76f1606a..87373ee5 100644
--- a/api/src/analytics/repositories/bot-stats.repository.spec.ts
+++ b/api/src/analytics/repositories/bot-stats.repository.spec.ts
@@ -1,17 +1,14 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
-import { MongooseModule, getModelToken } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
+import { getModelToken, MongooseModule } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
-import { LoggerService } from '@/logger/logger.service';
 import {
   botstatsFixtures,
   installBotStatsFixtures,
@@ -20,6 +17,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import {
   BotStats,
@@ -34,20 +32,20 @@ describe('BotStatsRepository', () => {
   let botStatsModel: Model<BotStats>;
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installBotStatsFixtures),
         MongooseModule.forFeature([BotStatsModel]),
       ],
-      providers: [LoggerService, BotStatsRepository, EventEmitter2],
-    }).compile();
-    botStatsRepository = module.get<BotStatsRepository>(BotStatsRepository);
-    botStatsModel = module.get<Model<BotStats>>(getModelToken('BotStats'));
+      providers: [BotStatsRepository],
+    });
+    [botStatsRepository, botStatsModel] = await getMocks([
+      BotStatsRepository,
+      getModelToken(BotStats.name),
+    ]);
   });
 
-  afterAll(async () => {
-    await closeInMongodConnection();
-  });
+  afterAll(closeInMongodConnection);
 
   afterEach(jest.clearAllMocks);
 
diff --git a/api/src/analytics/repositories/bot-stats.repository.ts b/api/src/analytics/repositories/bot-stats.repository.ts
index 4c6f7c86..d8ee3221 100644
--- a/api/src/analytics/repositories/bot-stats.repository.ts
+++ b/api/src/analytics/repositories/bot-stats.repository.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,7 +7,6 @@
  */
 
 import { Injectable } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
@@ -17,11 +16,8 @@ import { BotStats, BotStatsType } from '../schemas/bot-stats.schema';
 
 @Injectable()
 export class BotStatsRepository extends BaseRepository<BotStats> {
-  constructor(
-    readonly eventEmitter: EventEmitter2,
-    @InjectModel(BotStats.name) readonly model: Model<BotStats>,
-  ) {
-    super(eventEmitter, model, BotStats);
+  constructor(@InjectModel(BotStats.name) readonly model: Model<BotStats>) {
+    super(model, BotStats);
   }
 
   /**
diff --git a/api/src/analytics/services/bot-stats.service.spec.ts b/api/src/analytics/services/bot-stats.service.spec.ts
index 1d320848..7af66b9e 100644
--- a/api/src/analytics/services/bot-stats.service.spec.ts
+++ b/api/src/analytics/services/bot-stats.service.spec.ts
@@ -1,16 +1,13 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
-import { LoggerService } from '@/logger/logger.service';
 import {
   botstatsFixtures,
   installBotStatsFixtures,
@@ -19,6 +16,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { BotStatsRepository } from '../repositories/bot-stats.repository';
 import { BotStatsModel, BotStatsType } from '../schemas/bot-stats.schema';
@@ -29,24 +27,17 @@ describe('BotStatsService', () => {
   let botStatsService: BotStatsService;
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installBotStatsFixtures),
         MongooseModule.forFeature([BotStatsModel]),
       ],
-      providers: [
-        LoggerService,
-        BotStatsService,
-        BotStatsRepository,
-        EventEmitter2,
-      ],
-    }).compile();
-    botStatsService = module.get<BotStatsService>(BotStatsService);
+      providers: [BotStatsService, BotStatsRepository],
+    });
+    [botStatsService] = await getMocks([BotStatsService]);
   });
 
-  afterAll(async () => {
-    await closeInMongodConnection();
-  });
+  afterAll(closeInMongodConnection);
 
   afterEach(jest.clearAllMocks);
 
diff --git a/api/src/analytics/services/bot-stats.service.ts b/api/src/analytics/services/bot-stats.service.ts
index 2b319a66..4d87f64b 100644
--- a/api/src/analytics/services/bot-stats.service.ts
+++ b/api/src/analytics/services/bot-stats.service.ts
@@ -7,11 +7,10 @@
  */
 
 import { Injectable } from '@nestjs/common';
-import { EventEmitter2, OnEvent } from '@nestjs/event-emitter';
+import { OnEvent } from '@nestjs/event-emitter';
 
 import { Subscriber } from '@/chat/schemas/subscriber.schema';
 import { config } from '@/config';
-import { LoggerService } from '@/logger/logger.service';
 import { BaseService } from '@/utils/generics/base-service';
 
 import { BotStatsRepository } from '../repositories/bot-stats.repository';
@@ -19,11 +18,7 @@ import { BotStats, BotStatsType } from '../schemas/bot-stats.schema';
 
 @Injectable()
 export class BotStatsService extends BaseService<BotStats> {
-  constructor(
-    readonly repository: BotStatsRepository,
-    private readonly eventEmitter: EventEmitter2,
-    private readonly logger: LoggerService,
-  ) {
+  constructor(readonly repository: BotStatsRepository) {
     super(repository);
   }
 
@@ -98,8 +93,9 @@ export class BotStatsService extends BaseService<BotStats> {
     ) {
       this.eventEmitter.emit(
         'hook:stats:entry',
-        'retention',
+        BotStatsType.retention,
         'Retentioned users',
+        subscriber,
       );
     }
   }
@@ -111,7 +107,11 @@ export class BotStatsService extends BaseService<BotStats> {
    * @param name - The name or identifier of the statistics entry (e.g., a specific feature or component being tracked).
    */
   @OnEvent('hook:stats:entry')
-  async handleStatEntry(type: BotStatsType, name: string): Promise<void> {
+  async handleStatEntry(
+    type: BotStatsType,
+    name: string,
+    _subscriber: Subscriber,
+  ): Promise<void> {
     const day = new Date();
     day.setMilliseconds(0);
     day.setSeconds(0);
diff --git a/api/src/app.controller.ts b/api/src/app.controller.ts
index c8e9dd4f..305d9b1f 100644
--- a/api/src/app.controller.ts
+++ b/api/src/app.controller.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -13,15 +13,11 @@ import { Request } from 'express';
 import { Session as ExpressSession } from 'express-session';
 
 import { AppService } from './app.service';
-import { LoggerService } from './logger/logger.service';
 import { Roles } from './utils/decorators/roles.decorator';
 
 @Controller()
 export class AppController {
-  constructor(
-    private readonly appService: AppService,
-    private readonly logger: LoggerService,
-  ) {}
+  constructor(private readonly appService: AppService) {}
 
   @Roles('public')
   @Get()
diff --git a/api/src/app.module.ts b/api/src/app.module.ts
index 86c35c44..72465eb3 100644
--- a/api/src/app.module.ts
+++ b/api/src/app.module.ts
@@ -35,6 +35,7 @@ import { ChannelModule } from './channel/channel.module';
 import { ChatModule } from './chat/chat.module';
 import { CmsModule } from './cms/cms.module';
 import { config } from './config';
+import { ExtensionModule } from './extension/extension.module';
 import extraModules from './extra';
 import { HelperModule } from './helper/helper.module';
 import { I18nModule } from './i18n/i18n.module';
@@ -152,6 +153,7 @@ const i18nOptions: I18nOptions = {
           max: config.cache.max,
         }),
     MigrationModule,
+    ExtensionModule,
     ...extraModules,
   ],
   controllers: [AppController],
diff --git a/api/src/attachment/controllers/attachment.controller.spec.ts b/api/src/attachment/controllers/attachment.controller.spec.ts
index eb13cdb1..d2f22a04 100644
--- a/api/src/attachment/controllers/attachment.controller.spec.ts
+++ b/api/src/attachment/controllers/attachment.controller.spec.ts
@@ -11,9 +11,7 @@ import fs from 'fs';
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
 import { BadRequestException } from '@nestjs/common/exceptions';
 import { NotFoundException } from '@nestjs/common/exceptions/not-found.exception';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 import { Request } from 'express';
 
 import LocalStorageHelper from '@/extensions/helpers/local-storage/index.helper';
@@ -40,6 +38,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { attachment, attachmentFile } from '../mocks/attachment.mock';
 import { AttachmentRepository } from '../repositories/attachment.repository';
@@ -59,10 +58,9 @@ describe('AttachmentController', () => {
   let attachmentToDelete: Attachment;
   let helperService: HelperService;
   let settingService: SettingService;
-  let loggerService: LoggerService;
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks, resolveMocks } = await buildTestingMocks({
       controllers: [AttachmentController],
       imports: [
         rootMongooseTestModule(async () => {
@@ -84,8 +82,6 @@ describe('AttachmentController', () => {
         SettingRepository,
         ModelService,
         ModelRepository,
-        LoggerService,
-        EventEmitter2,
         SettingSeeder,
         SettingService,
         HelperService,
@@ -98,18 +94,20 @@ describe('AttachmentController', () => {
           },
         },
       ],
-    }).compile();
-    attachmentController =
-      module.get<AttachmentController>(AttachmentController);
-    attachmentService = module.get<AttachmentService>(AttachmentService);
+    });
+    [attachmentController, attachmentService, helperService, settingService] =
+      await getMocks([
+        AttachmentController,
+        AttachmentService,
+        HelperService,
+        SettingService,
+      ]);
+    const [loggerService] = await resolveMocks([LoggerService]);
+
     attachmentToDelete = (await attachmentService.findOne({
       name: 'store1.jpg',
     }))!;
 
-    helperService = module.get<HelperService>(HelperService);
-    settingService = module.get<SettingService>(SettingService);
-    loggerService = await module.resolve<LoggerService>(LoggerService);
-
     helperService.register(
       new LocalStorageHelper(settingService, helperService, loggerService),
     );
diff --git a/api/src/attachment/controllers/attachment.controller.ts b/api/src/attachment/controllers/attachment.controller.ts
index 8f794e03..44cbe661 100644
--- a/api/src/attachment/controllers/attachment.controller.ts
+++ b/api/src/attachment/controllers/attachment.controller.ts
@@ -30,7 +30,6 @@ import { diskStorage, memoryStorage } from 'multer';
 
 import { config } from '@/config';
 import { CsrfInterceptor } from '@/interceptors/csrf.interceptor';
-import { LoggerService } from '@/logger/logger.service';
 import { Roles } from '@/utils/decorators/roles.decorator';
 import { BaseController } from '@/utils/generics/base-controller';
 import { DeleteResult } from '@/utils/generics/base-repository';
@@ -52,10 +51,7 @@ import { AttachmentAccess, AttachmentCreatedByRef } from '../types';
 @Controller('attachment')
 @UseGuards(AttachmentGuard)
 export class AttachmentController extends BaseController<Attachment> {
-  constructor(
-    private readonly attachmentService: AttachmentService,
-    private readonly logger: LoggerService,
-  ) {
+  constructor(private readonly attachmentService: AttachmentService) {
     super(attachmentService);
   }
 
diff --git a/api/src/attachment/guards/attachment-ability.guard.spec.ts b/api/src/attachment/guards/attachment-ability.guard.spec.ts
index 395163ae..3629d26c 100644
--- a/api/src/attachment/guards/attachment-ability.guard.spec.ts
+++ b/api/src/attachment/guards/attachment-ability.guard.spec.ts
@@ -7,13 +7,13 @@
  */
 
 import { BadRequestException, ExecutionContext } from '@nestjs/common';
-import { Test, TestingModule } from '@nestjs/testing';
 
 import { Model } from '@/user/schemas/model.schema';
 import { Permission } from '@/user/schemas/permission.schema';
 import { ModelService } from '@/user/services/model.service';
 import { PermissionService } from '@/user/services/permission.service';
 import { Action } from '@/user/types/action.type';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { attachment } from '../mocks/attachment.mock';
 import { Attachment } from '../schemas/attachment.schema';
@@ -29,7 +29,7 @@ describe('AttachmentGuard', () => {
   let attachmentService: AttachmentService;
 
   beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       providers: [
         AttachmentGuard,
         {
@@ -45,12 +45,15 @@ describe('AttachmentGuard', () => {
           useValue: { findOne: jest.fn() },
         },
       ],
-    }).compile();
+    });
 
-    guard = module.get<AttachmentGuard>(AttachmentGuard);
-    permissionService = module.get<PermissionService>(PermissionService);
-    modelService = module.get<ModelService>(ModelService);
-    attachmentService = module.get<AttachmentService>(AttachmentService);
+    [guard, permissionService, modelService, attachmentService] =
+      await getMocks([
+        AttachmentGuard,
+        PermissionService,
+        ModelService,
+        AttachmentService,
+      ]);
   });
 
   describe('canActivate', () => {
diff --git a/api/src/attachment/repositories/attachment.repository.ts b/api/src/attachment/repositories/attachment.repository.ts
index a686cd43..005b9f24 100644
--- a/api/src/attachment/repositories/attachment.repository.ts
+++ b/api/src/attachment/repositories/attachment.repository.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,7 +7,6 @@
  */
 
 import { Injectable } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
@@ -17,10 +16,7 @@ import { Attachment } from '../schemas/attachment.schema';
 
 @Injectable()
 export class AttachmentRepository extends BaseRepository<Attachment, never> {
-  constructor(
-    readonly eventEmitter: EventEmitter2,
-    @InjectModel(Attachment.name) readonly model: Model<Attachment>,
-  ) {
-    super(eventEmitter, model, Attachment);
+  constructor(@InjectModel(Attachment.name) readonly model: Model<Attachment>) {
+    super(model, Attachment);
   }
 }
diff --git a/api/src/attachment/services/attachment.service.ts b/api/src/attachment/services/attachment.service.ts
index bf0674f1..fc7cf231 100644
--- a/api/src/attachment/services/attachment.service.ts
+++ b/api/src/attachment/services/attachment.service.ts
@@ -12,7 +12,6 @@ import { Injectable, Optional, StreamableFile } from '@nestjs/common';
 
 import { HelperService } from '@/helper/helper.service';
 import { HelperType } from '@/helper/types';
-import { LoggerService } from '@/logger/logger.service';
 import { BaseService } from '@/utils/generics/base-service';
 
 import { AttachmentMetadataDto } from '../dto/attachment.dto';
@@ -23,7 +22,6 @@ import { Attachment } from '../schemas/attachment.schema';
 export class AttachmentService extends BaseService<Attachment> {
   constructor(
     readonly repository: AttachmentRepository,
-    private readonly logger: LoggerService,
     @Optional() private readonly helperService: HelperService,
   ) {
     super(repository);
diff --git a/api/src/chat/controllers/block.controller.spec.ts b/api/src/chat/controllers/block.controller.spec.ts
index 74e73021..24945c3d 100644
--- a/api/src/chat/controllers/block.controller.spec.ts
+++ b/api/src/chat/controllers/block.controller.spec.ts
@@ -8,9 +8,7 @@
 
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
 import { NotFoundException } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test } from '@nestjs/testing';
 
 import { AttachmentRepository } from '@/attachment/repositories/attachment.repository';
 import { AttachmentModel } from '@/attachment/schemas/attachment.schema';
@@ -22,7 +20,6 @@ import { LanguageRepository } from '@/i18n/repositories/language.repository';
 import { LanguageModel } from '@/i18n/schemas/language.schema';
 import { I18nService } from '@/i18n/services/i18n.service';
 import { LanguageService } from '@/i18n/services/language.service';
-import { LoggerService } from '@/logger/logger.service';
 import { PluginService } from '@/plugins/plugins.service';
 import { SettingService } from '@/setting/services/setting.service';
 import { InvitationRepository } from '@/user/repositories/invitation.repository';
@@ -46,6 +43,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { BlockCreateDto, BlockUpdateDto } from '../dto/block.dto';
 import { BlockRepository } from '../repositories/block.repository';
@@ -53,6 +51,7 @@ import { CategoryRepository } from '../repositories/category.repository';
 import { LabelRepository } from '../repositories/label.repository';
 import { Block, BlockModel } from '../schemas/block.schema';
 import { LabelModel } from '../schemas/label.schema';
+import { PayloadType } from '../schemas/types/button';
 import { BlockService } from '../services/block.service';
 import { CategoryService } from '../services/category.service';
 import { LabelService } from '../services/label.service';
@@ -79,7 +78,7 @@ describe('BlockController', () => {
   ];
 
   beforeAll(async () => {
-    const module = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       controllers: [BlockController],
       imports: [
         rootMongooseTestModule(installBlockFixtures),
@@ -117,7 +116,6 @@ describe('BlockController', () => {
         PermissionService,
         LanguageService,
         PluginService,
-        LoggerService,
         {
           provide: I18nService,
           useValue: {
@@ -133,7 +131,6 @@ describe('BlockController', () => {
             getSettings: jest.fn(() => ({})),
           },
         },
-        EventEmitter2,
         {
           provide: CACHE_MANAGER,
           useValue: {
@@ -143,10 +140,12 @@ describe('BlockController', () => {
           },
         },
       ],
-    }).compile();
-    blockController = module.get<BlockController>(BlockController);
-    blockService = module.get<BlockService>(BlockService);
-    categoryService = module.get<CategoryService>(CategoryService);
+    });
+    [blockController, blockService, categoryService] = await getMocks([
+      BlockController,
+      BlockService,
+      CategoryService,
+    ]);
     category = (await categoryService.findOne({ label: 'default' }))!;
     block = (await blockService.findOne({ name: 'first' }))!;
     blockToDelete = (await blockService.findOne({ name: 'buttons' }))!;
@@ -336,4 +335,56 @@ describe('BlockController', () => {
       ).rejects.toThrow(getUpdateOneError(Block.name, blockToDelete.id));
     });
   });
+
+  it('should update block trigger to postback menu', async () => {
+    jest.spyOn(blockService, 'updateOne');
+    const updateBlock: BlockUpdateDto = {
+      patterns: [
+        {
+          label: 'postback123',
+          value: 'postback123',
+          type: PayloadType.menu,
+        },
+      ],
+    };
+    const result = await blockController.updateOne(block.id, updateBlock);
+    expect(blockService.updateOne).toHaveBeenCalledWith(block.id, updateBlock);
+
+    expect(
+      result.patterns.find(
+        (pattern) =>
+          typeof pattern === 'object' &&
+          'type' in pattern &&
+          pattern.type === PayloadType.menu &&
+          pattern,
+      ),
+    ).toBeDefined();
+    expect(result.patterns).toEqual(updateBlock.patterns);
+  });
+
+  it('should update the block trigger with a content payloadType payload', async () => {
+    jest.spyOn(blockService, 'updateOne');
+    const updateBlock: BlockUpdateDto = {
+      patterns: [
+        {
+          label: 'Content label',
+          value: 'Content value',
+          type: PayloadType.content,
+        },
+      ],
+    };
+    const result = await blockController.updateOne(block.id, updateBlock);
+    expect(blockService.updateOne).toHaveBeenCalledWith(block.id, updateBlock);
+
+    expect(
+      result.patterns.find(
+        (pattern) =>
+          typeof pattern === 'object' &&
+          'type' in pattern &&
+          pattern.type === PayloadType.content &&
+          pattern,
+      ),
+    ).toBeDefined();
+    expect(result.patterns).toEqual(updateBlock.patterns);
+  });
 });
diff --git a/api/src/chat/controllers/block.controller.ts b/api/src/chat/controllers/block.controller.ts
index 92b48823..4428e141 100644
--- a/api/src/chat/controllers/block.controller.ts
+++ b/api/src/chat/controllers/block.controller.ts
@@ -23,7 +23,6 @@ import {
 import { CsrfCheck } from '@tekuconcept/nestjs-csrf';
 
 import { CsrfInterceptor } from '@/interceptors/csrf.interceptor';
-import { LoggerService } from '@/logger/logger.service';
 import { BaseBlockPlugin } from '@/plugins/base-block-plugin';
 import { PluginService } from '@/plugins/plugins.service';
 import { PluginName, PluginType } from '@/plugins/types';
@@ -57,7 +56,6 @@ export class BlockController extends BaseController<
 > {
   constructor(
     private readonly blockService: BlockService,
-    private readonly logger: LoggerService,
     private readonly categoryService: CategoryService,
     private readonly labelService: LabelService,
     private readonly userService: UserService,
diff --git a/api/src/chat/controllers/category.contoller.spec.ts b/api/src/chat/controllers/category.contoller.spec.ts
index 6fd1966e..f8a8063b 100644
--- a/api/src/chat/controllers/category.contoller.spec.ts
+++ b/api/src/chat/controllers/category.contoller.spec.ts
@@ -7,9 +7,7 @@
  */
 
 import { BadRequestException, NotFoundException } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test } from '@nestjs/testing';
 
 import { AttachmentRepository } from '@/attachment/repositories/attachment.repository';
 import { AttachmentModel } from '@/attachment/schemas/attachment.schema';
@@ -18,7 +16,6 @@ import { ContentRepository } from '@/cms/repositories/content.repository';
 import { ContentModel } from '@/cms/schemas/content.schema';
 import { ContentService } from '@/cms/services/content.service';
 import { I18nService } from '@/i18n/services/i18n.service';
-import { LoggerService } from '@/logger/logger.service';
 import { PluginService } from '@/plugins/plugins.service';
 import { SettingService } from '@/setting/services/setting.service';
 import {
@@ -31,6 +28,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { CategoryCreateDto, CategoryUpdateDto } from '../dto/category.dto';
 import { BlockRepository } from '../repositories/block.repository';
@@ -50,7 +48,7 @@ describe('CategoryController', () => {
   let categoryToDelete: Category;
 
   beforeAll(async () => {
-    const module = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       controllers: [CategoryController],
       imports: [
         rootMongooseTestModule(installCategoryFixtures),
@@ -75,7 +73,6 @@ describe('CategoryController', () => {
           provide: PluginService,
           useValue: {},
         },
-        LoggerService,
         {
           provide: I18nService,
           useValue: {
@@ -97,11 +94,12 @@ describe('CategoryController', () => {
             findOne: jest.fn(),
           },
         },
-        EventEmitter2,
       ],
-    }).compile();
-    categoryService = module.get<CategoryService>(CategoryService);
-    categoryController = module.get<CategoryController>(CategoryController);
+    });
+    [categoryService, categoryController] = await getMocks([
+      CategoryService,
+      CategoryController,
+    ]);
     category = (await categoryService.findOne({
       label: 'test category 1',
     })) as Category;
@@ -111,6 +109,7 @@ describe('CategoryController', () => {
   });
 
   afterEach(jest.clearAllMocks);
+
   afterAll(closeInMongodConnection);
 
   describe('findPage', () => {
diff --git a/api/src/chat/controllers/category.controller.ts b/api/src/chat/controllers/category.controller.ts
index 3f3a49b6..9cb27cc5 100644
--- a/api/src/chat/controllers/category.controller.ts
+++ b/api/src/chat/controllers/category.controller.ts
@@ -23,7 +23,6 @@ import {
 import { CsrfCheck } from '@tekuconcept/nestjs-csrf';
 
 import { CsrfInterceptor } from '@/interceptors/csrf.interceptor';
-import { LoggerService } from '@/logger/logger.service';
 import { BaseController } from '@/utils/generics/base-controller';
 import { DeleteResult } from '@/utils/generics/base-repository';
 import { PageQueryDto } from '@/utils/pagination/pagination-query.dto';
@@ -38,10 +37,7 @@ import { CategoryService } from '../services/category.service';
 @UseInterceptors(CsrfInterceptor)
 @Controller('category')
 export class CategoryController extends BaseController<Category> {
-  constructor(
-    private readonly categoryService: CategoryService,
-    private readonly logger: LoggerService,
-  ) {
+  constructor(private readonly categoryService: CategoryService) {
     super(categoryService);
   }
 
diff --git a/api/src/chat/controllers/context-var.controller.spec.ts b/api/src/chat/controllers/context-var.controller.spec.ts
index 0f07f985..0ac9d023 100644
--- a/api/src/chat/controllers/context-var.controller.spec.ts
+++ b/api/src/chat/controllers/context-var.controller.spec.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,11 +7,8 @@
  */
 
 import { BadRequestException, NotFoundException } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test } from '@nestjs/testing';
 
-import { LoggerService } from '@/logger/logger.service';
 import { getUpdateOneError } from '@/utils/test/errors/messages';
 import {
   contextVarFixtures,
@@ -23,6 +20,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import {
   ContextVarCreateDto,
@@ -41,22 +39,18 @@ describe('ContextVarController', () => {
   let contextVarToDelete: ContextVar;
 
   beforeAll(async () => {
-    const module = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       controllers: [ContextVarController],
       imports: [
         rootMongooseTestModule(installContextVarFixtures),
         MongooseModule.forFeature([ContextVarModel]),
       ],
-      providers: [
-        LoggerService,
-        ContextVarService,
-        ContextVarRepository,
-        EventEmitter2,
-      ],
-    }).compile();
-    contextVarController =
-      module.get<ContextVarController>(ContextVarController);
-    contextVarService = module.get<ContextVarService>(ContextVarService);
+      providers: [ContextVarService, ContextVarRepository],
+    });
+    [contextVarController, contextVarService] = await getMocks([
+      ContextVarController,
+      ContextVarService,
+    ]);
     contextVar = (await contextVarService.findOne({
       label: 'test context var 1',
     }))!;
diff --git a/api/src/chat/controllers/context-var.controller.ts b/api/src/chat/controllers/context-var.controller.ts
index 1d16f92c..52358b4e 100644
--- a/api/src/chat/controllers/context-var.controller.ts
+++ b/api/src/chat/controllers/context-var.controller.ts
@@ -23,7 +23,6 @@ import {
 import { CsrfCheck } from '@tekuconcept/nestjs-csrf';
 
 import { CsrfInterceptor } from '@/interceptors/csrf.interceptor';
-import { LoggerService } from '@/logger/logger.service';
 import { BaseController } from '@/utils/generics/base-controller';
 import { DeleteResult } from '@/utils/generics/base-repository';
 import { PageQueryDto } from '@/utils/pagination/pagination-query.dto';
@@ -41,10 +40,7 @@ import { ContextVarService } from '../services/context-var.service';
 @UseInterceptors(CsrfInterceptor)
 @Controller('contextvar')
 export class ContextVarController extends BaseController<ContextVar> {
-  constructor(
-    private readonly contextVarService: ContextVarService,
-    private readonly logger: LoggerService,
-  ) {
+  constructor(private readonly contextVarService: ContextVarService) {
     super(contextVarService);
   }
 
diff --git a/api/src/chat/controllers/label.controller.spec.ts b/api/src/chat/controllers/label.controller.spec.ts
index 56e0fd34..1136cf40 100644
--- a/api/src/chat/controllers/label.controller.spec.ts
+++ b/api/src/chat/controllers/label.controller.spec.ts
@@ -7,14 +7,11 @@
  */
 
 import { BadRequestException, NotFoundException } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test } from '@nestjs/testing';
 
 import { AttachmentRepository } from '@/attachment/repositories/attachment.repository';
 import { AttachmentModel } from '@/attachment/schemas/attachment.schema';
 import { AttachmentService } from '@/attachment/services/attachment.service';
-import { LoggerService } from '@/logger/logger.service';
 import { InvitationRepository } from '@/user/repositories/invitation.repository';
 import { RoleRepository } from '@/user/repositories/role.repository';
 import { UserRepository } from '@/user/repositories/user.repository';
@@ -35,6 +32,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { LabelCreateDto, LabelUpdateDto } from '../dto/label.dto';
 import { LabelRepository } from '../repositories/label.repository';
@@ -55,7 +53,7 @@ describe('LabelController', () => {
   let subscriberService: SubscriberService;
 
   beforeAll(async () => {
-    const module = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       controllers: [LabelController],
       imports: [
         rootMongooseTestModule(installSubscriberFixtures),
@@ -70,7 +68,6 @@ describe('LabelController', () => {
         ]),
       ],
       providers: [
-        LoggerService,
         LabelController,
         LabelService,
         LabelRepository,
@@ -81,14 +78,15 @@ describe('LabelController', () => {
         InvitationRepository,
         SubscriberService,
         SubscriberRepository,
-        EventEmitter2,
         AttachmentService,
         AttachmentRepository,
       ],
-    }).compile();
-    labelService = module.get<LabelService>(LabelService);
-    subscriberService = module.get<SubscriberService>(SubscriberService);
-    labelController = module.get<LabelController>(LabelController);
+    });
+    [labelService, subscriberService, labelController] = await getMocks([
+      LabelService,
+      SubscriberService,
+      LabelController,
+    ]);
     label = (await labelService.findOne({ name: 'TEST_TITLE_1' })) as Label;
     labelToDelete = (await labelService.findOne({
       name: 'TEST_TITLE_2',
diff --git a/api/src/chat/controllers/label.controller.ts b/api/src/chat/controllers/label.controller.ts
index 976d9c0c..791599af 100644
--- a/api/src/chat/controllers/label.controller.ts
+++ b/api/src/chat/controllers/label.controller.ts
@@ -23,7 +23,6 @@ import {
 import { CsrfCheck } from '@tekuconcept/nestjs-csrf';
 
 import { CsrfInterceptor } from '@/interceptors/csrf.interceptor';
-import { LoggerService } from '@/logger/logger.service';
 import { BaseController } from '@/utils/generics/base-controller';
 import { DeleteResult } from '@/utils/generics/base-repository';
 import { PageQueryDto } from '@/utils/pagination/pagination-query.dto';
@@ -49,10 +48,7 @@ export class LabelController extends BaseController<
   LabelPopulate,
   LabelFull
 > {
-  constructor(
-    private readonly labelService: LabelService,
-    private readonly logger: LoggerService,
-  ) {
+  constructor(private readonly labelService: LabelService) {
     super(labelService);
   }
 
diff --git a/api/src/chat/controllers/message.controller.spec.ts b/api/src/chat/controllers/message.controller.spec.ts
index fb506d9d..0bc9e2a5 100644
--- a/api/src/chat/controllers/message.controller.spec.ts
+++ b/api/src/chat/controllers/message.controller.spec.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,9 +7,7 @@
  */
 
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test } from '@nestjs/testing';
 
 import { AttachmentRepository } from '@/attachment/repositories/attachment.repository';
 import { AttachmentModel } from '@/attachment/schemas/attachment.schema';
@@ -19,7 +17,6 @@ import { MenuRepository } from '@/cms/repositories/menu.repository';
 import { MenuModel } from '@/cms/schemas/menu.schema';
 import { MenuService } from '@/cms/services/menu.service';
 import { I18nService } from '@/i18n/services/i18n.service';
-import { LoggerService } from '@/logger/logger.service';
 import { NlpService } from '@/nlp/services/nlp.service';
 import { SettingService } from '@/setting/services/setting.service';
 import { InvitationRepository } from '@/user/repositories/invitation.repository';
@@ -40,6 +37,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { MessageRepository } from '../repositories/message.repository';
 import { SubscriberRepository } from '../repositories/subscriber.repository';
@@ -64,7 +62,7 @@ describe('MessageController', () => {
   let allSubscribers: Subscriber[];
 
   beforeAll(async () => {
-    const module = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       controllers: [MessageController],
       imports: [
         rootMongooseTestModule(installMessageFixtures),
@@ -116,7 +114,6 @@ describe('MessageController', () => {
             getSettings: jest.fn(() => ({})),
           },
         },
-        EventEmitter2,
         {
           provide: CACHE_MANAGER,
           useValue: {
@@ -125,13 +122,15 @@ describe('MessageController', () => {
             set: jest.fn(),
           },
         },
-        LoggerService,
       ],
-    }).compile();
-    messageService = module.get<MessageService>(MessageService);
-    userService = module.get<UserService>(UserService);
-    subscriberService = module.get<SubscriberService>(SubscriberService);
-    messageController = module.get<MessageController>(MessageController);
+    });
+    [messageService, userService, subscriberService, messageController] =
+      await getMocks([
+        MessageService,
+        UserService,
+        SubscriberService,
+        MessageController,
+      ]);
     message = (await messageService.findOne({ mid: 'mid-1' }))!;
     sender = (await subscriberService.findOne(message.sender!))!;
     recipient = (await subscriberService.findOne(message.recipient!))!;
diff --git a/api/src/chat/controllers/message.controller.ts b/api/src/chat/controllers/message.controller.ts
index dda5430d..b75e6f84 100644
--- a/api/src/chat/controllers/message.controller.ts
+++ b/api/src/chat/controllers/message.controller.ts
@@ -18,14 +18,12 @@ import {
   Req,
   UseInterceptors,
 } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { CsrfCheck } from '@tekuconcept/nestjs-csrf';
 import { Request } from 'express'; // Import the Express request and response types
 
 import { ChannelService } from '@/channel/channel.service';
 import { GenericEventWrapper } from '@/channel/lib/EventWrapper';
 import { CsrfInterceptor } from '@/interceptors/csrf.interceptor';
-import { LoggerService } from '@/logger/logger.service';
 import { BaseController } from '@/utils/generics/base-controller';
 import { BaseSchema } from '@/utils/generics/base-schema';
 import { PageQueryDto } from '@/utils/pagination/pagination-query.dto';
@@ -65,8 +63,6 @@ export class MessageController extends BaseController<
     private readonly messageService: MessageService,
     private readonly subscriberService: SubscriberService,
     private readonly channelService: ChannelService,
-    private readonly logger: LoggerService,
-    private readonly eventEmitter: EventEmitter2,
   ) {
     super(messageService);
   }
@@ -168,7 +164,7 @@ export class MessageController extends BaseController<
         read: false,
         delivery: false,
       };
-      this.eventEmitter.emit('hook:chatbot:sent', sentMessage);
+      this.eventEmitter.emit('hook:chatbot:sent', sentMessage, event);
       return {
         success: true,
       };
diff --git a/api/src/chat/controllers/subscriber.controller.spec.ts b/api/src/chat/controllers/subscriber.controller.spec.ts
index 17d1020a..32361be8 100644
--- a/api/src/chat/controllers/subscriber.controller.spec.ts
+++ b/api/src/chat/controllers/subscriber.controller.spec.ts
@@ -1,19 +1,16 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test } from '@nestjs/testing';
 
 import { AttachmentRepository } from '@/attachment/repositories/attachment.repository';
 import { AttachmentModel } from '@/attachment/schemas/attachment.schema';
 import { AttachmentService } from '@/attachment/services/attachment.service';
-import { LoggerService } from '@/logger/logger.service';
 import { InvitationRepository } from '@/user/repositories/invitation.repository';
 import { RoleRepository } from '@/user/repositories/role.repository';
 import { UserRepository } from '@/user/repositories/user.repository';
@@ -32,6 +29,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 import { SocketEventDispatcherService } from '@/websocket/services/socket-event-dispatcher.service';
 import { WebsocketGateway } from '@/websocket/websocket.gateway';
 
@@ -56,7 +54,7 @@ describe('SubscriberController', () => {
   let allUsers: User[];
 
   beforeAll(async () => {
-    const module = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       controllers: [SubscriberController],
       imports: [
         rootMongooseTestModule(installSubscriberFixtures),
@@ -71,7 +69,6 @@ describe('SubscriberController', () => {
         ]),
       ],
       providers: [
-        LoggerService,
         SubscriberRepository,
         SubscriberService,
         LabelService,
@@ -83,17 +80,17 @@ describe('SubscriberController', () => {
         RoleService,
         RoleRepository,
         InvitationRepository,
-        EventEmitter2,
         AttachmentService,
         AttachmentRepository,
       ],
-    }).compile();
-    subscriberService = module.get<SubscriberService>(SubscriberService);
-    labelService = module.get<LabelService>(LabelService);
-    userService = module.get<UserService>(UserService);
-
-    subscriberController =
-      module.get<SubscriberController>(SubscriberController);
+    });
+    [subscriberService, labelService, userService, subscriberController] =
+      await getMocks([
+        SubscriberService,
+        LabelService,
+        UserService,
+        SubscriberController,
+      ]);
     subscriber = (await subscriberService.findOne({
       first_name: 'Jhon',
     }))!;
diff --git a/api/src/chat/controllers/subscriber.controller.ts b/api/src/chat/controllers/subscriber.controller.ts
index 69205952..e2c8ad46 100644
--- a/api/src/chat/controllers/subscriber.controller.ts
+++ b/api/src/chat/controllers/subscriber.controller.ts
@@ -21,7 +21,6 @@ import { CsrfCheck } from '@tekuconcept/nestjs-csrf';
 
 import { AttachmentService } from '@/attachment/services/attachment.service';
 import { CsrfInterceptor } from '@/interceptors/csrf.interceptor';
-import { LoggerService } from '@/logger/logger.service';
 import { BaseController } from '@/utils/generics/base-controller';
 import { generateInitialsAvatar } from '@/utils/helpers/avatar';
 import { PageQueryDto } from '@/utils/pagination/pagination-query.dto';
@@ -50,7 +49,6 @@ export class SubscriberController extends BaseController<
   constructor(
     private readonly subscriberService: SubscriberService,
     private readonly attachmentService: AttachmentService,
-    private readonly logger: LoggerService,
   ) {
     super(subscriberService);
   }
diff --git a/api/src/chat/repositories/block.repository.spec.ts b/api/src/chat/repositories/block.repository.spec.ts
index e37d7d62..7a799faf 100644
--- a/api/src/chat/repositories/block.repository.spec.ts
+++ b/api/src/chat/repositories/block.repository.spec.ts
@@ -1,14 +1,12 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule, getModelToken } from '@nestjs/mongoose';
-import { Test } from '@nestjs/testing';
 import { Model } from 'mongoose';
 
 import {
@@ -19,6 +17,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { Block, BlockModel } from '../schemas/block.schema';
 import { Category, CategoryModel } from '../schemas/category.schema';
@@ -39,16 +38,18 @@ describe('BlockRepository', () => {
   let blockValidIds: string[];
 
   beforeAll(async () => {
-    const module = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installBlockFixtures),
         MongooseModule.forFeature([BlockModel, CategoryModel, LabelModel]),
       ],
-      providers: [BlockRepository, CategoryRepository, EventEmitter2],
-    }).compile();
-    blockRepository = module.get<BlockRepository>(BlockRepository);
-    categoryRepository = module.get<CategoryRepository>(CategoryRepository);
-    blockModel = module.get<Model<Block>>(getModelToken('Block'));
+      providers: [BlockRepository, CategoryRepository],
+    });
+    [blockRepository, categoryRepository, blockModel] = await getMocks([
+      BlockRepository,
+      CategoryRepository,
+      getModelToken(Block.name),
+    ]);
     validIds = ['64abc1234def567890fedcba', '64abc1234def567890fedcbc'];
     validCategory = '64def5678abc123490fedcba';
 
diff --git a/api/src/chat/repositories/block.repository.ts b/api/src/chat/repositories/block.repository.ts
index c10f11c6..cb6c2616 100644
--- a/api/src/chat/repositories/block.repository.ts
+++ b/api/src/chat/repositories/block.repository.ts
@@ -6,8 +6,7 @@
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { Injectable, Optional } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
+import { Injectable } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
 import {
   Document,
@@ -18,7 +17,6 @@ import {
   UpdateWithAggregationPipeline,
 } from 'mongoose';
 
-import { LoggerService } from '@/logger/logger.service';
 import { BaseRepository, DeleteResult } from '@/utils/generics/base-repository';
 import { TFilterQuery } from '@/utils/types/filter.types';
 
@@ -37,12 +35,8 @@ export class BlockRepository extends BaseRepository<
   BlockFull,
   BlockDto
 > {
-  constructor(
-    readonly eventEmitter: EventEmitter2,
-    @InjectModel(Block.name) readonly model: Model<Block>,
-    @Optional() private readonly logger?: LoggerService,
-  ) {
-    super(eventEmitter, model, Block, BLOCK_POPULATE, BlockFull);
+  constructor(@InjectModel(Block.name) readonly model: Model<Block>) {
+    super(model, Block, BLOCK_POPULATE, BlockFull);
   }
 
   /**
diff --git a/api/src/chat/repositories/category.repository.ts b/api/src/chat/repositories/category.repository.ts
index d3e6a213..69a9974c 100644
--- a/api/src/chat/repositories/category.repository.ts
+++ b/api/src/chat/repositories/category.repository.ts
@@ -7,7 +7,6 @@
  */
 
 import { ForbiddenException, Injectable, Optional } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
 import { Document, Model, Query } from 'mongoose';
 
@@ -28,11 +27,10 @@ export class CategoryRepository extends BaseRepository<
   private readonly blockService: BlockService;
 
   constructor(
-    readonly eventEmitter: EventEmitter2,
     @InjectModel(Category.name) readonly model: Model<Category>,
     @Optional() blockService?: BlockService,
   ) {
-    super(eventEmitter, model, Category);
+    super(model, Category);
     this.blockService = blockService!;
   }
 
diff --git a/api/src/chat/repositories/context-var.repository.ts b/api/src/chat/repositories/context-var.repository.ts
index 3432351e..fe3f7e35 100644
--- a/api/src/chat/repositories/context-var.repository.ts
+++ b/api/src/chat/repositories/context-var.repository.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -12,7 +12,6 @@ import {
   NotFoundException,
   Optional,
 } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
 import { Document, Model, Query } from 'mongoose';
 
@@ -33,11 +32,10 @@ export class ContextVarRepository extends BaseRepository<
   private readonly blockService: BlockService;
 
   constructor(
-    readonly eventEmitter: EventEmitter2,
     @InjectModel(ContextVar.name) readonly model: Model<ContextVar>,
     @Optional() blockService?: BlockService,
   ) {
-    super(eventEmitter, model, ContextVar);
+    super(model, ContextVar);
     if (blockService) this.blockService = blockService;
   }
 
diff --git a/api/src/chat/repositories/conversation.repository.ts b/api/src/chat/repositories/conversation.repository.ts
index c17c9c62..62cfbf59 100644
--- a/api/src/chat/repositories/conversation.repository.ts
+++ b/api/src/chat/repositories/conversation.repository.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,7 +7,6 @@
  */
 
 import { Injectable } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
@@ -29,16 +28,9 @@ export class ConversationRepository extends BaseRepository<
   ConversationDto
 > {
   constructor(
-    readonly eventEmitter: EventEmitter2,
     @InjectModel(Conversation.name) readonly model: Model<Conversation>,
   ) {
-    super(
-      eventEmitter,
-      model,
-      Conversation,
-      CONVERSATION_POPULATE,
-      ConversationFull,
-    );
+    super(model, Conversation, CONVERSATION_POPULATE, ConversationFull);
   }
 
   /**
diff --git a/api/src/chat/repositories/label.repository.spec.ts b/api/src/chat/repositories/label.repository.spec.ts
index cd3d3ab5..a04eb2bc 100644
--- a/api/src/chat/repositories/label.repository.spec.ts
+++ b/api/src/chat/repositories/label.repository.spec.ts
@@ -6,12 +6,9 @@
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule, getModelToken } from '@nestjs/mongoose';
-import { Test } from '@nestjs/testing';
 import { Model } from 'mongoose';
 
-import { LoggerService } from '@/logger/logger.service';
 import { labelFixtures } from '@/utils/test/fixtures/label';
 import { installSubscriberFixtures } from '@/utils/test/fixtures/subscriber';
 import { getPageQuery } from '@/utils/test/pagination';
@@ -20,6 +17,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { Label, LabelFull, LabelModel } from '../schemas/label.schema';
 import { Subscriber, SubscriberModel } from '../schemas/subscriber.schema';
@@ -34,22 +32,18 @@ describe('LabelRepository', () => {
   let users: Subscriber[];
 
   beforeAll(async () => {
-    const module = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installSubscriberFixtures),
         MongooseModule.forFeature([LabelModel, SubscriberModel]),
       ],
-      providers: [
-        LabelRepository,
-        SubscriberRepository,
-        EventEmitter2,
-        LoggerService,
-      ],
-    }).compile();
-    labelRepository = module.get<LabelRepository>(LabelRepository);
-    subscriberRepository =
-      module.get<SubscriberRepository>(SubscriberRepository);
-    labelModel = module.get<Model<Label>>(getModelToken('Label'));
+      providers: [LabelRepository, SubscriberRepository],
+    });
+    [labelRepository, subscriberRepository, labelModel] = await getMocks([
+      LabelRepository,
+      SubscriberRepository,
+      getModelToken(Label.name),
+    ]);
     users = await subscriberRepository.findAll();
   });
 
diff --git a/api/src/chat/repositories/label.repository.ts b/api/src/chat/repositories/label.repository.ts
index af7af401..bf5bcdd7 100644
--- a/api/src/chat/repositories/label.repository.ts
+++ b/api/src/chat/repositories/label.repository.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,7 +7,6 @@
  */
 
 import { Injectable } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
 import { Document, Model, Query } from 'mongoose';
 
@@ -30,11 +29,8 @@ export class LabelRepository extends BaseRepository<
   LabelFull,
   LabelDto
 > {
-  constructor(
-    readonly eventEmitter: EventEmitter2,
-    @InjectModel(Label.name) readonly model: Model<Label>,
-  ) {
-    super(eventEmitter, model, Label, LABEL_POPULATE, LabelFull);
+  constructor(@InjectModel(Label.name) readonly model: Model<Label>) {
+    super(model, Label, LABEL_POPULATE, LabelFull);
   }
 
   /**
diff --git a/api/src/chat/repositories/message.repository.spec.ts b/api/src/chat/repositories/message.repository.spec.ts
index f817f2a9..784df2cd 100644
--- a/api/src/chat/repositories/message.repository.spec.ts
+++ b/api/src/chat/repositories/message.repository.spec.ts
@@ -1,14 +1,12 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule, getModelToken } from '@nestjs/mongoose';
-import { Test } from '@nestjs/testing';
 import { Model } from 'mongoose';
 
 import { UserRepository } from '@/user/repositories/user.repository';
@@ -22,6 +20,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { Message, MessageModel } from '../schemas/message.schema';
 import { SubscriberModel } from '../schemas/subscriber.schema';
@@ -37,23 +36,20 @@ describe('MessageRepository', () => {
   let messageModel: Model<Message>;
 
   beforeAll(async () => {
-    const testModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installMessageFixtures),
         MongooseModule.forFeature([MessageModel, SubscriberModel, UserModel]),
       ],
-      providers: [
+      providers: [MessageRepository, SubscriberRepository, UserRepository],
+    });
+    [messageRepository, userRepository, subscriberRepository, messageModel] =
+      await getMocks([
         MessageRepository,
-        SubscriberRepository,
         UserRepository,
-        EventEmitter2,
-      ],
-    }).compile();
-    messageRepository = testModule.get<MessageRepository>(MessageRepository);
-    userRepository = testModule.get<UserRepository>(UserRepository);
-    subscriberRepository =
-      testModule.get<SubscriberRepository>(SubscriberRepository);
-    messageModel = testModule.get<Model<Message>>(getModelToken('Message'));
+        SubscriberRepository,
+        getModelToken(Message.name),
+      ]);
   });
 
   afterEach(jest.clearAllMocks);
diff --git a/api/src/chat/repositories/message.repository.ts b/api/src/chat/repositories/message.repository.ts
index 72fbe300..a184a907 100644
--- a/api/src/chat/repositories/message.repository.ts
+++ b/api/src/chat/repositories/message.repository.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,7 +7,6 @@
  */
 
 import { Injectable } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
@@ -28,12 +27,8 @@ export class MessageRepository extends BaseRepository<
   MessagePopulate,
   MessageFull
 > {
-  constructor(
-    readonly eventEmitter: EventEmitter2,
-    @InjectModel(Message.name) readonly model: Model<AnyMessage>,
-  ) {
+  constructor(@InjectModel(Message.name) readonly model: Model<AnyMessage>) {
     super(
-      eventEmitter,
       model,
       Message as new () => AnyMessage,
       MESSAGE_POPULATE,
diff --git a/api/src/chat/repositories/subscriber.repository.spec.ts b/api/src/chat/repositories/subscriber.repository.spec.ts
index 21d77f60..b034ae4a 100644
--- a/api/src/chat/repositories/subscriber.repository.spec.ts
+++ b/api/src/chat/repositories/subscriber.repository.spec.ts
@@ -6,9 +6,7 @@
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule, getModelToken } from '@nestjs/mongoose';
-import { Test } from '@nestjs/testing';
 import { Model } from 'mongoose';
 
 import { AttachmentRepository } from '@/attachment/repositories/attachment.repository';
@@ -17,7 +15,6 @@ import {
   AttachmentModel,
 } from '@/attachment/schemas/attachment.schema';
 import { AttachmentService } from '@/attachment/services/attachment.service';
-import { LoggerService } from '@/logger/logger.service';
 import { UserRepository } from '@/user/repositories/user.repository';
 import { User, UserModel } from '@/user/schemas/user.schema';
 import {
@@ -30,6 +27,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { Label, LabelModel } from '../schemas/label.schema';
 import {
@@ -52,10 +50,9 @@ describe('SubscriberRepository', () => {
   let allSubscribers: Subscriber[];
   let allAttachments: Attachment[];
   let subscribersWithPopulatedFields: SubscriberFull[];
-  let eventEmitter: EventEmitter2;
 
   beforeAll(async () => {
-    const module = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installSubscriberFixtures),
         MongooseModule.forFeature([
@@ -69,21 +66,24 @@ describe('SubscriberRepository', () => {
         SubscriberRepository,
         LabelRepository,
         UserRepository,
-        EventEmitter2,
-        LoggerService,
         AttachmentService,
         AttachmentRepository,
       ],
-    }).compile();
-    subscriberRepository =
-      module.get<SubscriberRepository>(SubscriberRepository);
-    labelRepository = module.get<LabelRepository>(LabelRepository);
-    userRepository = module.get<UserRepository>(UserRepository);
-    attachmentRepository =
-      module.get<AttachmentRepository>(AttachmentRepository);
-    subscriberModel = module.get<Model<Subscriber>>(
-      getModelToken('Subscriber'),
-    );
+    });
+    [
+      subscriberRepository,
+      labelRepository,
+      userRepository,
+      attachmentRepository,
+      subscriberModel,
+    ] = await getMocks([
+      SubscriberRepository,
+      LabelRepository,
+      UserRepository,
+      AttachmentRepository,
+      getModelToken(Subscriber.name),
+    ]);
+
     allLabels = await labelRepository.findAll();
     allSubscribers = await subscriberRepository.findAll();
     allUsers = await userRepository.findAll();
@@ -95,7 +95,6 @@ describe('SubscriberRepository', () => {
         allUsers.find(({ id }) => subscriber.assignedTo === id) || null,
       avatar: allAttachments.find(({ id }) => subscriber.avatar === id) || null,
     }));
-    eventEmitter = module.get<EventEmitter2>(EventEmitter2);
   });
 
   afterEach(jest.clearAllMocks);
@@ -171,16 +170,16 @@ describe('SubscriberRepository', () => {
       jest
         .spyOn(subscriberRepository, 'findOne')
         .mockResolvedValue(oldSubscriber);
-      jest.spyOn(eventEmitter, 'emit');
+      jest.spyOn(subscriberRepository.eventEmitter, 'emit');
 
       await subscriberRepository.updateOne(oldSubscriber.id, updates);
 
-      expect(eventEmitter.emit).toHaveBeenCalledWith(
+      expect(subscriberRepository.eventEmitter.emit).toHaveBeenCalledWith(
         'hook:subscriber:assign',
         expect.anything(),
         expect.anything(),
       );
-      expect(eventEmitter.emit).toHaveBeenCalledWith(
+      expect(subscriberRepository.eventEmitter.emit).toHaveBeenCalledWith(
         'hook:analytics:passation',
         expect.anything(),
         true, // Because assignedTo has changed
@@ -198,16 +197,16 @@ describe('SubscriberRepository', () => {
       jest
         .spyOn(subscriberRepository, 'findOne')
         .mockResolvedValue(oldSubscriber);
-      jest.spyOn(eventEmitter, 'emit');
+      jest.spyOn(subscriberRepository.eventEmitter, 'emit');
 
       await subscriberRepository.updateOne(oldSubscriber.id, updates);
 
-      expect(eventEmitter.emit).not.toHaveBeenCalledWith(
+      expect(subscriberRepository.eventEmitter.emit).not.toHaveBeenCalledWith(
         'hook:subscriber:assign',
         expect.anything(),
         expect.anything(),
       );
-      expect(eventEmitter.emit).not.toHaveBeenCalledWith(
+      expect(subscriberRepository.eventEmitter.emit).not.toHaveBeenCalledWith(
         'hook:analytics:passation',
         expect.anything(),
         expect.anything(),
diff --git a/api/src/chat/repositories/subscriber.repository.ts b/api/src/chat/repositories/subscriber.repository.ts
index 02d0ad66..f6eb4d57 100644
--- a/api/src/chat/repositories/subscriber.repository.ts
+++ b/api/src/chat/repositories/subscriber.repository.ts
@@ -7,7 +7,6 @@
  */
 
 import { Injectable } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
 import {
   Document,
@@ -17,6 +16,7 @@ import {
   UpdateWithAggregationPipeline,
 } from 'mongoose';
 
+import { BotStatsType } from '@/analytics/schemas/bot-stats.schema';
 import { BaseRepository } from '@/utils/generics/base-repository';
 import { TFilterQuery } from '@/utils/types/filter.types';
 
@@ -36,11 +36,8 @@ export class SubscriberRepository extends BaseRepository<
   SubscriberFull,
   SubscriberDto
 > {
-  constructor(
-    readonly eventEmitter: EventEmitter2,
-    @InjectModel(Subscriber.name) readonly model: Model<Subscriber>,
-  ) {
-    super(eventEmitter, model, Subscriber, SUBSCRIBER_POPULATE, SubscriberFull);
+  constructor(@InjectModel(Subscriber.name) readonly model: Model<Subscriber>) {
+    super(model, Subscriber, SUBSCRIBER_POPULATE, SubscriberFull);
   }
 
   /**
@@ -51,7 +48,7 @@ export class SubscriberRepository extends BaseRepository<
   async postCreate(created: SubscriberDocument): Promise<void> {
     this.eventEmitter.emit(
       'hook:stats:entry',
-      'new_users',
+      BotStatsType.new_users,
       'New users',
       created,
     );
diff --git a/api/src/chat/schemas/types/button.ts b/api/src/chat/schemas/types/button.ts
index fb209779..5649d56d 100644
--- a/api/src/chat/schemas/types/button.ts
+++ b/api/src/chat/schemas/types/button.ts
@@ -41,4 +41,6 @@ export enum PayloadType {
   quick_reply = 'quick_reply',
   button = 'button',
   outcome = 'outcome',
+  menu = 'menu',
+  content = 'content',
 }
diff --git a/api/src/chat/services/block.service.spec.ts b/api/src/chat/services/block.service.spec.ts
index 744c04f7..393d9160 100644
--- a/api/src/chat/services/block.service.spec.ts
+++ b/api/src/chat/services/block.service.spec.ts
@@ -7,9 +7,7 @@
  */
 
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test } from '@nestjs/testing';
 
 import { AttachmentRepository } from '@/attachment/repositories/attachment.repository';
 import { AttachmentModel } from '@/attachment/schemas/attachment.schema';
@@ -33,7 +31,6 @@ import { LanguageRepository } from '@/i18n/repositories/language.repository';
 import { LanguageModel } from '@/i18n/schemas/language.schema';
 import { I18nService } from '@/i18n/services/i18n.service';
 import { LanguageService } from '@/i18n/services/language.service';
-import { LoggerService } from '@/logger/logger.service';
 import { PluginService } from '@/plugins/plugins.service';
 import { SettingService } from '@/setting/services/setting.service';
 import {
@@ -56,6 +53,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { BlockRepository } from '../repositories/block.repository';
 import { Block, BlockModel } from '../schemas/block.schema';
@@ -79,7 +77,7 @@ describe('BlockService', () => {
   let contentTypeService: ContentTypeService;
 
   beforeAll(async () => {
-    const module = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(async () => {
           await installContentFixtures();
@@ -112,7 +110,6 @@ describe('BlockService', () => {
           provide: PluginService,
           useValue: {},
         },
-        LoggerService,
         {
           provide: I18nService,
           useValue: {
@@ -132,7 +129,6 @@ describe('BlockService', () => {
             })),
           },
         },
-        EventEmitter2,
         {
           provide: CACHE_MANAGER,
           useValue: {
@@ -142,12 +138,20 @@ describe('BlockService', () => {
           },
         },
       ],
-    }).compile();
-    blockService = module.get<BlockService>(BlockService);
-    contentService = module.get<ContentService>(ContentService);
-    contentTypeService = module.get<ContentTypeService>(ContentTypeService);
-    categoryRepository = module.get<CategoryRepository>(CategoryRepository);
-    blockRepository = module.get<BlockRepository>(BlockRepository);
+    });
+    [
+      blockService,
+      contentService,
+      contentTypeService,
+      categoryRepository,
+      blockRepository,
+    ] = await getMocks([
+      BlockService,
+      ContentService,
+      ContentTypeService,
+      CategoryRepository,
+      BlockRepository,
+    ]);
     category = (await categoryRepository.findOne({ label: 'default' }))!;
     hasPreviousBlocks = (await blockRepository.findOne({
       name: 'hasPreviousBlocks',
diff --git a/api/src/chat/services/block.service.ts b/api/src/chat/services/block.service.ts
index 01aa81e9..5f0dbbb8 100644
--- a/api/src/chat/services/block.service.ts
+++ b/api/src/chat/services/block.service.ts
@@ -16,7 +16,6 @@ import { CONSOLE_CHANNEL_NAME } from '@/extensions/channels/console/settings';
 import { NLU } from '@/helper/types';
 import { I18nService } from '@/i18n/services/i18n.service';
 import { LanguageService } from '@/i18n/services/language.service';
-import { LoggerService } from '@/logger/logger.service';
 import { PluginService } from '@/plugins/plugins.service';
 import { PluginType } from '@/plugins/types';
 import { SettingService } from '@/setting/services/setting.service';
@@ -52,7 +51,6 @@ export class BlockService extends BaseService<
     private readonly contentService: ContentService,
     private readonly settingService: SettingService,
     private readonly pluginService: PluginService,
-    private readonly logger: LoggerService,
     protected readonly i18n: I18nService,
     protected readonly languageService: LanguageService,
   ) {
diff --git a/api/src/chat/services/bot.service.spec.ts b/api/src/chat/services/bot.service.spec.ts
index 94aca978..820cff08 100644
--- a/api/src/chat/services/bot.service.spec.ts
+++ b/api/src/chat/services/bot.service.spec.ts
@@ -10,7 +10,6 @@ import { CACHE_MANAGER } from '@nestjs/cache-manager';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { JwtModule } from '@nestjs/jwt';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test } from '@nestjs/testing';
 
 import { AttachmentRepository } from '@/attachment/repositories/attachment.repository';
 import { AttachmentModel } from '@/attachment/schemas/attachment.schema';
@@ -34,7 +33,6 @@ import { LanguageRepository } from '@/i18n/repositories/language.repository';
 import { LanguageModel } from '@/i18n/schemas/language.schema';
 import { I18nService } from '@/i18n/services/i18n.service';
 import { LanguageService } from '@/i18n/services/language.service';
-import { LoggerService } from '@/logger/logger.service';
 import { PluginService } from '@/plugins/plugins.service';
 import { SettingService } from '@/setting/services/setting.service';
 import { installBlockFixtures } from '@/utils/test/fixtures/block';
@@ -44,6 +42,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 import { SocketEventDispatcherService } from '@/websocket/services/socket-event-dispatcher.service';
 import { WebsocketGateway } from '@/websocket/websocket.gateway';
 
@@ -81,7 +80,7 @@ describe('BlockService', () => {
   let eventEmitter: EventEmitter2;
 
   beforeAll(async () => {
-    const module = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(async () => {
           await installSubscriberFixtures();
@@ -105,7 +104,6 @@ describe('BlockService', () => {
         JwtModule,
       ],
       providers: [
-        EventEmitter2,
         BlockRepository,
         CategoryRepository,
         WebsocketGateway,
@@ -141,7 +139,6 @@ describe('BlockService', () => {
           provide: PluginService,
           useValue: {},
         },
-        LoggerService,
         {
           provide: I18nService,
           useValue: {
@@ -168,12 +165,15 @@ describe('BlockService', () => {
           },
         },
       ],
-    }).compile();
-    subscriberService = module.get<SubscriberService>(SubscriberService);
-    botService = module.get<BotService>(BotService);
-    blockService = module.get<BlockService>(BlockService);
-    eventEmitter = module.get<EventEmitter2>(EventEmitter2);
-    handler = module.get<WebChannelHandler>(WebChannelHandler);
+    });
+    [subscriberService, botService, blockService, eventEmitter, handler] =
+      await getMocks([
+        SubscriberService,
+        BotService,
+        BlockService,
+        EventEmitter2,
+        WebChannelHandler,
+      ]);
   });
 
   afterEach(jest.clearAllMocks);
@@ -243,8 +243,8 @@ describe('BlockService', () => {
     await botService.startConversation(event, block);
     expect(hasBotSpoken).toEqual(true);
     expect(triggeredEvents).toEqual([
-      ['popular', 'hasNextBlocks'],
-      ['new_conversations', 'New conversations'],
+      ['popular', 'hasNextBlocks', webSubscriber],
+      ['new_conversations', 'New conversations', webSubscriber],
     ]);
     clearMock.mockClear();
   });
@@ -301,7 +301,7 @@ describe('BlockService', () => {
     const captured = await botService.processConversationMessage(event);
     expect(captured).toBe(true);
     expect(triggeredEvents).toEqual([
-      ['existing_conversations', 'Existing conversations'],
+      ['existing_conversations', 'Existing conversations', webSubscriber],
     ]);
     clearMock.mockClear();
   });
diff --git a/api/src/chat/services/bot.service.ts b/api/src/chat/services/bot.service.ts
index 6548bd98..fb53bf9c 100644
--- a/api/src/chat/services/bot.service.ts
+++ b/api/src/chat/services/bot.service.ts
@@ -9,6 +9,7 @@
 import { Injectable } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 
+import { BotStatsType } from '@/analytics/schemas/bot-stats.schema';
 import EventWrapper from '@/channel/lib/EventWrapper';
 import { LoggerService } from '@/logger/logger.service';
 import { SettingService } from '@/setting/services/setting.service';
@@ -65,8 +66,18 @@ export class BotService {
       .getHandler()
       .sendMessage(event, envelope, options, context);
 
-    this.eventEmitter.emit('hook:stats:entry', 'outgoing', 'Outgoing');
-    this.eventEmitter.emit('hook:stats:entry', 'all_messages', 'All Messages');
+    this.eventEmitter.emit(
+      'hook:stats:entry',
+      BotStatsType.outgoing,
+      'Outgoing',
+      recipient,
+    );
+    this.eventEmitter.emit(
+      'hook:stats:entry',
+      BotStatsType.all_messages,
+      'All Messages',
+      recipient,
+    );
 
     // Trigger sent message event
     const sentMessage: MessageCreateDto = {
@@ -165,7 +176,7 @@ export class BotService {
           return await this.triggerBlock(event, convo, attachedBlock, fallback);
         } catch (err) {
           this.logger.error('Unable to retrieve attached block', err);
-          this.eventEmitter.emit('hook:conversation:end', convo, true);
+          this.eventEmitter.emit('hook:conversation:end', convo);
         }
       } else if (
         Array.isArray(block.nextBlocks) &&
@@ -200,6 +211,7 @@ export class BotService {
                 'Block outcome did not match any of the next blocks',
                 convo,
               );
+              this.eventEmitter.emit('hook:conversation:end', convo);
             }
           } else {
             // Conversation continues : Go forward to next blocks
@@ -217,11 +229,11 @@ export class BotService {
       } else {
         // We need to end the conversation in this case
         this.logger.debug('No attached/next blocks to execute ...');
-        this.eventEmitter.emit('hook:conversation:end', convo, false);
+        this.eventEmitter.emit('hook:conversation:end', convo);
       }
     } catch (err) {
       this.logger.error('Unable to process/send message.', err);
-      this.eventEmitter.emit('hook:conversation:end', convo, true);
+      this.eventEmitter.emit('hook:conversation:end', convo);
     }
   }
 
@@ -292,7 +304,12 @@ export class BotService {
 
       if (next) {
         // Increment stats about popular blocks
-        this.eventEmitter.emit('hook:stats:entry', 'popular', next.name);
+        this.eventEmitter.emit(
+          'hook:stats:entry',
+          BotStatsType.popular,
+          next.name,
+          convo.sender,
+        );
         // Go next!
         this.logger.debug('Respond to nested conversion! Go next ', next.id);
         try {
@@ -308,19 +325,19 @@ export class BotService {
           await this.triggerBlock(event, updatedConversation, next, fallback);
         } catch (err) {
           this.logger.error('Unable to store context data!', err);
-          return this.eventEmitter.emit('hook:conversation:end', convo, true);
+          return this.eventEmitter.emit('hook:conversation:end', convo);
         }
         return true;
       } else {
         // Conversation is still active, but there's no matching block to call next
         // We'll end the conversation but this message is probably lost in time and space.
         this.logger.debug('No matching block found to call next ', convo.id);
-        this.eventEmitter.emit('hook:conversation:end', convo, false);
+        this.eventEmitter.emit('hook:conversation:end', convo);
         return false;
       }
     } catch (err) {
       this.logger.error('Unable to populate the next blocks!', err);
-      this.eventEmitter.emit('hook:conversation:end', convo, true);
+      this.eventEmitter.emit('hook:conversation:end', convo);
       throw err;
     }
   }
@@ -351,8 +368,9 @@ export class BotService {
 
       this.eventEmitter.emit(
         'hook:stats:entry',
-        'existing_conversations',
+        BotStatsType.existing_conversations,
         'Existing conversations',
+        subscriber,
       );
       this.logger.debug('Conversation has been captured! Responding ...');
       return await this.handleIncomingMessage(conversation, event);
@@ -372,10 +390,15 @@ export class BotService {
    * @param block - Starting block
    */
   async startConversation(event: EventWrapper<any, any>, block: BlockFull) {
-    // Increment popular stats
-    this.eventEmitter.emit('hook:stats:entry', 'popular', block.name);
     // Launching a new conversation
     const subscriber = event.getSender();
+    // Increment popular stats
+    this.eventEmitter.emit(
+      'hook:stats:entry',
+      BotStatsType.popular,
+      block.name,
+      subscriber,
+    );
 
     try {
       const convo = await this.conversationService.create({
@@ -383,8 +406,9 @@ export class BotService {
       });
       this.eventEmitter.emit(
         'hook:stats:entry',
-        'new_conversations',
+        BotStatsType.new_conversations,
         'New conversations',
+        subscriber,
       );
 
       try {
@@ -404,7 +428,7 @@ export class BotService {
         return this.triggerBlock(event, updatedConversation, block, false);
       } catch (err) {
         this.logger.error('Unable to store context data!', err);
-        this.eventEmitter.emit('hook:conversation:end', convo, true);
+        this.eventEmitter.emit('hook:conversation:end', convo);
       }
     } catch (err) {
       this.logger.error('Unable to start a new conversation with ', err);
diff --git a/api/src/chat/services/chat.service.ts b/api/src/chat/services/chat.service.ts
index 6a28b315..eec6fb84 100644
--- a/api/src/chat/services/chat.service.ts
+++ b/api/src/chat/services/chat.service.ts
@@ -11,6 +11,7 @@ import { EventEmitter2, OnEvent } from '@nestjs/event-emitter';
 import mime from 'mime';
 import { v4 as uuidv4 } from 'uuid';
 
+import { BotStatsType } from '@/analytics/schemas/bot-stats.schema';
 import { AttachmentService } from '@/attachment/services/attachment.service';
 import {
   AttachmentAccess,
@@ -96,7 +97,10 @@ export class ChatService {
    * @param sentMessage - The message that has been sent
    */
   @OnEvent('hook:chatbot:sent')
-  async handleSentMessage(sentMessage: MessageCreateDto) {
+  async handleSentMessage(
+    sentMessage: MessageCreateDto,
+    _event: EventWrapper<any, any>,
+  ) {
     if (sentMessage.mid) {
       try {
         const message = await this.messageService.findOneOrCreate(
@@ -146,11 +150,17 @@ export class ChatService {
       }
 
       this.websocketGateway.broadcastMessageReceived(populatedMsg, subscriber);
-      this.eventEmitter.emit('hook:stats:entry', 'incoming', 'Incoming');
       this.eventEmitter.emit(
         'hook:stats:entry',
-        'all_messages',
+        BotStatsType.incoming,
+        'Incoming',
+        subscriber,
+      );
+      this.eventEmitter.emit(
+        'hook:stats:entry',
+        BotStatsType.all_messages,
         'All Messages',
+        subscriber,
       );
     } catch (err) {
       this.logger.error('Unable to log received message.', err, event);
@@ -244,8 +254,8 @@ export class ChatService {
           read: false,
         };
 
-        this.eventEmitter.emit('hook:chatbot:sent', sentMessage);
-        this.eventEmitter.emit('hook:stats:entry', 'echo', 'Echo');
+        this.eventEmitter.emit('hook:chatbot:sent', sentMessage, event);
+        this.eventEmitter.emit('hook:stats:entry', 'echo', 'Echo', recipient);
       } catch (err) {
         this.logger.error('Unable to log echo message', err, event);
       }
diff --git a/api/src/chat/services/conversation.service.ts b/api/src/chat/services/conversation.service.ts
index ad0ba39c..a682efb8 100644
--- a/api/src/chat/services/conversation.service.ts
+++ b/api/src/chat/services/conversation.service.ts
@@ -9,7 +9,6 @@
 import { Injectable, Logger } from '@nestjs/common';
 
 import EventWrapper from '@/channel/lib/EventWrapper';
-import { LoggerService } from '@/logger/logger.service';
 import { BaseService } from '@/utils/generics/base-service';
 
 import { ConversationDto } from '../dto/conversation.dto';
@@ -36,7 +35,6 @@ export class ConversationService extends BaseService<
 > {
   constructor(
     readonly repository: ConversationRepository,
-    private readonly logger: LoggerService,
     private readonly contextVarService: ContextVarService,
     private readonly subscriberService: SubscriberService,
   ) {
diff --git a/api/src/chat/services/label.service.spec.ts b/api/src/chat/services/label.service.spec.ts
index 0164160d..589bd33f 100644
--- a/api/src/chat/services/label.service.spec.ts
+++ b/api/src/chat/services/label.service.spec.ts
@@ -6,14 +6,11 @@
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test } from '@nestjs/testing';
 
 import { AttachmentRepository } from '@/attachment/repositories/attachment.repository';
 import { AttachmentModel } from '@/attachment/schemas/attachment.schema';
 import { AttachmentService } from '@/attachment/services/attachment.service';
-import { LoggerService } from '@/logger/logger.service';
 import {
   installLabelFixtures,
   labelFixtures,
@@ -24,6 +21,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { LabelRepository } from '../repositories/label.repository';
 import { Label, LabelFull, LabelModel } from '../schemas/label.schema';
@@ -42,7 +40,7 @@ describe('LabelService', () => {
   let labelsWithUsers: LabelFull[];
 
   beforeAll(async () => {
-    const module = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installLabelFixtures),
         MongooseModule.forFeature([
@@ -52,20 +50,19 @@ describe('LabelService', () => {
         ]),
       ],
       providers: [
-        LoggerService,
         LabelService,
         LabelRepository,
         SubscriberService,
         AttachmentService,
         AttachmentRepository,
         SubscriberRepository,
-        EventEmitter2,
       ],
-    }).compile();
-    labelService = module.get<LabelService>(LabelService);
-    labelRepository = module.get<LabelRepository>(LabelRepository);
-    subscriberRepository =
-      module.get<SubscriberRepository>(SubscriberRepository);
+    });
+    [labelService, labelRepository, subscriberRepository] = await getMocks([
+      LabelService,
+      LabelRepository,
+      SubscriberRepository,
+    ]);
     allSubscribers = await subscriberRepository.findAll();
     allLabels = await labelRepository.findAll();
     labelsWithUsers = allLabels.map((label) => ({
diff --git a/api/src/chat/services/message.service.spec.ts b/api/src/chat/services/message.service.spec.ts
index fc48b8d1..8952c244 100644
--- a/api/src/chat/services/message.service.spec.ts
+++ b/api/src/chat/services/message.service.spec.ts
@@ -1,19 +1,16 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test } from '@nestjs/testing';
 
 import { AttachmentRepository } from '@/attachment/repositories/attachment.repository';
 import { AttachmentModel } from '@/attachment/schemas/attachment.schema';
 import { AttachmentService } from '@/attachment/services/attachment.service';
-import { LoggerService } from '@/logger/logger.service';
 import { InvitationRepository } from '@/user/repositories/invitation.repository';
 import { RoleRepository } from '@/user/repositories/role.repository';
 import { UserRepository } from '@/user/repositories/user.repository';
@@ -33,6 +30,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { MessageRepository } from '../repositories/message.repository';
 import { Message, MessageModel } from '../schemas/message.schema';
@@ -57,7 +55,7 @@ describe('MessageService', () => {
   let user: User;
 
   beforeAll(async () => {
-    const module = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installMessageFixtures),
         MongooseModule.forFeature([
@@ -71,7 +69,6 @@ describe('MessageService', () => {
         ]),
       ],
       providers: [
-        LoggerService,
         AttachmentService,
         AttachmentRepository,
         UserService,
@@ -83,14 +80,15 @@ describe('MessageService', () => {
         SubscriberRepository,
         MessageService,
         MessageRepository,
-        EventEmitter2,
       ],
-    }).compile();
-    messageService = module.get<MessageService>(MessageService);
-    messageRepository = module.get<MessageRepository>(MessageRepository);
-    subscriberRepository =
-      module.get<SubscriberRepository>(SubscriberRepository);
-    userRepository = module.get<UserRepository>(UserRepository);
+    });
+    [messageService, messageRepository, subscriberRepository, userRepository] =
+      await getMocks([
+        MessageService,
+        MessageRepository,
+        SubscriberRepository,
+        UserRepository,
+      ]);
     allSubscribers = await subscriberRepository.findAll();
     allUsers = await userRepository.findAll();
     allMessages = await messageRepository.findAll();
diff --git a/api/src/chat/services/message.service.ts b/api/src/chat/services/message.service.ts
index 75031541..604cb51a 100644
--- a/api/src/chat/services/message.service.ts
+++ b/api/src/chat/services/message.service.ts
@@ -12,7 +12,6 @@ import {
   Optional,
 } from '@nestjs/common';
 
-import { LoggerService } from '@/logger/logger.service';
 import { BaseService } from '@/utils/generics/base-service';
 import {
   SocketGet,
@@ -36,17 +35,13 @@ export class MessageService extends BaseService<
   MessagePopulate,
   MessageFull
 > {
-  private readonly logger: LoggerService;
-
   private readonly gateway: WebsocketGateway;
 
   constructor(
     private readonly messageRepository: MessageRepository,
-    @Optional() logger?: LoggerService,
     @Optional() gateway?: WebsocketGateway,
   ) {
     super(messageRepository);
-    if (logger) this.logger = logger;
     if (gateway) this.gateway = gateway;
   }
 
diff --git a/api/src/chat/services/subscriber.service.spec.ts b/api/src/chat/services/subscriber.service.spec.ts
index 69e38946..3bd3104c 100644
--- a/api/src/chat/services/subscriber.service.spec.ts
+++ b/api/src/chat/services/subscriber.service.spec.ts
@@ -1,19 +1,16 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test } from '@nestjs/testing';
 
 import { AttachmentRepository } from '@/attachment/repositories/attachment.repository';
 import { AttachmentModel } from '@/attachment/schemas/attachment.schema';
 import { AttachmentService } from '@/attachment/services/attachment.service';
-import { LoggerService } from '@/logger/logger.service';
 import { InvitationRepository } from '@/user/repositories/invitation.repository';
 import { RoleRepository } from '@/user/repositories/role.repository';
 import { UserRepository } from '@/user/repositories/user.repository';
@@ -30,6 +27,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { LabelRepository } from '../repositories/label.repository';
 import { SubscriberRepository } from '../repositories/subscriber.repository';
@@ -49,7 +47,7 @@ describe('SubscriberService', () => {
   let allUsers: User[];
 
   beforeAll(async () => {
-    const module = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installSubscriberFixtures),
         MongooseModule.forFeature([
@@ -72,17 +70,17 @@ describe('SubscriberService', () => {
         RoleService,
         RoleRepository,
         InvitationRepository,
-        LoggerService,
-        EventEmitter2,
         AttachmentService,
         AttachmentRepository,
       ],
-    }).compile();
-    labelRepository = module.get<LabelRepository>(LabelRepository);
-    userRepository = module.get<UserRepository>(UserRepository);
-    subscriberService = module.get<SubscriberService>(SubscriberService);
-    subscriberRepository =
-      module.get<SubscriberRepository>(SubscriberRepository);
+    });
+    [labelRepository, userRepository, subscriberService, subscriberRepository] =
+      await getMocks([
+        LabelRepository,
+        UserRepository,
+        SubscriberService,
+        SubscriberRepository,
+      ]);
     allSubscribers = await subscriberRepository.findAll();
     allLabels = await labelRepository.findAll();
     allUsers = await userRepository.findAll();
diff --git a/api/src/chat/services/subscriber.service.ts b/api/src/chat/services/subscriber.service.ts
index e419516d..faa02ffc 100644
--- a/api/src/chat/services/subscriber.service.ts
+++ b/api/src/chat/services/subscriber.service.ts
@@ -15,7 +15,6 @@ import { OnEvent } from '@nestjs/event-emitter';
 
 import { AttachmentService } from '@/attachment/services/attachment.service';
 import { config } from '@/config';
-import { LoggerService } from '@/logger/logger.service';
 import { BaseService } from '@/utils/generics/base-service';
 import {
   SocketGet,
@@ -48,7 +47,6 @@ export class SubscriberService extends BaseService<
 
   constructor(
     readonly repository: SubscriberRepository,
-    private readonly logger: LoggerService,
     protected attachmentService: AttachmentService,
     @Optional() gateway?: WebsocketGateway,
   ) {
diff --git a/api/src/cms/controllers/content-type.controller.spec.ts b/api/src/cms/controllers/content-type.controller.spec.ts
index 88dd5e74..14dc871c 100644
--- a/api/src/cms/controllers/content-type.controller.spec.ts
+++ b/api/src/cms/controllers/content-type.controller.spec.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,15 +7,12 @@
  */
 
 import { NotFoundException } from '@nestjs/common/exceptions';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
 import { AttachmentRepository } from '@/attachment/repositories/attachment.repository';
 import { AttachmentModel } from '@/attachment/schemas/attachment.schema';
 import { AttachmentService } from '@/attachment/services/attachment.service';
 import { BlockService } from '@/chat/services/block.service';
-import { LoggerService } from '@/logger/logger.service';
 import { NOT_FOUND_ID } from '@/utils/constants/mock';
 import { getUpdateOneError } from '@/utils/test/errors/messages';
 import { installContentFixtures } from '@/utils/test/fixtures/content';
@@ -25,6 +22,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { ContentTypeCreateDto } from '../dto/contentType.dto';
 import { ContentTypeRepository } from '../repositories/content-type.repository';
@@ -44,7 +42,7 @@ describe('ContentTypeController', () => {
   let blockService: BlockService;
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       controllers: [ContentTypeController],
       imports: [
         rootMongooseTestModule(installContentFixtures),
@@ -61,8 +59,6 @@ describe('ContentTypeController', () => {
         ContentTypeService,
         ContentService,
         AttachmentService,
-        LoggerService,
-        EventEmitter2,
         {
           provide: BlockService,
           useValue: {
@@ -70,13 +66,14 @@ describe('ContentTypeController', () => {
           },
         },
       ],
-    }).compile();
-    blockService = module.get<BlockService>(BlockService);
-    contentTypeController = module.get<ContentTypeController>(
-      ContentTypeController,
-    );
-    contentTypeService = module.get<ContentTypeService>(ContentTypeService);
-    contentService = module.get<ContentService>(ContentService);
+    });
+    [blockService, contentTypeController, contentTypeService, contentService] =
+      await getMocks([
+        BlockService,
+        ContentTypeController,
+        ContentTypeService,
+        ContentService,
+      ]);
     contentType = await contentTypeService.findOne({ name: 'Product' })!;
   });
 
diff --git a/api/src/cms/controllers/content-type.controller.ts b/api/src/cms/controllers/content-type.controller.ts
index 9477196b..a183d19d 100644
--- a/api/src/cms/controllers/content-type.controller.ts
+++ b/api/src/cms/controllers/content-type.controller.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -22,7 +22,6 @@ import {
 import { CsrfCheck } from '@tekuconcept/nestjs-csrf';
 
 import { CsrfInterceptor } from '@/interceptors/csrf.interceptor';
-import { LoggerService } from '@/logger/logger.service';
 import { BaseController } from '@/utils/generics/base-controller';
 import { PageQueryDto } from '@/utils/pagination/pagination-query.dto';
 import { PageQueryPipe } from '@/utils/pagination/pagination-query.pipe';
@@ -39,10 +38,7 @@ import { ContentTypeService } from '../services/content-type.service';
 @UseInterceptors(CsrfInterceptor)
 @Controller('contenttype')
 export class ContentTypeController extends BaseController<ContentType> {
-  constructor(
-    private readonly contentTypeService: ContentTypeService,
-    private readonly logger: LoggerService,
-  ) {
+  constructor(private readonly contentTypeService: ContentTypeService) {
     super(contentTypeService);
   }
 
diff --git a/api/src/cms/controllers/content.controller.spec.ts b/api/src/cms/controllers/content.controller.spec.ts
index b2fc47a5..8d8c11a0 100644
--- a/api/src/cms/controllers/content.controller.spec.ts
+++ b/api/src/cms/controllers/content.controller.spec.ts
@@ -7,11 +7,8 @@
  */
 
 import { NotFoundException } from '@nestjs/common/exceptions';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
-import { LoggerService } from '@/logger/logger.service';
 import { NOT_FOUND_ID } from '@/utils/constants/mock';
 import { PageQueryDto } from '@/utils/pagination/pagination-query.dto';
 import { IGNORED_TEST_FIELDS } from '@/utils/test/constants';
@@ -25,6 +22,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { ContentCreateDto } from '../dto/content.dto';
 import { ContentTypeRepository } from '../repositories/content-type.repository';
@@ -46,24 +44,24 @@ describe('ContentController', () => {
   let pageQuery: PageQueryDto<Content>;
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       controllers: [ContentController],
       imports: [
         rootMongooseTestModule(installContentFixtures),
         MongooseModule.forFeature([ContentTypeModel, ContentModel]),
       ],
       providers: [
-        LoggerService,
         ContentTypeService,
         ContentService,
         ContentRepository,
         ContentTypeRepository,
-        EventEmitter2,
       ],
-    }).compile();
-    contentController = module.get<ContentController>(ContentController);
-    contentService = module.get<ContentService>(ContentService);
-    contentTypeService = module.get<ContentTypeService>(ContentTypeService);
+    });
+    [contentController, contentService, contentTypeService] = await getMocks([
+      ContentController,
+      ContentService,
+      ContentTypeService,
+    ]);
     contentType = await contentTypeService.findOne({ name: 'Product' });
     content = await contentService.findOne({
       title: 'Jean',
diff --git a/api/src/cms/controllers/content.controller.ts b/api/src/cms/controllers/content.controller.ts
index c878caa0..e20b27ea 100644
--- a/api/src/cms/controllers/content.controller.ts
+++ b/api/src/cms/controllers/content.controller.ts
@@ -24,7 +24,6 @@ import { FileInterceptor } from '@nestjs/platform-express';
 import { CsrfCheck } from '@tekuconcept/nestjs-csrf';
 
 import { CsrfInterceptor } from '@/interceptors/csrf.interceptor';
-import { LoggerService } from '@/logger/logger.service';
 import { BaseController } from '@/utils/generics/base-controller';
 import { PageQueryDto } from '@/utils/pagination/pagination-query.dto';
 import { PageQueryPipe } from '@/utils/pagination/pagination-query.pipe';
@@ -54,7 +53,6 @@ export class ContentController extends BaseController<
   constructor(
     private readonly contentService: ContentService,
     private readonly contentTypeService: ContentTypeService,
-    private readonly logger: LoggerService,
   ) {
     super(contentService);
   }
diff --git a/api/src/cms/controllers/menu.controller.spec.ts b/api/src/cms/controllers/menu.controller.spec.ts
index 37464af3..67f00259 100644
--- a/api/src/cms/controllers/menu.controller.spec.ts
+++ b/api/src/cms/controllers/menu.controller.spec.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,11 +7,8 @@
  */
 
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
-import { LoggerService } from '@/logger/logger.service';
 import {
   installMenuFixtures,
   offerMenuFixture,
@@ -22,6 +19,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { MenuRepository } from '../repositories/menu.repository';
 import { MenuModel } from '../schemas/menu.schema';
@@ -35,7 +33,7 @@ describe('MenuController', () => {
   let menuController: MenuController;
   let menuService: MenuService;
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installMenuFixtures),
         MongooseModule.forFeature([MenuModel]),
@@ -43,7 +41,6 @@ describe('MenuController', () => {
       providers: [
         MenuRepository,
         MenuService,
-        EventEmitter2,
         {
           provide: CACHE_MANAGER,
           useValue: {
@@ -52,12 +49,13 @@ describe('MenuController', () => {
             set: jest.fn(),
           },
         },
-        LoggerService,
       ],
       controllers: [MenuController],
-    }).compile();
-    menuController = module.get<MenuController>(MenuController);
-    menuService = module.get<MenuService>(MenuService);
+    });
+    [menuController, menuService] = await getMocks([
+      MenuController,
+      MenuService,
+    ]);
   });
 
   afterAll(closeInMongodConnection);
diff --git a/api/src/cms/controllers/menu.controller.ts b/api/src/cms/controllers/menu.controller.ts
index 28f70947..451c771b 100644
--- a/api/src/cms/controllers/menu.controller.ts
+++ b/api/src/cms/controllers/menu.controller.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -22,7 +22,6 @@ import {
 import { CsrfCheck } from '@tekuconcept/nestjs-csrf';
 
 import { CsrfInterceptor } from '@/interceptors/csrf.interceptor';
-import { LoggerService } from '@/logger/logger.service';
 import { BaseController } from '@/utils/generics/base-controller';
 import { PageQueryDto } from '@/utils/pagination/pagination-query.dto';
 import { PageQueryPipe } from '@/utils/pagination/pagination-query.pipe';
@@ -41,10 +40,7 @@ export class MenuController extends BaseController<
   MenuPopulate,
   MenuFull
 > {
-  constructor(
-    private readonly menuService: MenuService,
-    private readonly logger: LoggerService,
-  ) {
+  constructor(private readonly menuService: MenuService) {
     super(menuService);
   }
 
diff --git a/api/src/cms/repositories/content-type.repository.spec.ts b/api/src/cms/repositories/content-type.repository.spec.ts
index cb8f380a..e3b84f87 100644
--- a/api/src/cms/repositories/content-type.repository.spec.ts
+++ b/api/src/cms/repositories/content-type.repository.spec.ts
@@ -1,14 +1,12 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule, getModelToken } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 import { Model } from 'mongoose';
 
 import { BlockRepository } from '@/chat/repositories/block.repository';
@@ -18,11 +16,11 @@ import {
   ContentType,
   ContentTypeModel,
 } from '@/cms/schemas/content-type.schema';
-import { LoggerService } from '@/logger/logger.service';
 import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { Content, ContentModel } from '../schemas/content.schema';
 
@@ -37,13 +35,12 @@ describe('ContentTypeRepository', () => {
   let blockService: BlockService;
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installContentFixtures),
         MongooseModule.forFeature([ContentTypeModel, ContentModel, BlockModel]),
       ],
       providers: [
-        LoggerService,
         ContentRepository,
         ContentTypeRepository,
         BlockService,
@@ -54,18 +51,15 @@ describe('ContentTypeRepository', () => {
             findOne: jest.fn(),
           },
         },
-        EventEmitter2,
       ],
-    }).compile();
-    blockService = module.get<BlockService>(BlockService);
-    contentTypeRepository = module.get<ContentTypeRepository>(
-      ContentTypeRepository,
-    );
-    contentTypeModel = module.get<Model<ContentType>>(
-      getModelToken('ContentType'),
-    );
-
-    contentModel = module.get<Model<Content>>(getModelToken('Content'));
+    });
+    [blockService, contentTypeRepository, contentTypeModel, contentModel] =
+      await getMocks([
+        BlockService,
+        ContentTypeRepository,
+        getModelToken(ContentType.name),
+        getModelToken(Content.name),
+      ]);
   });
 
   afterAll(closeInMongodConnection);
diff --git a/api/src/cms/repositories/content-type.repository.ts b/api/src/cms/repositories/content-type.repository.ts
index 9ee6d510..69f0da4f 100644
--- a/api/src/cms/repositories/content-type.repository.ts
+++ b/api/src/cms/repositories/content-type.repository.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,7 +7,6 @@
  */
 
 import { ForbiddenException, Injectable, Optional } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
 import { Document, Model, Query } from 'mongoose';
 
@@ -27,12 +26,11 @@ export class ContentTypeRepository extends BaseRepository<
   ContentTypeDto
 > {
   constructor(
-    readonly eventEmitter: EventEmitter2,
     @InjectModel(ContentType.name) readonly model: Model<ContentType>,
     @InjectModel(Content.name) private readonly contentModel: Model<Content>,
     @Optional() private readonly blockService?: BlockService,
   ) {
-    super(eventEmitter, model, ContentType);
+    super(model, ContentType);
   }
 
   /**
diff --git a/api/src/cms/repositories/content.repository.spec.ts b/api/src/cms/repositories/content.repository.spec.ts
index 9c26495f..29fc1a4c 100644
--- a/api/src/cms/repositories/content.repository.spec.ts
+++ b/api/src/cms/repositories/content.repository.spec.ts
@@ -1,27 +1,25 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule, getModelToken } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 import { Model } from 'mongoose';
 
 import {
   ContentType,
   ContentTypeModel,
 } from '@/cms/schemas/content-type.schema';
-import { LoggerService } from '@/logger/logger.service';
 import { contentTypeFixtures } from '@/utils/test/fixtures/contenttype';
 import { getPageQuery } from '@/utils/test/pagination';
 import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { Content, ContentModel } from '../schemas/content.schema';
 
@@ -37,18 +35,18 @@ describe('ContentRepository', () => {
   let contentTypeModel: Model<ContentType>;
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installContentFixtures),
         MongooseModule.forFeature([ContentTypeModel, ContentModel]),
       ],
-      providers: [LoggerService, ContentRepository, EventEmitter2],
-    }).compile();
-    contentRepository = module.get<ContentRepository>(ContentRepository);
-    contentModel = module.get<Model<Content>>(getModelToken('Content'));
-    contentTypeModel = module.get<Model<ContentType>>(
-      getModelToken('ContentType'),
-    );
+      providers: [ContentRepository],
+    });
+    [contentRepository, contentModel, contentTypeModel] = await getMocks([
+      ContentRepository,
+      getModelToken(Content.name),
+      getModelToken(ContentType.name),
+    ]);
   });
 
   afterAll(closeInMongodConnection);
diff --git a/api/src/cms/repositories/content.repository.ts b/api/src/cms/repositories/content.repository.ts
index 5fd38905..af7314f7 100644
--- a/api/src/cms/repositories/content.repository.ts
+++ b/api/src/cms/repositories/content.repository.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,7 +7,6 @@
  */
 
 import { Injectable } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
 import {
   Document,
@@ -36,11 +35,8 @@ export class ContentRepository extends BaseRepository<
   ContentFull,
   ContentDto
 > {
-  constructor(
-    readonly eventEmitter: EventEmitter2,
-    @InjectModel(Content.name) readonly model: Model<Content>,
-  ) {
-    super(eventEmitter, model, Content, CONTENT_POPULATE, ContentFull);
+  constructor(@InjectModel(Content.name) readonly model: Model<Content>) {
+    super(model, Content, CONTENT_POPULATE, ContentFull);
   }
 
   /**
diff --git a/api/src/cms/repositories/menu.reporsitory.spec.ts b/api/src/cms/repositories/menu.reporsitory.spec.ts
index 688d81c3..8909c15d 100644
--- a/api/src/cms/repositories/menu.reporsitory.spec.ts
+++ b/api/src/cms/repositories/menu.reporsitory.spec.ts
@@ -1,14 +1,12 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
 import {
   installMenuFixtures,
@@ -18,6 +16,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { MenuModel } from '../schemas/menu.schema';
 import { MenuType } from '../schemas/types/menu';
@@ -27,19 +26,18 @@ import { MenuRepository } from './menu.repository';
 describe('MenuRepository', () => {
   let menuRepository: MenuRepository;
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installMenuFixtures),
         MongooseModule.forFeature([MenuModel]),
       ],
-      providers: [MenuRepository, EventEmitter2],
-    }).compile();
-    menuRepository = module.get<MenuRepository>(MenuRepository);
-  });
-  afterAll(async () => {
-    await closeInMongodConnection();
+      providers: [MenuRepository],
+    });
+    [menuRepository] = await getMocks([MenuRepository]);
   });
 
+  afterAll(closeInMongodConnection);
+
   afterEach(jest.clearAllMocks);
 
   describe('findOneAndPopulate', () => {
diff --git a/api/src/cms/repositories/menu.repository.ts b/api/src/cms/repositories/menu.repository.ts
index 65408f50..f0819f30 100644
--- a/api/src/cms/repositories/menu.repository.ts
+++ b/api/src/cms/repositories/menu.repository.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,7 +7,6 @@
  */
 
 import { Injectable } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
@@ -30,11 +29,8 @@ export class MenuRepository extends BaseRepository<
   MenuFull,
   MenuDto
 > {
-  constructor(
-    readonly eventEmitter: EventEmitter2,
-    @InjectModel(Menu.name) readonly model: Model<Menu>,
-  ) {
-    super(eventEmitter, model, Menu, MENU_POPULATE, MenuFull);
+  constructor(@InjectModel(Menu.name) readonly model: Model<Menu>) {
+    super(model, Menu, MENU_POPULATE, MenuFull);
   }
 
   /**
diff --git a/api/src/cms/services/content-type.service.spec.ts b/api/src/cms/services/content-type.service.spec.ts
index b8c529d7..4abbf29e 100644
--- a/api/src/cms/services/content-type.service.spec.ts
+++ b/api/src/cms/services/content-type.service.spec.ts
@@ -1,25 +1,23 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
 import { AttachmentRepository } from '@/attachment/repositories/attachment.repository';
 import { AttachmentModel } from '@/attachment/schemas/attachment.schema';
 import { AttachmentService } from '@/attachment/services/attachment.service';
 import { BlockService } from '@/chat/services/block.service';
-import { LoggerService } from '@/logger/logger.service';
 import { installContentFixtures } from '@/utils/test/fixtures/content';
 import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { ContentTypeRepository } from '../repositories/content-type.repository';
 import { ContentRepository } from '../repositories/content.repository';
@@ -36,7 +34,7 @@ describe('ContentTypeService', () => {
   let blockService: BlockService;
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installContentFixtures),
         MongooseModule.forFeature([
@@ -52,8 +50,6 @@ describe('ContentTypeService', () => {
         ContentTypeService,
         ContentService,
         AttachmentService,
-        LoggerService,
-        EventEmitter2,
         {
           provide: BlockService,
           useValue: {
@@ -61,18 +57,17 @@ describe('ContentTypeService', () => {
           },
         },
       ],
-    }).compile();
-    blockService = module.get<BlockService>(BlockService);
-    contentTypeService = module.get<ContentTypeService>(ContentTypeService);
-    contentService = module.get<ContentService>(ContentService);
-    contentTypeRepository = module.get<ContentTypeRepository>(
-      ContentTypeRepository,
-    );
+    });
+    [blockService, contentTypeService, contentService, contentTypeRepository] =
+      await getMocks([
+        BlockService,
+        ContentTypeService,
+        ContentService,
+        ContentTypeRepository,
+      ]);
   });
 
-  afterAll(async () => {
-    await closeInMongodConnection();
-  });
+  afterAll(closeInMongodConnection);
 
   afterEach(jest.clearAllMocks);
 
diff --git a/api/src/cms/services/content.service.spec.ts b/api/src/cms/services/content.service.spec.ts
index 901fb8b7..ec2bcd8a 100644
--- a/api/src/cms/services/content.service.spec.ts
+++ b/api/src/cms/services/content.service.spec.ts
@@ -6,13 +6,10 @@
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
 import { OutgoingMessageFormat } from '@/chat/schemas/types/message';
 import { ContentOptions } from '@/chat/schemas/types/options';
-import { LoggerService } from '@/logger/logger.service';
 import { IGNORED_TEST_FIELDS } from '@/utils/test/constants';
 import {
   contentFixtures,
@@ -23,6 +20,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { ContentTypeRepository } from '../repositories/content-type.repository';
 import { ContentRepository } from '../repositories/content.repository';
@@ -38,7 +36,7 @@ describe('ContentService', () => {
   let contentRepository: ContentRepository;
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installContentFixtures),
         MongooseModule.forFeature([ContentTypeModel, ContentModel]),
@@ -48,18 +46,16 @@ describe('ContentService', () => {
         ContentRepository,
         ContentTypeService,
         ContentService,
-        LoggerService,
-        EventEmitter2,
       ],
-    }).compile();
-    contentService = module.get<ContentService>(ContentService);
-    contentTypeService = module.get<ContentTypeService>(ContentTypeService);
-    contentRepository = module.get<ContentRepository>(ContentRepository);
+    });
+    [contentService, contentTypeService, contentRepository] = await getMocks([
+      ContentService,
+      ContentTypeService,
+      ContentRepository,
+    ]);
   });
 
-  afterAll(async () => {
-    await closeInMongodConnection();
-  });
+  afterAll(closeInMongodConnection);
 
   afterEach(jest.clearAllMocks);
 
diff --git a/api/src/cms/services/content.service.ts b/api/src/cms/services/content.service.ts
index a865d99b..6f0ef26a 100644
--- a/api/src/cms/services/content.service.ts
+++ b/api/src/cms/services/content.service.ts
@@ -11,7 +11,6 @@ import Papa from 'papaparse';
 
 import { StdOutgoingListMessage } from '@/chat/schemas/types/message';
 import { ContentOptions } from '@/chat/schemas/types/options';
-import { LoggerService } from '@/logger/logger.service';
 import { BaseService } from '@/utils/generics/base-service';
 import { TFilterQuery } from '@/utils/types/filter.types';
 
@@ -31,10 +30,7 @@ export class ContentService extends BaseService<
   ContentFull,
   ContentDto
 > {
-  constructor(
-    readonly repository: ContentRepository,
-    private readonly logger: LoggerService,
-  ) {
+  constructor(readonly repository: ContentRepository) {
     super(repository);
   }
 
@@ -149,7 +145,7 @@ export class ContentService extends BaseService<
         ...acc,
         {
           title: String(title),
-          status: Boolean(status),
+          status: status.trim().toLowerCase() === 'true',
           entity: targetContentType,
           dynamicFields: Object.keys(rest)
             .filter((key) =>
diff --git a/api/src/cms/services/menu.service.spec.ts b/api/src/cms/services/menu.service.spec.ts
index 40cc2503..5883a4eb 100644
--- a/api/src/cms/services/menu.service.spec.ts
+++ b/api/src/cms/services/menu.service.spec.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -8,11 +8,8 @@
 
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
 import { NotFoundException } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
-import { LoggerService } from '@/logger/logger.service';
 import {
   installMenuFixtures,
   rootMenuFixtures,
@@ -21,6 +18,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { MenuRepository } from '../repositories/menu.repository';
 import { MenuModel } from '../schemas/menu.schema';
@@ -33,7 +31,7 @@ describe('MenuService', () => {
   let menuService: MenuService;
   let menuRepository: MenuRepository;
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installMenuFixtures),
         MongooseModule.forFeature([MenuModel]),
@@ -41,7 +39,6 @@ describe('MenuService', () => {
       providers: [
         MenuRepository,
         MenuService,
-        EventEmitter2,
         {
           provide: CACHE_MANAGER,
           useValue: {
@@ -50,16 +47,16 @@ describe('MenuService', () => {
             set: jest.fn(),
           },
         },
-        LoggerService,
       ],
-    }).compile();
-    menuService = module.get<MenuService>(MenuService);
-    menuRepository = module.get<MenuRepository>(MenuRepository);
-  });
-  afterAll(async () => {
-    await closeInMongodConnection();
+    });
+    [menuService, menuRepository] = await getMocks([
+      MenuService,
+      MenuRepository,
+    ]);
   });
 
+  afterAll(closeInMongodConnection);
+
   afterEach(jest.clearAllMocks);
   describe('create', () => {
     it('should create the menu successfully', async () => {
diff --git a/api/src/extension/cleanup.service.spec.ts b/api/src/extension/cleanup.service.spec.ts
new file mode 100644
index 00000000..f8e97ffb
--- /dev/null
+++ b/api/src/extension/cleanup.service.spec.ts
@@ -0,0 +1,109 @@
+/*
+ * Copyright © 2025 Hexastack. All rights reserved.
+ *
+ * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
+ * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
+ * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
+ */
+
+import { CACHE_MANAGER } from '@nestjs/cache-manager';
+import { MongooseModule } from '@nestjs/mongoose';
+
+import { AttachmentRepository } from '@/attachment/repositories/attachment.repository';
+import { AttachmentModel } from '@/attachment/schemas/attachment.schema';
+import { AttachmentService } from '@/attachment/services/attachment.service';
+import { ChannelService } from '@/channel/channel.service';
+import { SubscriberRepository } from '@/chat/repositories/subscriber.repository';
+import { SubscriberModel } from '@/chat/schemas/subscriber.schema';
+import { SubscriberService } from '@/chat/services/subscriber.service';
+import LocalStorageHelper from '@/extensions/helpers/local-storage/index.helper';
+import { HelperService } from '@/helper/helper.service';
+import { LoggerService } from '@/logger/logger.service';
+import { SettingRepository } from '@/setting/repositories/setting.repository';
+import { Setting, SettingModel } from '@/setting/schemas/setting.schema';
+import { SettingSeeder } from '@/setting/seeds/setting.seed';
+import { SettingService } from '@/setting/services/setting.service';
+import { installSettingFixtures } from '@/utils/test/fixtures/setting';
+import {
+  closeInMongodConnection,
+  rootMongooseTestModule,
+} from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
+
+import { CleanupService } from './cleanup.service';
+import { TNamespace } from './types';
+
+describe('CleanupService', () => {
+  let initialSettings: Setting[];
+  let helperService: HelperService;
+  let cleanupService: CleanupService;
+  let settingService: SettingService;
+
+  beforeAll(async () => {
+    const { getMocks, resolveMocks } = await buildTestingMocks({
+      imports: [
+        rootMongooseTestModule(installSettingFixtures),
+        MongooseModule.forFeature([
+          SettingModel,
+          SubscriberModel,
+          AttachmentModel,
+        ]),
+      ],
+      providers: [
+        CleanupService,
+        HelperService,
+        SettingService,
+        SettingRepository,
+        {
+          provide: CACHE_MANAGER,
+          useValue: {
+            del: jest.fn(),
+            get: jest.fn(),
+            set: jest.fn(),
+          },
+        },
+        SettingSeeder,
+        SubscriberService,
+        SubscriberRepository,
+        AttachmentService,
+        AttachmentRepository,
+        ChannelService,
+      ],
+    });
+    [cleanupService, settingService, helperService] = await getMocks([
+      CleanupService,
+      SettingService,
+      HelperService,
+    ]);
+
+    const [loggerService] = await resolveMocks([LoggerService]);
+    initialSettings = await settingService.findAll();
+
+    helperService.register(
+      new LocalStorageHelper(settingService, helperService, loggerService),
+    );
+  });
+
+  afterAll(closeInMongodConnection);
+
+  afterEach(jest.clearAllMocks);
+
+  describe('delete', () => {
+    it('should delete all the unregistered settings with a group suffix `_channel` or/and `_helper`', async () => {
+      const registeredNamespaces = [
+        ...cleanupService.getChannelNamespaces(),
+        ...cleanupService.getHelperNamespaces(),
+      ];
+
+      await cleanupService.pruneExtensionSettings();
+      const cleanSettings = await settingService.findAll();
+      const filteredSettings = initialSettings.filter(
+        ({ group }) =>
+          !/_(channel|helper)$/.test(group) !==
+          registeredNamespaces.includes(group as TNamespace),
+      );
+
+      expect(cleanSettings).toEqualPayload(filteredSettings);
+    });
+  });
+});
diff --git a/api/src/extension/cleanup.service.ts b/api/src/extension/cleanup.service.ts
new file mode 100644
index 00000000..62335ab0
--- /dev/null
+++ b/api/src/extension/cleanup.service.ts
@@ -0,0 +1,86 @@
+/*
+ * Copyright © 2025 Hexastack. All rights reserved.
+ *
+ * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
+ * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
+ * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
+ */
+
+import { Injectable } from '@nestjs/common';
+
+import { ChannelService } from '@/channel/channel.service';
+import { HelperService } from '@/helper/helper.service';
+import { LoggerService } from '@/logger/logger.service';
+import { SettingService } from '@/setting/services/setting.service';
+import { DeleteResult } from '@/utils/generics/base-repository';
+
+import { TCriteria, TExtractExtension, TExtractNamespace } from './types';
+
+@Injectable()
+export class CleanupService {
+  constructor(
+    private readonly helperService: HelperService,
+    private readonly loggerService: LoggerService,
+    private readonly settingService: SettingService,
+    private readonly channelService: ChannelService,
+  ) {}
+
+  /**
+   * Deletes unused settings with the specified criteria.
+   *
+   * @param criteria - An array of criteria objects containing:
+   *                   - suffix: Regex pattern to match setting groups
+   *                   - namespaces: Array of namespaces to exclude from deletion
+   * @returns A promise that resolves to the result of the deletion operation.
+   */
+  private async deleteManyBySuffixAndNamespaces(
+    criteria: TCriteria[],
+  ): Promise<DeleteResult> {
+    return await this.settingService.deleteMany({
+      $or: criteria.map(({ suffix, namespaces }) => ({
+        group: { $regex: new RegExp(`${suffix}$`), $nin: namespaces },
+      })),
+    });
+  }
+
+  /**
+   * Retrieves a list of channel Namespaces.
+   *
+   * @returns An array of channel Namespaces.
+   */
+  public getChannelNamespaces(): TExtractNamespace<'channel'>[] {
+    return this.channelService
+      .getAll()
+      .map((channel) => channel.getNamespace<TExtractExtension<'channel'>>());
+  }
+
+  /**
+   * Retrieves a list of helper Namespaces.
+   *
+   * @returns An array of helper Namespaces.
+   */
+  public getHelperNamespaces(): TExtractNamespace<'helper'>[] {
+    return this.helperService
+      .getAll()
+      .map((helper) => helper.getNamespace<TExtractExtension<'helper'>>());
+  }
+
+  /**
+   * Prune extensions unused settings.
+   *
+   */
+  public async pruneExtensionSettings(): Promise<void> {
+    const channels = this.getChannelNamespaces();
+    const helpers = this.getHelperNamespaces();
+    const { deletedCount } = await this.deleteManyBySuffixAndNamespaces([
+      { suffix: '_channel', namespaces: channels },
+      { suffix: '_helper', namespaces: helpers },
+    ]);
+
+    if (deletedCount > 0) {
+      this.loggerService.log(
+        `${deletedCount} unused setting${deletedCount === 1 ? '' : 's'} ${deletedCount === 1 ? 'is' : 'are'} successfully deleted!`,
+      );
+    }
+  }
+}
diff --git a/api/src/extension/extension.module.ts b/api/src/extension/extension.module.ts
new file mode 100644
index 00000000..8d43c8ab
--- /dev/null
+++ b/api/src/extension/extension.module.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2025 Hexastack. All rights reserved.
+ *
+ * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
+ * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
+ * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
+ */
+
+import { Global, Module, OnApplicationBootstrap } from '@nestjs/common';
+
+import { LoggerService } from '@/logger/logger.service';
+
+import { CleanupService } from './cleanup.service';
+
+@Global()
+@Module({
+  providers: [CleanupService],
+  exports: [CleanupService],
+})
+export class ExtensionModule implements OnApplicationBootstrap {
+  constructor(
+    private readonly loggerService: LoggerService,
+    private readonly cleanupService: CleanupService,
+  ) {}
+
+  async onApplicationBootstrap() {
+    try {
+      await this.cleanupService.pruneExtensionSettings();
+    } catch (error) {
+      this.loggerService.error('Unable to delete unused settings', error);
+    }
+  }
+}
diff --git a/api/src/extension/types.ts b/api/src/extension/types.ts
new file mode 100644
index 00000000..2514c1c8
--- /dev/null
+++ b/api/src/extension/types.ts
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2025 Hexastack. All rights reserved.
+ *
+ * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
+ * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
+ * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
+ */
+
+import { ExtensionName } from '@/utils/types/extension';
+
+type TExcludedExtension = 'plugin';
+
+type TExcludeSuffix<
+  T,
+  S extends string = '_',
+  Suffix extends string = `${S}${TExcludedExtension}`,
+> = T extends `${infer _Base}${Suffix}` ? never : T;
+
+export type TExtensionName = TExcludeSuffix<ExtensionName, '-'>;
+
+export type TExtension =
+  Extract<TExtensionName, `${string}-${string}`> extends `${string}-${infer S}`
+    ? `${S}`
+    : never;
+
+export type TNamespace = HyphenToUnderscore<TExtensionName>;
+
+export type TExtractNamespace<
+  T extends TExtension = TExtension,
+  M extends TExtensionName = TExtensionName,
+> = M extends `${string}${T}` ? HyphenToUnderscore<M> : never;
+
+export type TExtractExtension<
+  T extends TExtension = TExtension,
+  M extends TExtensionName = TExtensionName,
+> = M extends `${string}${T}` ? M : never;
+
+export type TCriteria = {
+  suffix: `_${TExtension}`;
+  namespaces: TNamespace[];
+};
diff --git a/api/src/extensions/channels/web/__test__/index.spec.ts b/api/src/extensions/channels/web/__test__/index.spec.ts
index 548f2969..a977b03b 100644
--- a/api/src/extensions/channels/web/__test__/index.spec.ts
+++ b/api/src/extensions/channels/web/__test__/index.spec.ts
@@ -7,10 +7,8 @@
  */
 
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { JwtModule } from '@nestjs/jwt';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 import { Request } from 'express';
 
 import { AttachmentRepository } from '@/attachment/repositories/attachment.repository';
@@ -36,7 +34,6 @@ import { MenuRepository } from '@/cms/repositories/menu.repository';
 import { MenuModel } from '@/cms/schemas/menu.schema';
 import { MenuService } from '@/cms/services/menu.service';
 import { I18nService } from '@/i18n/services/i18n.service';
-import { LoggerService } from '@/logger/logger.service';
 import { SettingService } from '@/setting/services/setting.service';
 import { UserModel } from '@/user/schemas/user.schema';
 import { installMessageFixtures } from '@/utils/test/fixtures/message';
@@ -44,6 +41,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 import { SocketEventDispatcherService } from '@/websocket/services/socket-event-dispatcher.service';
 import { SocketRequest } from '@/websocket/utils/socket-request';
 import { SocketResponse } from '@/websocket/utils/socket-response';
@@ -66,7 +64,7 @@ describe('WebChannelHandler', () => {
   const webSettings = {};
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(async () => {
           await installMessageFixtures();
@@ -105,8 +103,6 @@ describe('WebChannelHandler', () => {
         MenuService,
         MenuRepository,
         WebChannelHandler,
-        EventEmitter2,
-        LoggerService,
         {
           provide: I18nService,
           useValue: {
@@ -122,9 +118,11 @@ describe('WebChannelHandler', () => {
           },
         },
       ],
-    }).compile();
-    subscriberService = module.get<SubscriberService>(SubscriberService);
-    handler = module.get<WebChannelHandler>(WebChannelHandler);
+    });
+    [subscriberService, handler] = await getMocks([
+      SubscriberService,
+      WebChannelHandler,
+    ]);
 
     jest
       .spyOn(handler, 'getPublicUrl')
diff --git a/api/src/extensions/channels/web/__test__/wrapper.spec.ts b/api/src/extensions/channels/web/__test__/wrapper.spec.ts
index d219834b..4f6d5ca7 100644
--- a/api/src/extensions/channels/web/__test__/wrapper.spec.ts
+++ b/api/src/extensions/channels/web/__test__/wrapper.spec.ts
@@ -7,10 +7,8 @@
  */
 
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { JwtModule } from '@nestjs/jwt';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
 import { AttachmentRepository } from '@/attachment/repositories/attachment.repository';
 import {
@@ -33,7 +31,6 @@ import { MenuRepository } from '@/cms/repositories/menu.repository';
 import { MenuModel } from '@/cms/schemas/menu.schema';
 import { MenuService } from '@/cms/services/menu.service';
 import { I18nService } from '@/i18n/services/i18n.service';
-import { LoggerService } from '@/logger/logger.service';
 import { NlpService } from '@/nlp/services/nlp.service';
 import { SettingService } from '@/setting/services/setting.service';
 import { installSubscriberFixtures } from '@/utils/test/fixtures/subscriber';
@@ -41,6 +38,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 import { SocketEventDispatcherService } from '@/websocket/services/socket-event-dispatcher.service';
 import { WebsocketGateway } from '@/websocket/websocket.gateway';
 
@@ -54,11 +52,9 @@ describe(`Web event wrapper`, () => {
   let handler: WebChannelHandler;
   const webSettings = {};
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
-        rootMongooseTestModule(async () => {
-          await installSubscriberFixtures();
-        }),
+        rootMongooseTestModule(installSubscriberFixtures),
         MongooseModule.forFeature([
           SubscriberModel,
           AttachmentModel,
@@ -97,8 +93,6 @@ describe(`Web event wrapper`, () => {
         MenuService,
         MenuRepository,
         WebChannelHandler,
-        EventEmitter2,
-        LoggerService,
         {
           provide: I18nService,
           useValue: {
@@ -114,8 +108,8 @@ describe(`Web event wrapper`, () => {
           },
         },
       ],
-    }).compile();
-    handler = module.get<WebChannelHandler>(WebChannelHandler);
+    });
+    [handler] = await getMocks([WebChannelHandler]);
   });
 
   afterAll(async () => {
diff --git a/api/src/i18n/controllers/language.controller.spec.ts b/api/src/i18n/controllers/language.controller.spec.ts
index e8aaf8df..d2c29039 100644
--- a/api/src/i18n/controllers/language.controller.spec.ts
+++ b/api/src/i18n/controllers/language.controller.spec.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -8,12 +8,9 @@
 
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
 import { BadRequestException } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test } from '@nestjs/testing';
 
 import { I18nService } from '@/i18n/services/i18n.service';
-import { LoggerService } from '@/logger/logger.service';
 import { NOT_FOUND_ID } from '@/utils/constants/mock';
 import { getUpdateOneError } from '@/utils/test/errors/messages';
 import {
@@ -25,6 +22,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { LanguageUpdateDto } from '../dto/language.dto';
 import { LanguageRepository } from '../repositories/language.repository';
@@ -39,7 +37,7 @@ describe('LanguageController', () => {
   let language: Language;
 
   beforeAll(async () => {
-    const module = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installLanguageFixtures),
         MongooseModule.forFeature([LanguageModel]),
@@ -48,7 +46,6 @@ describe('LanguageController', () => {
         LanguageController,
         LanguageService,
         LanguageRepository,
-        LoggerService,
         {
           provide: I18nService,
           useValue: {
@@ -64,12 +61,12 @@ describe('LanguageController', () => {
             set: jest.fn(),
           },
         },
-        LoggerService,
-        EventEmitter2,
       ],
-    }).compile();
-    languageService = module.get<LanguageService>(LanguageService);
-    languageController = module.get<LanguageController>(LanguageController);
+    });
+    [languageService, languageController] = await getMocks([
+      LanguageService,
+      LanguageController,
+    ]);
     language = (await languageService.findOne({ code: 'en' })) as Language;
   });
 
diff --git a/api/src/i18n/controllers/language.controller.ts b/api/src/i18n/controllers/language.controller.ts
index cfbaffea..dd71b5de 100644
--- a/api/src/i18n/controllers/language.controller.ts
+++ b/api/src/i18n/controllers/language.controller.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -23,7 +23,6 @@ import {
 import { CsrfCheck } from '@tekuconcept/nestjs-csrf';
 
 import { CsrfInterceptor } from '@/interceptors/csrf.interceptor';
-import { LoggerService } from '@/logger/logger.service';
 import { BaseController } from '@/utils/generics/base-controller';
 import { DeleteResult } from '@/utils/generics/base-repository';
 import { PageQueryDto } from '@/utils/pagination/pagination-query.dto';
@@ -38,10 +37,7 @@ import { LanguageService } from '../services/language.service';
 @UseInterceptors(CsrfInterceptor)
 @Controller('language')
 export class LanguageController extends BaseController<Language> {
-  constructor(
-    private readonly languageService: LanguageService,
-    private readonly logger: LoggerService,
-  ) {
+  constructor(private readonly languageService: LanguageService) {
     super(languageService);
   }
 
diff --git a/api/src/i18n/controllers/translation.controller.spec.ts b/api/src/i18n/controllers/translation.controller.spec.ts
index 70fbdcf0..06dabf28 100644
--- a/api/src/i18n/controllers/translation.controller.spec.ts
+++ b/api/src/i18n/controllers/translation.controller.spec.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,9 +7,7 @@
  */
 
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test } from '@nestjs/testing';
 
 import { AttachmentRepository } from '@/attachment/repositories/attachment.repository';
 import { AttachmentModel } from '@/attachment/schemas/attachment.schema';
@@ -32,7 +30,6 @@ import { MenuModel } from '@/cms/schemas/menu.schema';
 import { ContentService } from '@/cms/services/content.service';
 import { MenuService } from '@/cms/services/menu.service';
 import { I18nService } from '@/i18n/services/i18n.service';
-import { LoggerService } from '@/logger/logger.service';
 import { NlpService } from '@/nlp/services/nlp.service';
 import { PluginService } from '@/plugins/plugins.service';
 import { SettingService } from '@/setting/services/setting.service';
@@ -47,6 +44,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { TranslationUpdateDto } from '../dto/translation.dto';
 import { LanguageRepository } from '../repositories/language.repository';
@@ -64,7 +62,7 @@ describe('TranslationController', () => {
   let translation: Translation;
 
   beforeAll(async () => {
-    const module = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       controllers: [MessageController],
       imports: [
         rootMongooseTestModule(installTranslationFixtures),
@@ -115,8 +113,6 @@ describe('TranslationController', () => {
           provide: PluginService,
           useValue: {},
         },
-        EventEmitter2,
-        LoggerService,
         {
           provide: I18nService,
           useValue: {
@@ -132,15 +128,14 @@ describe('TranslationController', () => {
             set: jest.fn(),
           },
         },
-        LoggerService,
         LanguageService,
         LanguageRepository,
       ],
-    }).compile();
-    translationService = module.get<TranslationService>(TranslationService);
-    translationController = module.get<TranslationController>(
+    });
+    [translationService, translationController] = await getMocks([
+      TranslationService,
       TranslationController,
-    );
+    ]);
     translation = (await translationService.findOne({
       str: 'Welcome',
     })) as Translation;
diff --git a/api/src/i18n/controllers/translation.controller.ts b/api/src/i18n/controllers/translation.controller.ts
index 50b09717..98c5e70b 100644
--- a/api/src/i18n/controllers/translation.controller.ts
+++ b/api/src/i18n/controllers/translation.controller.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -23,8 +23,6 @@ import {
 import { CsrfCheck } from '@tekuconcept/nestjs-csrf';
 
 import { CsrfInterceptor } from '@/interceptors/csrf.interceptor';
-import { LoggerService } from '@/logger/logger.service';
-import { SettingService } from '@/setting/services/setting.service';
 import { BaseController } from '@/utils/generics/base-controller';
 import { DeleteResult } from '@/utils/generics/base-repository';
 import { PageQueryDto } from '@/utils/pagination/pagination-query.dto';
@@ -43,8 +41,6 @@ export class TranslationController extends BaseController<Translation> {
   constructor(
     private readonly languageService: LanguageService,
     private readonly translationService: TranslationService,
-    private readonly settingService: SettingService,
-    private readonly logger: LoggerService,
   ) {
     super(translationService);
   }
diff --git a/api/src/i18n/repositories/language.repository.ts b/api/src/i18n/repositories/language.repository.ts
index a3d5cfd4..09128054 100644
--- a/api/src/i18n/repositories/language.repository.ts
+++ b/api/src/i18n/repositories/language.repository.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,7 +7,6 @@
  */
 
 import { Injectable } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
 import { Document, Model, Query } from 'mongoose';
 
@@ -24,11 +23,8 @@ export class LanguageRepository extends BaseRepository<
   never,
   LanguageDto
 > {
-  constructor(
-    readonly eventEmitter: EventEmitter2,
-    @InjectModel(Language.name) readonly model: Model<Language>,
-  ) {
-    super(eventEmitter, model, Language);
+  constructor(@InjectModel(Language.name) readonly model: Model<Language>) {
+    super(model, Language);
   }
 
   /**
diff --git a/api/src/i18n/repositories/translation.repository.ts b/api/src/i18n/repositories/translation.repository.ts
index a25eb12b..6681c2e6 100644
--- a/api/src/i18n/repositories/translation.repository.ts
+++ b/api/src/i18n/repositories/translation.repository.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,7 +7,6 @@
  */
 
 import { Injectable } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
@@ -18,9 +17,8 @@ import { Translation } from '../../i18n/schemas/translation.schema';
 @Injectable()
 export class TranslationRepository extends BaseRepository<Translation> {
   constructor(
-    readonly eventEmitter: EventEmitter2,
     @InjectModel(Translation.name) readonly model: Model<Translation>,
   ) {
-    super(eventEmitter, model, Translation);
+    super(model, Translation);
   }
 }
diff --git a/api/src/i18n/services/language.service.ts b/api/src/i18n/services/language.service.ts
index 0a7425d5..6b82eb47 100644
--- a/api/src/i18n/services/language.service.ts
+++ b/api/src/i18n/services/language.service.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -15,7 +15,6 @@ import {
 } from '@nestjs/common';
 import { Cache } from 'cache-manager';
 
-import { LoggerService } from '@/logger/logger.service';
 import {
   DEFAULT_LANGUAGE_CACHE_KEY,
   LANGUAGES_CACHE_KEY,
@@ -37,7 +36,6 @@ export class LanguageService extends BaseService<
   constructor(
     readonly repository: LanguageRepository,
     @Inject(CACHE_MANAGER) private readonly cacheManager: Cache,
-    private readonly logger: LoggerService,
   ) {
     super(repository);
   }
diff --git a/api/src/i18n/services/translation.service.spec.ts b/api/src/i18n/services/translation.service.spec.ts
index 6103d0ef..50ea4b15 100644
--- a/api/src/i18n/services/translation.service.spec.ts
+++ b/api/src/i18n/services/translation.service.spec.ts
@@ -6,15 +6,13 @@
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
-import { Test, TestingModule } from '@nestjs/testing';
-
 import { I18nService } from '@/i18n/services/i18n.service';
 import { BasePlugin } from '@/plugins/base-plugin.service';
 import { PluginService } from '@/plugins/plugins.service';
 import { PluginBlockTemplate } from '@/plugins/types';
 import { SettingType } from '@/setting/schemas/types';
 import { SettingService } from '@/setting/services/setting.service';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { Block } from '../../chat/schemas/block.schema';
 import { BlockOptions } from '../../chat/schemas/types/options';
@@ -24,11 +22,11 @@ import { TranslationService } from '../services/translation.service';
 
 describe('TranslationService', () => {
   let service: TranslationService;
-  let i18nService: I18nService;
+  let i18nService: I18nService<unknown>;
   let pluginService: PluginService;
 
   beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       providers: [
         TranslationService,
         {
@@ -106,13 +104,13 @@ describe('TranslationService', () => {
             refreshDynamicTranslations: jest.fn(),
           },
         },
-        EventEmitter2,
       ],
-    }).compile();
-
-    service = module.get<TranslationService>(TranslationService);
-    i18nService = module.get<I18nService>(I18nService);
-    pluginService = module.get<PluginService>(PluginService);
+    });
+    [service, i18nService, pluginService] = await getMocks([
+      TranslationService,
+      I18nService,
+      PluginService,
+    ]);
   });
 
   it('should call refreshDynamicTranslations with translations from findAll', async () => {
diff --git a/api/src/i18n/services/translation.service.ts b/api/src/i18n/services/translation.service.ts
index c2adddd8..64a6a1c0 100644
--- a/api/src/i18n/services/translation.service.ts
+++ b/api/src/i18n/services/translation.service.ts
@@ -12,6 +12,7 @@ import { OnEvent } from '@nestjs/event-emitter';
 import { I18nService } from '@/i18n/services/i18n.service';
 import { PluginService } from '@/plugins/plugins.service';
 import { PluginType } from '@/plugins/types';
+import { SettingType } from '@/setting/schemas/types';
 import { SettingService } from '@/setting/services/setting.service';
 import { BaseService } from '@/utils/generics/base-service';
 
@@ -57,21 +58,35 @@ export class TranslationService extends BaseService<Translation> {
           PluginType.block,
           block.message.plugin,
         );
-        const defaultSettings = await plugin?.getDefaultSettings();
+        const defaultSettings = (await plugin?.getDefaultSettings()) || [];
+        const filteredSettings = defaultSettings.filter(
+          ({ translatable, type }) =>
+            [
+              SettingType.text,
+              SettingType.textarea,
+              SettingType.multiple_text,
+            ].includes(type) &&
+            (translatable === undefined || translatable === true),
+        );
+        const settingTypeMap = new Map(
+          filteredSettings.map((setting) => [setting.label, setting.type]),
+        );
 
-        // plugin
-        Object.entries(block.message.args).forEach(([l, arg]) => {
-          const setting = defaultSettings?.find(({ label }) => label === l);
-          if (setting?.translatable) {
-            if (Array.isArray(arg)) {
-              // array of text
-              strings = strings.concat(arg);
-            } else if (typeof arg === 'string') {
-              // text
-              strings.push(arg);
-            }
+        for (const [key, value] of Object.entries(block.message.args)) {
+          const settingType = settingTypeMap.get(key);
+
+          switch (settingType) {
+            case SettingType.multiple_text:
+              strings = strings.concat(value);
+              break;
+            case SettingType.text:
+            case SettingType.textarea:
+              strings.push(value);
+              break;
+            default:
+              break;
           }
-        });
+        }
       } else if ('text' in block.message && Array.isArray(block.message.text)) {
         // array of text
         strings = strings.concat(block.message.text);
diff --git a/api/src/migration/migration.service.spec.ts b/api/src/migration/migration.service.spec.ts
index 1abd7464..d58ddcbf 100644
--- a/api/src/migration/migration.service.spec.ts
+++ b/api/src/migration/migration.service.spec.ts
@@ -10,9 +10,7 @@ import fs from 'fs';
 
 import { HttpService } from '@nestjs/axios';
 import { ModuleRef } from '@nestjs/core';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { getModelToken, MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
 import { AttachmentService } from '@/attachment/services/attachment.service';
 import { LoggerService } from '@/logger/logger.service';
@@ -23,6 +21,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { Migration, MigrationModel } from './migration.schema';
 import { MigrationService } from './migration.service';
@@ -34,7 +33,7 @@ describe('MigrationService', () => {
   let metadataService: MetadataService;
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks, resolveMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(async () => await Promise.resolve()),
         MongooseModule.forFeature([MetadataModel, MigrationModel]),
@@ -43,7 +42,6 @@ describe('MigrationService', () => {
         MetadataRepository,
         MetadataService,
         MigrationService,
-        EventEmitter2,
         {
           provide: LoggerService,
           useValue: {
@@ -74,11 +72,12 @@ describe('MigrationService', () => {
           useValue: jest.fn(),
         },
       ],
-    }).compile();
-
-    service = module.get<MigrationService>(MigrationService);
-    loggerService = await module.resolve<LoggerService>(LoggerService);
-    metadataService = module.get<MetadataService>(MetadataService);
+    });
+    [service, metadataService] = await getMocks([
+      MigrationService,
+      MetadataService,
+    ]);
+    [loggerService] = await resolveMocks([LoggerService]);
   });
 
   afterEach(jest.clearAllMocks);
diff --git a/api/src/nlp/controllers/nlp-entity.controller.spec.ts b/api/src/nlp/controllers/nlp-entity.controller.spec.ts
index d678dcac..c1334ef9 100644
--- a/api/src/nlp/controllers/nlp-entity.controller.spec.ts
+++ b/api/src/nlp/controllers/nlp-entity.controller.spec.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -11,11 +11,8 @@ import {
   MethodNotAllowedException,
   NotFoundException,
 } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
-import { LoggerService } from '@/logger/logger.service';
 import { IGNORED_TEST_FIELDS } from '@/utils/test/constants';
 import { nlpEntityFixtures } from '@/utils/test/fixtures/nlpentity';
 import {
@@ -28,6 +25,7 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 import { TFixtures } from '@/utils/test/types';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { NlpEntityCreateDto } from '../dto/nlp-entity.dto';
 import { NlpEntityRepository } from '../repositories/nlp-entity.repository';
@@ -53,7 +51,7 @@ describe('NlpEntityController', () => {
   let buitInEntityId: string | null;
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       controllers: [NlpEntityController],
       imports: [
         rootMongooseTestModule(installNlpValueFixtures),
@@ -64,19 +62,18 @@ describe('NlpEntityController', () => {
         ]),
       ],
       providers: [
-        LoggerService,
         NlpEntityService,
         NlpEntityRepository,
         NlpValueService,
         NlpSampleEntityRepository,
         NlpValueRepository,
-        EventEmitter2,
       ],
-    }).compile();
-    nlpEntityController = module.get<NlpEntityController>(NlpEntityController);
-    nlpValueService = module.get<NlpValueService>(NlpValueService);
-    nlpEntityService = module.get<NlpEntityService>(NlpEntityService);
-
+    });
+    [nlpEntityController, nlpValueService, nlpEntityService] = await getMocks([
+      NlpEntityController,
+      NlpValueService,
+      NlpEntityService,
+    ]);
     intentEntityId =
       (
         await nlpEntityService.findOne({
@@ -90,9 +87,8 @@ describe('NlpEntityController', () => {
         })
       )?.id || null;
   });
-  afterAll(async () => {
-    await closeInMongodConnection();
-  });
+
+  afterAll(closeInMongodConnection);
 
   afterEach(jest.clearAllMocks);
 
diff --git a/api/src/nlp/controllers/nlp-entity.controller.ts b/api/src/nlp/controllers/nlp-entity.controller.ts
index 4f7ce1a1..0adbce59 100644
--- a/api/src/nlp/controllers/nlp-entity.controller.ts
+++ b/api/src/nlp/controllers/nlp-entity.controller.ts
@@ -25,7 +25,6 @@ import {
 import { CsrfCheck } from '@tekuconcept/nestjs-csrf';
 
 import { CsrfInterceptor } from '@/interceptors/csrf.interceptor';
-import { LoggerService } from '@/logger/logger.service';
 import { BaseController } from '@/utils/generics/base-controller';
 import { DeleteResult } from '@/utils/generics/base-repository';
 import { PageQueryDto } from '@/utils/pagination/pagination-query.dto';
@@ -51,10 +50,7 @@ export class NlpEntityController extends BaseController<
   NlpEntityPopulate,
   NlpEntityFull
 > {
-  constructor(
-    private readonly nlpEntityService: NlpEntityService,
-    private readonly logger: LoggerService,
-  ) {
+  constructor(private readonly nlpEntityService: NlpEntityService) {
     super(nlpEntityService);
   }
 
diff --git a/api/src/nlp/controllers/nlp-sample.controller.spec.ts b/api/src/nlp/controllers/nlp-sample.controller.spec.ts
index 2e82b180..4da14ed0 100644
--- a/api/src/nlp/controllers/nlp-sample.controller.spec.ts
+++ b/api/src/nlp/controllers/nlp-sample.controller.spec.ts
@@ -8,16 +8,13 @@
 
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
 import { BadRequestException, NotFoundException } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
 import { HelperService } from '@/helper/helper.service';
 import { LanguageRepository } from '@/i18n/repositories/language.repository';
 import { Language, LanguageModel } from '@/i18n/schemas/language.schema';
 import { I18nService } from '@/i18n/services/i18n.service';
 import { LanguageService } from '@/i18n/services/language.service';
-import { LoggerService } from '@/logger/logger.service';
 import { SettingRepository } from '@/setting/repositories/setting.repository';
 import { SettingModel } from '@/setting/schemas/setting.schema';
 import { SettingSeeder } from '@/setting/seeds/setting.seed';
@@ -32,6 +29,7 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 import { TFixtures } from '@/utils/test/types';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { NlpSampleDto } from '../dto/nlp-sample.dto';
 import { NlpEntityRepository } from '../repositories/nlp-entity.repository';
@@ -65,7 +63,7 @@ describe('NlpSampleController', () => {
   let languages: Language[];
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       controllers: [NlpSampleController],
       imports: [
         rootMongooseTestModule(async () => {
@@ -82,7 +80,6 @@ describe('NlpSampleController', () => {
         ]),
       ],
       providers: [
-        LoggerService,
         NlpSampleRepository,
         NlpSampleEntityRepository,
         NlpEntityService,
@@ -93,7 +90,6 @@ describe('NlpSampleController', () => {
         NlpSampleEntityService,
         LanguageRepository,
         LanguageService,
-        EventEmitter2,
         HelperService,
         SettingRepository,
         SettingService,
@@ -113,26 +109,32 @@ describe('NlpSampleController', () => {
           },
         },
       ],
-    }).compile();
-    nlpSampleController = module.get<NlpSampleController>(NlpSampleController);
-    nlpSampleEntityService = module.get<NlpSampleEntityService>(
+    });
+    [
+      nlpSampleController,
+      nlpSampleEntityService,
+      nlpSampleService,
+      nlpEntityService,
+      nlpValueService,
+      languageService,
+    ] = await getMocks([
+      NlpSampleController,
       NlpSampleEntityService,
-    );
-    nlpSampleService = module.get<NlpSampleService>(NlpSampleService);
-    nlpEntityService = module.get<NlpEntityService>(NlpEntityService);
-    nlpValueService = module.get<NlpValueService>(NlpValueService);
+      NlpSampleService,
+      NlpEntityService,
+      NlpValueService,
+      LanguageService,
+    ]);
     byeJhonSampleId =
       (
         await nlpSampleService.findOne({
           text: 'Bye Jhon',
         })
       )?.id || null;
-    languageService = module.get<LanguageService>(LanguageService);
     languages = await languageService.findAll();
   });
-  afterAll(async () => {
-    await closeInMongodConnection();
-  });
+
+  afterAll(closeInMongodConnection);
 
   afterEach(jest.clearAllMocks);
 
diff --git a/api/src/nlp/controllers/nlp-sample.controller.ts b/api/src/nlp/controllers/nlp-sample.controller.ts
index 2be1351b..949e8e86 100644
--- a/api/src/nlp/controllers/nlp-sample.controller.ts
+++ b/api/src/nlp/controllers/nlp-sample.controller.ts
@@ -34,7 +34,6 @@ import { HelperService } from '@/helper/helper.service';
 import { HelperType } from '@/helper/types';
 import { LanguageService } from '@/i18n/services/language.service';
 import { CsrfInterceptor } from '@/interceptors/csrf.interceptor';
-import { LoggerService } from '@/logger/logger.service';
 import { BaseController } from '@/utils/generics/base-controller';
 import { DeleteResult } from '@/utils/generics/base-repository';
 import { PageQueryDto } from '@/utils/pagination/pagination-query.dto';
@@ -68,7 +67,6 @@ export class NlpSampleController extends BaseController<
     private readonly nlpSampleService: NlpSampleService,
     private readonly nlpSampleEntityService: NlpSampleEntityService,
     private readonly nlpEntityService: NlpEntityService,
-    private readonly logger: LoggerService,
     private readonly languageService: LanguageService,
     private readonly helperService: HelperService,
   ) {
diff --git a/api/src/nlp/controllers/nlp-value.controller.spec.ts b/api/src/nlp/controllers/nlp-value.controller.spec.ts
index 9108cf97..a72b8571 100644
--- a/api/src/nlp/controllers/nlp-value.controller.spec.ts
+++ b/api/src/nlp/controllers/nlp-value.controller.spec.ts
@@ -7,23 +7,18 @@
  */
 
 import { BadRequestException, NotFoundException } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
-import { LoggerService } from '@/logger/logger.service';
 import { getUpdateOneError } from '@/utils/test/errors/messages';
-import { nlpEntityFixtures } from '@/utils/test/fixtures/nlpentity';
 import {
   installNlpValueFixtures,
   nlpValueFixtures,
 } from '@/utils/test/fixtures/nlpvalue';
-import { getPageQuery } from '@/utils/test/pagination';
 import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
-import { TFixtures } from '@/utils/test/types';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { NlpValueCreateDto } from '../dto/nlp-value.dto';
 import { NlpEntityRepository } from '../repositories/nlp-entity.repository';
@@ -31,11 +26,7 @@ import { NlpSampleEntityRepository } from '../repositories/nlp-sample-entity.rep
 import { NlpValueRepository } from '../repositories/nlp-value.repository';
 import { NlpEntityModel } from '../schemas/nlp-entity.schema';
 import { NlpSampleEntityModel } from '../schemas/nlp-sample-entity.schema';
-import {
-  NlpValue,
-  NlpValueFull,
-  NlpValueModel,
-} from '../schemas/nlp-value.schema';
+import { NlpValue, NlpValueModel } from '../schemas/nlp-value.schema';
 import { NlpEntityService } from '../services/nlp-entity.service';
 import { NlpValueService } from '../services/nlp-value.service';
 
@@ -50,7 +41,7 @@ describe('NlpValueController', () => {
   let negativeValue: NlpValue | null;
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       controllers: [NlpValueController],
       imports: [
         rootMongooseTestModule(installNlpValueFixtures),
@@ -61,85 +52,27 @@ describe('NlpValueController', () => {
         ]),
       ],
       providers: [
-        LoggerService,
         NlpValueRepository,
         NlpValueService,
         NlpSampleEntityRepository,
         NlpEntityService,
         NlpEntityRepository,
-        EventEmitter2,
       ],
-    }).compile();
-    nlpValueController = module.get<NlpValueController>(NlpValueController);
-    nlpValueService = module.get<NlpValueService>(NlpValueService);
-    nlpEntityService = module.get<NlpEntityService>(NlpEntityService);
+    });
+    [nlpValueController, nlpValueService, nlpEntityService] = await getMocks([
+      NlpValueController,
+      NlpValueService,
+      NlpEntityService,
+    ]);
     jhonNlpValue = await nlpValueService.findOne({ value: 'jhon' });
     positiveValue = await nlpValueService.findOne({ value: 'positive' });
     negativeValue = await nlpValueService.findOne({ value: 'negative' });
   });
-  afterAll(async () => {
-    await closeInMongodConnection();
-  });
+
+  afterAll(closeInMongodConnection);
 
   afterEach(jest.clearAllMocks);
 
-  describe('findPage', () => {
-    it('should find nlp Values, and foreach nlp value populate the corresponding entity', async () => {
-      const pageQuery = getPageQuery<NlpValue>({
-        sort: ['value', 'desc'],
-      });
-      const result = await nlpValueController.findPage(
-        pageQuery,
-        ['entity'],
-        {},
-      );
-
-      const nlpValueFixturesWithEntities = nlpValueFixtures.reduce(
-        (acc, curr) => {
-          acc.push({
-            ...curr,
-            entity: nlpEntityFixtures[
-              parseInt(curr.entity!)
-            ] as NlpValueFull['entity'],
-            builtin: curr.builtin!,
-            expressions: curr.expressions!,
-            metadata: curr.metadata!,
-          });
-          return acc;
-        },
-        [] as TFixtures<NlpValueFull>[],
-      );
-      expect(result).toEqualPayload(nlpValueFixturesWithEntities);
-    });
-
-    it('should find nlp Values', async () => {
-      const pageQuery = getPageQuery<NlpValue>({
-        sort: ['value', 'desc'],
-      });
-      const result = await nlpValueController.findPage(
-        pageQuery,
-        ['invalidCriteria'],
-        {},
-      );
-      const nlpEntities = await nlpEntityService.findAll();
-      const nlpValueFixturesWithEntities = nlpValueFixtures.reduce(
-        (acc, curr) => {
-          const ValueWithEntities = {
-            ...curr,
-            entity: curr.entity ? nlpEntities[parseInt(curr.entity!)].id : null,
-            expressions: curr.expressions!,
-            metadata: curr.metadata!,
-            builtin: curr.builtin!,
-          };
-          acc.push(ValueWithEntities);
-          return acc;
-        },
-        [] as TFixtures<NlpValueCreateDto>[],
-      );
-      expect(result).toEqualPayload(nlpValueFixturesWithEntities);
-    });
-  });
-
   describe('count', () => {
     it('should count the nlp Values', async () => {
       const result = await nlpValueController.filterCount();
diff --git a/api/src/nlp/controllers/nlp-value.controller.ts b/api/src/nlp/controllers/nlp-value.controller.ts
index 1cd3aadb..c9d98078 100644
--- a/api/src/nlp/controllers/nlp-value.controller.ts
+++ b/api/src/nlp/controllers/nlp-value.controller.ts
@@ -23,7 +23,6 @@ import {
 import { CsrfCheck } from '@tekuconcept/nestjs-csrf';
 
 import { CsrfInterceptor } from '@/interceptors/csrf.interceptor';
-import { LoggerService } from '@/logger/logger.service';
 import { BaseController } from '@/utils/generics/base-controller';
 import { DeleteResult } from '@/utils/generics/base-repository';
 import { PageQueryDto } from '@/utils/pagination/pagination-query.dto';
@@ -31,6 +30,7 @@ import { PageQueryPipe } from '@/utils/pagination/pagination-query.pipe';
 import { PopulatePipe } from '@/utils/pipes/populate.pipe';
 import { SearchFilterPipe } from '@/utils/pipes/search-filter.pipe';
 import { TFilterQuery } from '@/utils/types/filter.types';
+import { Format } from '@/utils/types/format.types';
 
 import { NlpValueCreateDto, NlpValueUpdateDto } from '../dto/nlp-value.dto';
 import {
@@ -53,7 +53,6 @@ export class NlpValueController extends BaseController<
   constructor(
     private readonly nlpValueService: NlpValueService,
     private readonly nlpEntityService: NlpEntityService,
-    private readonly logger: LoggerService,
   ) {
     super(nlpValueService);
   }
@@ -128,7 +127,7 @@ export class NlpValueController extends BaseController<
   }
 
   /**
-   * Retrieves a paginated list of NLP values.
+   * Retrieves a paginated list of NLP values with NLP Samples count.
    *
    * Supports filtering, pagination, and optional population of related entities.
    *
@@ -136,10 +135,10 @@ export class NlpValueController extends BaseController<
    * @param populate - An array of related entities to populate.
    * @param filters - Filters to apply when retrieving the NLP values.
    *
-   * @returns A promise resolving to a paginated list of NLP values.
+   * @returns A promise resolving to a paginated list of NLP values with NLP Samples count.
    */
   @Get()
-  async findPage(
+  async findWithCount(
     @Query(PageQueryPipe) pageQuery: PageQueryDto<NlpValue>,
     @Query(PopulatePipe) populate: string[],
     @Query(
@@ -149,9 +148,11 @@ export class NlpValueController extends BaseController<
     )
     filters: TFilterQuery<NlpValue>,
   ) {
-    return this.canPopulate(populate)
-      ? await this.nlpValueService.findAndPopulate(filters, pageQuery)
-      : await this.nlpValueService.find(filters, pageQuery);
+    return await this.nlpValueService.findWithCount(
+      this.canPopulate(populate) ? Format.FULL : Format.STUB,
+      pageQuery,
+      filters,
+    );
   }
 
   /**
diff --git a/api/src/nlp/repositories/nlp-entity.repository.spec.ts b/api/src/nlp/repositories/nlp-entity.repository.spec.ts
index a4bd2a17..7f9bccd3 100644
--- a/api/src/nlp/repositories/nlp-entity.repository.spec.ts
+++ b/api/src/nlp/repositories/nlp-entity.repository.spec.ts
@@ -1,14 +1,12 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
 import { nlpEntityFixtures } from '@/utils/test/fixtures/nlpentity';
 import { installNlpValueFixtures } from '@/utils/test/fixtures/nlpvalue';
@@ -17,6 +15,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { NlpEntity, NlpEntityModel } from '../schemas/nlp-entity.schema';
 import { NlpSampleEntityModel } from '../schemas/nlp-sample-entity.schema';
@@ -32,7 +31,7 @@ describe('NlpEntityRepository', () => {
   let firstNameNlpEntity: NlpEntity | null;
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installNlpValueFixtures),
         MongooseModule.forFeature([
@@ -45,19 +44,18 @@ describe('NlpEntityRepository', () => {
         NlpEntityRepository,
         NlpValueRepository,
         NlpSampleEntityRepository,
-        EventEmitter2,
       ],
-    }).compile();
-    nlpEntityRepository = module.get<NlpEntityRepository>(NlpEntityRepository);
-    nlpValueRepository = module.get<NlpValueRepository>(NlpValueRepository);
+    });
+    [nlpEntityRepository, nlpValueRepository] = await getMocks([
+      NlpEntityRepository,
+      NlpValueRepository,
+    ]);
     firstNameNlpEntity = await nlpEntityRepository.findOne({
       name: 'first_name',
     });
   });
 
-  afterAll(async () => {
-    await closeInMongodConnection();
-  });
+  afterAll(closeInMongodConnection);
 
   afterEach(jest.clearAllMocks);
 
diff --git a/api/src/nlp/repositories/nlp-entity.repository.ts b/api/src/nlp/repositories/nlp-entity.repository.ts
index 36b57bef..0bda7bfa 100644
--- a/api/src/nlp/repositories/nlp-entity.repository.ts
+++ b/api/src/nlp/repositories/nlp-entity.repository.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,7 +7,6 @@
  */
 
 import { Injectable } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
 import { Document, Model, Query } from 'mongoose';
 
@@ -34,12 +33,11 @@ export class NlpEntityRepository extends BaseRepository<
   NlpEntityDto
 > {
   constructor(
-    readonly eventEmitter: EventEmitter2,
     @InjectModel(NlpEntity.name) readonly model: Model<NlpEntity>,
     private readonly nlpValueRepository: NlpValueRepository,
     private readonly nlpSampleEntityRepository: NlpSampleEntityRepository,
   ) {
-    super(eventEmitter, model, NlpEntity, NLP_ENTITY_POPULATE, NlpEntityFull);
+    super(model, NlpEntity, NLP_ENTITY_POPULATE, NlpEntityFull);
   }
 
   /**
diff --git a/api/src/nlp/repositories/nlp-sample-entity.repository.spec.ts b/api/src/nlp/repositories/nlp-sample-entity.repository.spec.ts
index 50494a7b..4295c791 100644
--- a/api/src/nlp/repositories/nlp-sample-entity.repository.spec.ts
+++ b/api/src/nlp/repositories/nlp-sample-entity.repository.spec.ts
@@ -1,14 +1,12 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
 import { LanguageRepository } from '@/i18n/repositories/language.repository';
 import { Language, LanguageModel } from '@/i18n/schemas/language.schema';
@@ -24,6 +22,7 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 import { TFixtures } from '@/utils/test/types';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { NlpEntity, NlpEntityModel } from '../schemas/nlp-entity.schema';
 import {
@@ -47,7 +46,7 @@ describe('NlpSampleEntityRepository', () => {
   let languages: Language[];
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installNlpSampleEntityFixtures),
         MongooseModule.forFeature([
@@ -63,22 +62,20 @@ describe('NlpSampleEntityRepository', () => {
         NlpEntityRepository,
         NlpValueRepository,
         LanguageRepository,
-        EventEmitter2,
       ],
-    }).compile();
-    nlpSampleEntityRepository = module.get<NlpSampleEntityRepository>(
-      NlpSampleEntityRepository,
-    );
-    nlpEntityRepository = module.get<NlpEntityRepository>(NlpEntityRepository);
-    languageRepository = module.get<LanguageRepository>(LanguageRepository);
+    });
+    [nlpSampleEntityRepository, nlpEntityRepository, languageRepository] =
+      await getMocks([
+        NlpSampleEntityRepository,
+        NlpEntityRepository,
+        LanguageRepository,
+      ]);
     nlpSampleEntities = await nlpSampleEntityRepository.findAll();
     nlpEntities = await nlpEntityRepository.findAll();
     languages = await languageRepository.findAll();
   });
 
-  afterAll(async () => {
-    await closeInMongodConnection();
-  });
+  afterAll(closeInMongodConnection);
 
   afterEach(jest.clearAllMocks);
 
diff --git a/api/src/nlp/repositories/nlp-sample-entity.repository.ts b/api/src/nlp/repositories/nlp-sample-entity.repository.ts
index 5f1ecbd9..47d286d4 100644
--- a/api/src/nlp/repositories/nlp-sample-entity.repository.ts
+++ b/api/src/nlp/repositories/nlp-sample-entity.repository.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,7 +7,6 @@
  */
 
 import { Injectable } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
@@ -27,11 +26,9 @@ export class NlpSampleEntityRepository extends BaseRepository<
   NlpSampleEntityFull
 > {
   constructor(
-    readonly eventEmitter: EventEmitter2,
     @InjectModel(NlpSampleEntity.name) readonly model: Model<NlpSampleEntity>,
   ) {
     super(
-      eventEmitter,
       model,
       NlpSampleEntity,
       NLP_SAMPLE_ENTITY_POPULATE,
diff --git a/api/src/nlp/repositories/nlp-sample.repository.spec.ts b/api/src/nlp/repositories/nlp-sample.repository.spec.ts
index 4c2d00c8..7aea6bc1 100644
--- a/api/src/nlp/repositories/nlp-sample.repository.spec.ts
+++ b/api/src/nlp/repositories/nlp-sample.repository.spec.ts
@@ -1,14 +1,12 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
 import { LanguageRepository } from '@/i18n/repositories/language.repository';
 import { Language, LanguageModel } from '@/i18n/schemas/language.schema';
@@ -20,6 +18,7 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 import { TFixtures } from '@/utils/test/types';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import {
   NlpSampleEntity,
@@ -43,7 +42,7 @@ describe('NlpSampleRepository', () => {
   let languages: Language[];
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installNlpSampleEntityFixtures),
         MongooseModule.forFeature([
@@ -56,14 +55,14 @@ describe('NlpSampleRepository', () => {
         NlpSampleRepository,
         NlpSampleEntityRepository,
         LanguageRepository,
-        EventEmitter2,
       ],
-    }).compile();
-    nlpSampleRepository = module.get<NlpSampleRepository>(NlpSampleRepository);
-    nlpSampleEntityRepository = module.get<NlpSampleEntityRepository>(
-      NlpSampleEntityRepository,
-    );
-    languageRepository = module.get<LanguageRepository>(LanguageRepository);
+    });
+    [nlpSampleRepository, nlpSampleEntityRepository, languageRepository] =
+      await getMocks([
+        NlpSampleRepository,
+        NlpSampleEntityRepository,
+        LanguageRepository,
+      ]);
     noNlpSample = await nlpSampleRepository.findOne({ text: 'No' });
     nlpSampleEntity = await nlpSampleEntityRepository.findOne({
       sample: noNlpSample!.id,
@@ -71,9 +70,7 @@ describe('NlpSampleRepository', () => {
     languages = await languageRepository.findAll();
   });
 
-  afterAll(async () => {
-    await closeInMongodConnection();
-  });
+  afterAll(closeInMongodConnection);
 
   afterEach(jest.clearAllMocks);
 
diff --git a/api/src/nlp/repositories/nlp-sample.repository.ts b/api/src/nlp/repositories/nlp-sample.repository.ts
index 0536bde6..9da6eab3 100644
--- a/api/src/nlp/repositories/nlp-sample.repository.ts
+++ b/api/src/nlp/repositories/nlp-sample.repository.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,7 +7,6 @@
  */
 
 import { Injectable } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
 import { Document, Model, Query } from 'mongoose';
 
@@ -32,11 +31,10 @@ export class NlpSampleRepository extends BaseRepository<
   TNlpSampleDto
 > {
   constructor(
-    readonly eventEmitter: EventEmitter2,
     @InjectModel(NlpSample.name) readonly model: Model<NlpSample>,
     private readonly nlpSampleEntityRepository: NlpSampleEntityRepository,
   ) {
-    super(eventEmitter, model, NlpSample, NLP_SAMPLE_POPULATE, NlpSampleFull);
+    super(model, NlpSample, NLP_SAMPLE_POPULATE, NlpSampleFull);
   }
 
   /**
diff --git a/api/src/nlp/repositories/nlp-value.repository.spec.ts b/api/src/nlp/repositories/nlp-value.repository.spec.ts
index 0b3a7ce7..179f0e76 100644
--- a/api/src/nlp/repositories/nlp-value.repository.spec.ts
+++ b/api/src/nlp/repositories/nlp-value.repository.spec.ts
@@ -1,14 +1,12 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
 import { nlpEntityFixtures } from '@/utils/test/fixtures/nlpentity';
 import { installNlpSampleEntityFixtures } from '@/utils/test/fixtures/nlpsampleentity';
@@ -19,6 +17,7 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 import { TFixtures } from '@/utils/test/types';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { NlpEntityModel } from '../schemas/nlp-entity.schema';
 import { NlpSampleEntityModel } from '../schemas/nlp-sample-entity.schema';
@@ -37,7 +36,7 @@ describe('NlpValueRepository', () => {
   let nlpValues: NlpValue[];
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installNlpSampleEntityFixtures),
         MongooseModule.forFeature([
@@ -46,18 +45,17 @@ describe('NlpValueRepository', () => {
           NlpEntityModel,
         ]),
       ],
-      providers: [NlpValueRepository, NlpSampleEntityRepository, EventEmitter2],
-    }).compile();
-    nlpValueRepository = module.get<NlpValueRepository>(NlpValueRepository);
-    nlpSampleEntityRepository = module.get<NlpSampleEntityRepository>(
+      providers: [NlpValueRepository, NlpSampleEntityRepository],
+    });
+    [nlpValueRepository, nlpSampleEntityRepository] = await getMocks([
+      NlpValueRepository,
       NlpSampleEntityRepository,
-    );
+    ]);
+
     nlpValues = await nlpValueRepository.findAll();
   });
 
-  afterAll(async () => {
-    await closeInMongodConnection();
-  });
+  afterAll(closeInMongodConnection);
 
   afterEach(jest.clearAllMocks);
 
diff --git a/api/src/nlp/repositories/nlp-value.repository.ts b/api/src/nlp/repositories/nlp-value.repository.ts
index e7839bf1..bab94d7c 100644
--- a/api/src/nlp/repositories/nlp-value.repository.ts
+++ b/api/src/nlp/repositories/nlp-value.repository.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,12 +7,21 @@
  */
 
 import { Injectable } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
-import { Document, Model, Query } from 'mongoose';
+import { plainToInstance } from 'class-transformer';
+import {
+  Document,
+  Model,
+  PipelineStage,
+  Query,
+  SortOrder,
+  Types,
+} from 'mongoose';
 
 import { BaseRepository, DeleteResult } from '@/utils/generics/base-repository';
+import { PageQueryDto } from '@/utils/pagination/pagination-query.dto';
 import { TFilterQuery } from '@/utils/types/filter.types';
+import { Format } from '@/utils/types/format.types';
 
 import { NlpValueDto } from '../dto/nlp-value.dto';
 import {
@@ -20,7 +29,10 @@ import {
   NlpValue,
   NlpValueDocument,
   NlpValueFull,
+  NlpValueFullWithCount,
   NlpValuePopulate,
+  NlpValueWithCount,
+  TNlpValueCount,
 } from '../schemas/nlp-value.schema';
 
 import { NlpSampleEntityRepository } from './nlp-sample-entity.repository';
@@ -33,11 +45,10 @@ export class NlpValueRepository extends BaseRepository<
   NlpValueDto
 > {
   constructor(
-    readonly eventEmitter: EventEmitter2,
     @InjectModel(NlpValue.name) readonly model: Model<NlpValue>,
     private readonly nlpSampleEntityRepository: NlpSampleEntityRepository,
   ) {
-    super(eventEmitter, model, NlpValue, NLP_VALUE_POPULATE, NlpValueFull);
+    super(model, NlpValue, NLP_VALUE_POPULATE, NlpValueFull);
   }
 
   /**
@@ -108,4 +119,139 @@ export class NlpValueRepository extends BaseRepository<
       throw new Error('Attempted to delete a NLP value using unknown criteria');
     }
   }
+
+  private getSortDirection(sortOrder: SortOrder) {
+    return typeof sortOrder === 'number'
+      ? sortOrder
+      : sortOrder.toString().toLowerCase() === 'desc'
+        ? -1
+        : 1;
+  }
+
+  /**
+   * Performs an aggregation to retrieve NLP values with their sample counts.
+   *
+   * @param format - The format can be full or stub
+   * @param pageQuery - The pagination parameters
+   * @param filterQuery - The filter criteria
+   * @returns Aggregated Nlp Value results with sample counts
+   */
+  private async aggregateWithCount<F extends Format>(
+    format: F,
+    {
+      limit = 10,
+      skip = 0,
+      sort = ['createdAt', 'desc'],
+    }: PageQueryDto<NlpValue>,
+    { $and = [], ...rest }: TFilterQuery<NlpValue>,
+  ): Promise<TNlpValueCount<F>[]> {
+    const pipeline: PipelineStage[] = [
+      {
+        $match: {
+          ...rest,
+          ...($and.length
+            ? {
+                $and: $and.map(({ entity, ...rest }) => ({
+                  ...rest,
+                  ...(entity
+                    ? { entity: new Types.ObjectId(String(entity)) }
+                    : {}),
+                })),
+              }
+            : {}),
+        },
+      },
+      {
+        $skip: skip,
+      },
+      {
+        $limit: limit,
+      },
+      {
+        $lookup: {
+          from: 'nlpsampleentities',
+          localField: '_id',
+          foreignField: 'value',
+          as: '_sampleEntities',
+        },
+      },
+      {
+        $unwind: {
+          path: '$_sampleEntities',
+          preserveNullAndEmptyArrays: true,
+        },
+      },
+      {
+        $group: {
+          _id: '$_id',
+          _originalDoc: {
+            $first: {
+              $unsetField: { input: '$$ROOT', field: 'nlpSamplesCount' },
+            },
+          },
+          nlpSamplesCount: {
+            $sum: { $cond: [{ $ifNull: ['$_sampleEntities', false] }, 1, 0] },
+          },
+        },
+      },
+      {
+        $replaceWith: {
+          $mergeObjects: [
+            '$_originalDoc',
+            { nlpSamplesCount: '$nlpSamplesCount' },
+          ],
+        },
+      },
+      ...(format === Format.FULL
+        ? [
+            {
+              $lookup: {
+                from: 'nlpentities',
+                localField: 'entity',
+                foreignField: '_id',
+                as: 'entity',
+              },
+            },
+            {
+              $unwind: '$entity',
+            },
+          ]
+        : []),
+      {
+        $sort: {
+          [sort[0]]: this.getSortDirection(sort[1]),
+          _id: this.getSortDirection(sort[1]),
+        },
+      },
+    ];
+
+    return await this.model.aggregate<TNlpValueCount<F>>(pipeline).exec();
+  }
+
+  async findWithCount<F extends Format>(
+    format: F,
+    pageQuery: PageQueryDto<NlpValue>,
+    filterQuery: TFilterQuery<NlpValue>,
+  ): Promise<TNlpValueCount<F>[]> {
+    try {
+      const aggregatedResults = await this.aggregateWithCount(
+        format,
+        pageQuery,
+        filterQuery,
+      );
+
+      if (format === Format.FULL) {
+        return plainToInstance(NlpValueFullWithCount, aggregatedResults, {
+          excludePrefixes: ['_'],
+        }) as TNlpValueCount<F>[];
+      }
+
+      return plainToInstance(NlpValueWithCount, aggregatedResults, {
+        excludePrefixes: ['_'],
+      }) as TNlpValueCount<F>[];
+    } catch (error) {
+      this.logger.error(`Error in findWithCount: ${error.message}`, error);
+      throw error;
+    }
+  }
 }
diff --git a/api/src/nlp/schemas/nlp-value.schema.ts b/api/src/nlp/schemas/nlp-value.schema.ts
index 523eaa3e..a49eea5c 100644
--- a/api/src/nlp/schemas/nlp-value.schema.ts
+++ b/api/src/nlp/schemas/nlp-value.schema.ts
@@ -16,6 +16,7 @@ import {
   TFilterPopulateFields,
   THydratedDocument,
 } from '@/utils/types/filter.types';
+import { TStubOrFull } from '@/utils/types/format.types';
 
 import { NlpEntity, NlpEntityFull } from './nlp-entity.schema';
 import { NlpValueMap } from './types';
@@ -106,6 +107,14 @@ export class NlpValueFull extends NlpValueStub {
   entity: NlpEntity;
 }
 
+export class NlpValueWithCount extends NlpValue {
+  nlpSamplesCount: number;
+}
+
+export class NlpValueFullWithCount extends NlpValueFull {
+  nlpSamplesCount: number;
+}
+
 export type NlpValueDocument = THydratedDocument<NlpValue>;
 
 export const NlpValueModel: ModelDefinition = LifecycleHookManager.attach({
@@ -121,3 +130,9 @@ export type NlpValuePopulate = keyof TFilterPopulateFields<
 >;
 
 export const NLP_VALUE_POPULATE: NlpValuePopulate[] = ['entity'];
+
+export type TNlpValueCount<T> = TStubOrFull<
+  T,
+  NlpValueWithCount,
+  NlpValueFullWithCount
+>;
diff --git a/api/src/nlp/services/nlp-entity.service.spec.ts b/api/src/nlp/services/nlp-entity.service.spec.ts
index 76b78233..53118e95 100644
--- a/api/src/nlp/services/nlp-entity.service.spec.ts
+++ b/api/src/nlp/services/nlp-entity.service.spec.ts
@@ -1,14 +1,12 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
 import { nlpEntityFixtures } from '@/utils/test/fixtures/nlpentity';
 import { installNlpValueFixtures } from '@/utils/test/fixtures/nlpvalue';
@@ -17,6 +15,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { NlpEntityRepository } from '../repositories/nlp-entity.repository';
 import { NlpSampleEntityRepository } from '../repositories/nlp-sample-entity.repository';
@@ -34,7 +33,7 @@ describe('nlpEntityService', () => {
   let nlpValueRepository: NlpValueRepository;
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installNlpValueFixtures),
         MongooseModule.forFeature([
@@ -49,17 +48,17 @@ describe('nlpEntityService', () => {
         NlpValueService,
         NlpValueRepository,
         NlpSampleEntityRepository,
-        EventEmitter2,
       ],
-    }).compile();
-    nlpEntityService = module.get<NlpEntityService>(NlpEntityService);
-    nlpEntityRepository = module.get<NlpEntityRepository>(NlpEntityRepository);
-    nlpValueRepository = module.get<NlpValueRepository>(NlpValueRepository);
+    });
+    [nlpEntityService, nlpEntityRepository, nlpValueRepository] =
+      await getMocks([
+        NlpEntityService,
+        NlpEntityRepository,
+        NlpValueRepository,
+      ]);
   });
 
-  afterAll(async () => {
-    await closeInMongodConnection();
-  });
+  afterAll(closeInMongodConnection);
 
   afterEach(jest.clearAllMocks);
 
diff --git a/api/src/nlp/services/nlp-sample-entity.service.spec.ts b/api/src/nlp/services/nlp-sample-entity.service.spec.ts
index dd40e848..ed2be6f1 100644
--- a/api/src/nlp/services/nlp-sample-entity.service.spec.ts
+++ b/api/src/nlp/services/nlp-sample-entity.service.spec.ts
@@ -6,9 +6,7 @@
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
 import { LanguageRepository } from '@/i18n/repositories/language.repository';
 import { Language, LanguageModel } from '@/i18n/schemas/language.schema';
@@ -24,6 +22,7 @@ import {
   rootMongooseTestModule,
 } from '@/utils/test/test';
 import { TFixtures } from '@/utils/test/types';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { NlpSampleEntityCreateDto } from '../dto/nlp-sample-entity.dto';
 import { NlpEntityRepository } from '../repositories/nlp-entity.repository';
@@ -58,7 +57,7 @@ describe('NlpSampleEntityService', () => {
   let nlpValueService: NlpValueService;
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installNlpSampleEntityFixtures),
         MongooseModule.forFeature([
@@ -77,22 +76,25 @@ describe('NlpSampleEntityService', () => {
         NlpSampleEntityService,
         NlpEntityService,
         NlpValueService,
-        EventEmitter2,
       ],
-    }).compile();
-    nlpSampleEntityService = module.get<NlpSampleEntityService>(
+    });
+    [
+      nlpSampleEntityService,
+      nlpSampleEntityRepository,
+      nlpEntityRepository,
+      languageRepository,
+      nlpSampleEntityService,
+      nlpEntityService,
+      nlpValueService,
+    ] = await getMocks([
       NlpSampleEntityService,
-    );
-    nlpSampleEntityRepository = module.get<NlpSampleEntityRepository>(
       NlpSampleEntityRepository,
-    );
-    nlpEntityRepository = module.get<NlpEntityRepository>(NlpEntityRepository);
-    languageRepository = module.get<LanguageRepository>(LanguageRepository);
-    nlpSampleEntityService = module.get<NlpSampleEntityService>(
+      NlpEntityRepository,
+      LanguageRepository,
       NlpSampleEntityService,
-    );
-    nlpEntityService = module.get<NlpEntityService>(NlpEntityService);
-    nlpValueService = module.get<NlpValueService>(NlpValueService);
+      NlpEntityService,
+      NlpValueService,
+    ]);
     nlpSampleEntities = await nlpSampleEntityRepository.findAll();
     nlpEntities = await nlpEntityRepository.findAll();
     languages = await languageRepository.findAll();
diff --git a/api/src/nlp/services/nlp-sample.service.spec.ts b/api/src/nlp/services/nlp-sample.service.spec.ts
index ce93beb7..e24e4b47 100644
--- a/api/src/nlp/services/nlp-sample.service.spec.ts
+++ b/api/src/nlp/services/nlp-sample.service.spec.ts
@@ -8,14 +8,11 @@
 
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
 import { BadRequestException, NotFoundException } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
 import { LanguageRepository } from '@/i18n/repositories/language.repository';
 import { Language, LanguageModel } from '@/i18n/schemas/language.schema';
 import { LanguageService } from '@/i18n/services/language.service';
-import { LoggerService } from '@/logger/logger.service';
 import { nlpSampleFixtures } from '@/utils/test/fixtures/nlpsample';
 import { installNlpSampleEntityFixtures } from '@/utils/test/fixtures/nlpsampleentity';
 import { getPageQuery } from '@/utils/test/pagination';
@@ -23,6 +20,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { NlpSampleEntityCreateDto } from '../dto/nlp-sample-entity.dto';
 import { NlpEntityRepository } from '../repositories/nlp-entity.repository';
@@ -63,7 +61,7 @@ describe('NlpSampleService', () => {
   let languages: Language[];
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installNlpSampleEntityFixtures),
         MongooseModule.forFeature([
@@ -85,8 +83,7 @@ describe('NlpSampleService', () => {
         NlpEntityService,
         NlpValueService,
         LanguageService,
-        EventEmitter2,
-        LoggerService,
+
         {
           provide: CACHE_MANAGER,
           useValue: {
@@ -96,21 +93,26 @@ describe('NlpSampleService', () => {
           },
         },
       ],
-    }).compile();
-    nlpEntityService = module.get<NlpEntityService>(NlpEntityService);
-    nlpSampleService = module.get<NlpSampleService>(NlpSampleService);
-    nlpSampleEntityService = module.get<NlpSampleEntityService>(
+    });
+    [
+      nlpEntityService,
+      nlpSampleService,
+      nlpSampleEntityService,
+      nlpSampleRepository,
+      nlpSampleEntityRepository,
+      nlpSampleEntityRepository,
+      languageService,
+      languageRepository,
+    ] = await getMocks([
+      NlpEntityService,
+      NlpSampleService,
       NlpSampleEntityService,
-    );
-    nlpSampleRepository = module.get<NlpSampleRepository>(NlpSampleRepository);
-    nlpSampleEntityRepository = module.get<NlpSampleEntityRepository>(
+      NlpSampleRepository,
       NlpSampleEntityRepository,
-    );
-    nlpSampleEntityRepository = module.get<NlpSampleEntityRepository>(
       NlpSampleEntityRepository,
-    );
-    languageService = module.get<LanguageService>(LanguageService);
-    languageRepository = module.get<LanguageRepository>(LanguageRepository);
+      LanguageService,
+      LanguageRepository,
+    ]);
     noNlpSample = await nlpSampleService.findOne({ text: 'No' });
     nlpSampleEntity = await nlpSampleEntityRepository.findOne({
       sample: noNlpSample!.id,
@@ -118,9 +120,7 @@ describe('NlpSampleService', () => {
     languages = await languageRepository.findAll();
   });
 
-  afterAll(async () => {
-    await closeInMongodConnection();
-  });
+  afterAll(closeInMongodConnection);
 
   afterEach(jest.clearAllMocks);
 
diff --git a/api/src/nlp/services/nlp-sample.service.ts b/api/src/nlp/services/nlp-sample.service.ts
index 3efb809c..f2f33e7d 100644
--- a/api/src/nlp/services/nlp-sample.service.ts
+++ b/api/src/nlp/services/nlp-sample.service.ts
@@ -17,7 +17,6 @@ import Papa from 'papaparse';
 import { Message } from '@/chat/schemas/message.schema';
 import { Language } from '@/i18n/schemas/language.schema';
 import { LanguageService } from '@/i18n/services/language.service';
-import { LoggerService } from '@/logger/logger.service';
 import { BaseService } from '@/utils/generics/base-service';
 import { THydratedDocument } from '@/utils/types/filter.types';
 
@@ -47,7 +46,6 @@ export class NlpSampleService extends BaseService<
     private readonly nlpSampleEntityService: NlpSampleEntityService,
     private readonly nlpEntityService: NlpEntityService,
     private readonly languageService: LanguageService,
-    private readonly logger: LoggerService,
   ) {
     super(repository);
   }
diff --git a/api/src/nlp/services/nlp-value.service.spec.ts b/api/src/nlp/services/nlp-value.service.spec.ts
index f62ed7cb..3f999144 100644
--- a/api/src/nlp/services/nlp-value.service.spec.ts
+++ b/api/src/nlp/services/nlp-value.service.spec.ts
@@ -1,14 +1,12 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
 import { BaseSchema } from '@/utils/generics/base-schema';
 import { nlpEntityFixtures } from '@/utils/test/fixtures/nlpentity';
@@ -21,6 +19,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { NlpEntityRepository } from '../repositories/nlp-entity.repository';
 import { NlpSampleEntityRepository } from '../repositories/nlp-sample-entity.repository';
@@ -44,7 +43,7 @@ describe('NlpValueService', () => {
   let nlpValues: NlpValue[];
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installNlpValueFixtures),
         MongooseModule.forFeature([
@@ -59,13 +58,19 @@ describe('NlpValueService', () => {
         NlpEntityRepository,
         NlpValueService,
         NlpEntityService,
-        EventEmitter2,
       ],
-    }).compile();
-    nlpValueService = module.get<NlpValueService>(NlpValueService);
-    nlpEntityService = module.get<NlpEntityService>(NlpEntityService);
-    nlpValueRepository = module.get<NlpValueRepository>(NlpValueRepository);
-    nlpEntityRepository = module.get<NlpEntityRepository>(NlpEntityRepository);
+    });
+    [
+      nlpValueService,
+      nlpEntityService,
+      nlpValueRepository,
+      nlpEntityRepository,
+    ] = await getMocks([
+      NlpValueService,
+      NlpEntityService,
+      NlpValueRepository,
+      NlpEntityRepository,
+    ]);
     nlpValues = await nlpValueRepository.findAll();
   });
 
diff --git a/api/src/nlp/services/nlp-value.service.ts b/api/src/nlp/services/nlp-value.service.ts
index f246ad61..87988140 100644
--- a/api/src/nlp/services/nlp-value.service.ts
+++ b/api/src/nlp/services/nlp-value.service.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -10,6 +10,9 @@ import { forwardRef, Inject, Injectable } from '@nestjs/common';
 
 import { DeleteResult } from '@/utils/generics/base-repository';
 import { BaseService } from '@/utils/generics/base-service';
+import { PageQueryDto } from '@/utils/pagination/pagination-query.dto';
+import { TFilterQuery } from '@/utils/types/filter.types';
+import { Format } from '@/utils/types/format.types';
 
 import { NlpValueCreateDto, NlpValueDto } from '../dto/nlp-value.dto';
 import { NlpValueRepository } from '../repositories/nlp-value.repository';
@@ -18,6 +21,7 @@ import {
   NlpValue,
   NlpValueFull,
   NlpValuePopulate,
+  TNlpValueCount,
 } from '../schemas/nlp-value.schema';
 import { NlpSampleEntityValue } from '../schemas/types';
 
@@ -218,4 +222,12 @@ export class NlpValueService extends BaseService<
     });
     return Promise.all(promises);
   }
+
+  async findWithCount<F extends Format>(
+    format: F,
+    pageQuery: PageQueryDto<NlpValue>,
+    filters: TFilterQuery<NlpValue>,
+  ): Promise<TNlpValueCount<F>[]> {
+    return await this.repository.findWithCount(format, pageQuery, filters);
+  }
 }
diff --git a/api/src/plugins/plugins.service.spec.ts b/api/src/plugins/plugins.service.spec.ts
index bb9f42e4..8d64f0cf 100644
--- a/api/src/plugins/plugins.service.spec.ts
+++ b/api/src/plugins/plugins.service.spec.ts
@@ -1,15 +1,14 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { Test } from '@nestjs/testing';
-
 import { LoggerModule } from '@/logger/logger.module';
 import { DummyPlugin } from '@/utils/test/dummy/dummy.plugin';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { BaseBlockPlugin } from './base-block-plugin';
 import { PluginService } from './plugins.service';
@@ -17,17 +16,21 @@ import { PluginType } from './types';
 
 describe('PluginsService', () => {
   let pluginsService: PluginService;
+  let dummyPlugin: DummyPlugin;
+
   beforeAll(async () => {
-    const module = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       providers: [PluginService, DummyPlugin],
       imports: [LoggerModule],
-    }).compile();
-    pluginsService = module.get<PluginService>(PluginService);
-    await module.get<DummyPlugin>(DummyPlugin).onModuleInit();
-  });
-  afterAll(async () => {
-    jest.clearAllMocks();
+    });
+    [pluginsService, dummyPlugin] = await getMocks([
+      PluginService,
+      DummyPlugin,
+    ]);
+    await dummyPlugin.onModuleInit();
   });
+
+  afterAll(jest.clearAllMocks);
   describe('getAll', () => {
     it('should return an array of instances of base plugin', () => {
       const result = pluginsService.getAllByType(PluginType.block);
diff --git a/api/src/setting/controllers/setting.controller.spec.ts b/api/src/setting/controllers/setting.controller.spec.ts
index 156ed87c..afd5dc78 100644
--- a/api/src/setting/controllers/setting.controller.spec.ts
+++ b/api/src/setting/controllers/setting.controller.spec.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,12 +7,9 @@
  */
 
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test } from '@nestjs/testing';
 
 import { I18nService } from '@/i18n/services/i18n.service';
-import { LoggerService } from '@/logger/logger.service';
 import {
   installSettingFixtures,
   settingFixtures,
@@ -21,6 +18,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { SettingRepository } from '../repositories/setting.repository';
 import { Setting, SettingModel } from '../schemas/setting.schema';
@@ -34,7 +32,7 @@ describe('SettingController', () => {
   let settingService: SettingService;
 
   beforeAll(async () => {
-    const module = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       controllers: [SettingController],
       imports: [
         rootMongooseTestModule(installSettingFixtures),
@@ -44,8 +42,6 @@ describe('SettingController', () => {
         SettingService,
         SettingRepository,
         SettingSeeder,
-        LoggerService,
-        EventEmitter2,
         {
           provide: I18nService,
           useValue: {
@@ -61,10 +57,11 @@ describe('SettingController', () => {
           },
         },
       ],
-    }).compile();
-
-    settingController = module.get<SettingController>(SettingController);
-    settingService = module.get<SettingService>(SettingService);
+    });
+    [settingController, settingService] = await getMocks([
+      SettingController,
+      SettingService,
+    ]);
   });
 
   afterAll(closeInMongodConnection);
diff --git a/api/src/setting/controllers/setting.controller.ts b/api/src/setting/controllers/setting.controller.ts
index 60108a2a..07eaf224 100644
--- a/api/src/setting/controllers/setting.controller.ts
+++ b/api/src/setting/controllers/setting.controller.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -18,7 +18,7 @@ import {
 import { CsrfCheck } from '@tekuconcept/nestjs-csrf';
 
 import { CsrfInterceptor } from '@/interceptors/csrf.interceptor';
-import { LoggerService } from '@/logger/logger.service';
+import { BaseController } from '@/utils/generics/base-controller';
 import { PageQueryDto } from '@/utils/pagination/pagination-query.dto';
 import { PageQueryPipe } from '@/utils/pagination/pagination-query.pipe';
 import { SearchFilterPipe } from '@/utils/pipes/search-filter.pipe';
@@ -29,11 +29,10 @@ import { SettingService } from '../services/setting.service';
 
 @UseInterceptors(CsrfInterceptor)
 @Controller('setting')
-export class SettingController {
-  constructor(
-    private readonly settingService: SettingService,
-    private readonly logger: LoggerService,
-  ) {}
+export class SettingController extends BaseController<Setting> {
+  constructor(private readonly settingService: SettingService) {
+    super(settingService);
+  }
 
   /**
    * Finds settings that match the provided filters and sorting options.
diff --git a/api/src/setting/repositories/metadata.repository.ts b/api/src/setting/repositories/metadata.repository.ts
index 2997f3cf..e2ff7d7d 100644
--- a/api/src/setting/repositories/metadata.repository.ts
+++ b/api/src/setting/repositories/metadata.repository.ts
@@ -7,7 +7,6 @@
  */
 
 import { Injectable } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
@@ -17,10 +16,7 @@ import { Metadata } from '../schemas/metadata.schema';
 
 @Injectable()
 export class MetadataRepository extends BaseRepository<Metadata> {
-  constructor(
-    readonly eventEmitter: EventEmitter2,
-    @InjectModel(Metadata.name) readonly model: Model<Metadata>,
-  ) {
-    super(eventEmitter, model, Metadata);
+  constructor(@InjectModel(Metadata.name) readonly model: Model<Metadata>) {
+    super(model, Metadata);
   }
 }
diff --git a/api/src/setting/repositories/setting.repository.spec.ts b/api/src/setting/repositories/setting.repository.spec.ts
index f471483f..c21002ea 100644
--- a/api/src/setting/repositories/setting.repository.spec.ts
+++ b/api/src/setting/repositories/setting.repository.spec.ts
@@ -1,14 +1,12 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { getModelToken, MongooseModule } from '@nestjs/mongoose';
-import { Test } from '@nestjs/testing';
 import { Model } from 'mongoose';
 
 import { installSettingFixtures } from '@/utils/test/fixtures/setting';
@@ -16,6 +14,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { Setting, SettingModel } from '../schemas/setting.schema';
 import { SettingType } from '../schemas/types';
@@ -25,25 +24,22 @@ import { SettingRepository } from './setting.repository';
 describe('SettingRepository', () => {
   let settingRepository: SettingRepository;
   let settingModel: Model<Setting>;
-  let eventEmitter: EventEmitter2;
 
   beforeAll(async () => {
-    const module = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installSettingFixtures),
         MongooseModule.forFeature([SettingModel]),
       ],
-      providers: [SettingRepository, EventEmitter2],
-    }).compile();
-
-    settingRepository = module.get<SettingRepository>(SettingRepository);
-    settingModel = module.get<Model<Setting>>(getModelToken(Setting.name));
-    eventEmitter = module.get<EventEmitter2>(EventEmitter2);
+      providers: [SettingRepository],
+    });
+    [settingRepository, settingModel] = await getMocks([
+      SettingRepository,
+      getModelToken(Setting.name),
+    ]);
   });
 
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
+  afterEach(jest.clearAllMocks);
 
   afterAll(closeInMongodConnection);
 
@@ -103,11 +99,11 @@ describe('SettingRepository', () => {
         label: 'theme',
       });
 
-      jest.spyOn(eventEmitter, 'emit');
+      jest.spyOn(settingRepository.eventEmitter, 'emit');
 
       await settingRepository.postUpdate({} as any, mockSetting);
 
-      expect(eventEmitter.emit).toHaveBeenCalledWith(
+      expect(settingRepository.eventEmitter.emit).toHaveBeenCalledWith(
         'hook:general:theme',
         mockSetting,
       );
diff --git a/api/src/setting/repositories/setting.repository.ts b/api/src/setting/repositories/setting.repository.ts
index 47e3ed5d..fc6951fa 100644
--- a/api/src/setting/repositories/setting.repository.ts
+++ b/api/src/setting/repositories/setting.repository.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,10 +7,7 @@
  */
 
 import { Injectable } from '@nestjs/common';
-import {
-  EventEmitter2,
-  IHookSettingsGroupLabelOperationMap,
-} from '@nestjs/event-emitter';
+import { IHookSettingsGroupLabelOperationMap } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
 import {
   Document,
@@ -29,11 +26,8 @@ import { SettingType } from '../schemas/types';
 
 @Injectable()
 export class SettingRepository extends BaseRepository<Setting> {
-  constructor(
-    readonly eventEmitter: EventEmitter2,
-    @InjectModel(Setting.name) readonly model: Model<Setting>,
-  ) {
-    super(eventEmitter, model, Setting);
+  constructor(@InjectModel(Setting.name) readonly model: Model<Setting>) {
+    super(model, Setting);
   }
 
   async preCreateValidate(
diff --git a/api/src/setting/services/setting.service.spec.ts b/api/src/setting/services/setting.service.spec.ts
index 3c741738..e3fac80e 100644
--- a/api/src/setting/services/setting.service.spec.ts
+++ b/api/src/setting/services/setting.service.spec.ts
@@ -7,12 +7,9 @@
  */
 
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test } from '@nestjs/testing';
 
 import { I18nService } from '@/i18n/services/i18n.service';
-import { LoggerService } from '@/logger/logger.service';
 import {
   installSettingFixtures,
   settingFixtures,
@@ -21,6 +18,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { SettingRepository } from '../repositories/setting.repository';
 import { Setting, SettingModel } from '../schemas/setting.schema';
@@ -40,7 +38,7 @@ describe('SettingService', () => {
   };
 
   beforeAll(async () => {
-    const module = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installSettingFixtures),
         MongooseModule.forFeature([SettingModel]),
@@ -49,7 +47,6 @@ describe('SettingService', () => {
         SettingService,
         SettingRepository,
         SettingSeeder,
-        EventEmitter2,
         {
           provide: I18nService,
           useValue: {
@@ -64,12 +61,12 @@ describe('SettingService', () => {
             set: jest.fn(),
           },
         },
-        LoggerService,
       ],
-    }).compile();
-
-    settingService = module.get<SettingService>(SettingService);
-    settingRepository = module.get<SettingRepository>(SettingRepository);
+    });
+    [settingService, settingRepository] = await getMocks([
+      SettingService,
+      SettingRepository,
+    ]);
   });
 
   afterAll(closeInMongodConnection);
diff --git a/api/src/setting/services/setting.service.ts b/api/src/setting/services/setting.service.ts
index 56fffba3..a07a94c9 100644
--- a/api/src/setting/services/setting.service.ts
+++ b/api/src/setting/services/setting.service.ts
@@ -13,7 +13,6 @@ import { Cache } from 'cache-manager';
 
 import { config } from '@/config';
 import { Config } from '@/config/types';
-import { LoggerService } from '@/logger/logger.service';
 import {
   ALLOWED_ORIGINS_CACHE_KEY,
   SETTING_CACHE_KEY,
@@ -32,7 +31,6 @@ export class SettingService extends BaseService<Setting> {
   constructor(
     readonly repository: SettingRepository,
     @Inject(CACHE_MANAGER) private readonly cacheManager: Cache,
-    private readonly logger: LoggerService,
     private readonly seeder: SettingSeeder,
   ) {
     super(repository);
diff --git a/api/src/user/controllers/auth.controller.spec.ts b/api/src/user/controllers/auth.controller.spec.ts
index 15858d6e..0ddd26a1 100644
--- a/api/src/user/controllers/auth.controller.spec.ts
+++ b/api/src/user/controllers/auth.controller.spec.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -12,10 +12,8 @@ import {
   UnauthorizedException,
 } from '@nestjs/common';
 import { BadRequestException } from '@nestjs/common/exceptions/bad-request.exception';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { JwtService } from '@nestjs/jwt';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 import { ISendMailOptions, MailerService } from '@nestjs-modules/mailer';
 import { SentMessageInfo } from 'nodemailer';
 
@@ -26,7 +24,6 @@ import { LanguageRepository } from '@/i18n/repositories/language.repository';
 import { LanguageModel } from '@/i18n/schemas/language.schema';
 import { I18nService } from '@/i18n/services/i18n.service';
 import { LanguageService } from '@/i18n/services/language.service';
-import { LoggerService } from '@/logger/logger.service';
 import { getRandom } from '@/utils/helpers/safeRandom';
 import { installLanguageFixtures } from '@/utils/test/fixtures/language';
 import { installUserFixtures } from '@/utils/test/fixtures/user';
@@ -34,6 +31,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 import { SocketEventDispatcherService } from '@/websocket/services/socket-event-dispatcher.service';
 import { WebsocketGateway } from '@/websocket/websocket.gateway';
 
@@ -64,7 +62,7 @@ describe('AuthController', () => {
   let baseUser: UserCreateDto;
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       controllers: [LocalAuthController],
       imports: [
         rootMongooseTestModule(async () => {
@@ -81,14 +79,12 @@ describe('AuthController', () => {
         ]),
       ],
       providers: [
-        LoggerService,
         UserService,
         WebsocketGateway,
         SocketEventDispatcherService,
         AttachmentService,
         AttachmentRepository,
         UserRepository,
-        LoggerService,
         PermissionService,
         RoleService,
         RoleRepository,
@@ -114,7 +110,6 @@ describe('AuthController', () => {
             set: jest.fn(),
           },
         },
-        EventEmitter2,
         ValidateAccountService,
         {
           provide: I18nService,
@@ -123,12 +118,15 @@ describe('AuthController', () => {
           },
         },
       ],
-    }).compile();
-    authController = module.get<LocalAuthController>(LocalAuthController);
-    userService = module.get<UserService>(UserService);
-    invitationService = module.get<InvitationService>(InvitationService);
-    roleService = module.get<RoleService>(RoleService);
-    jwtService = module.get<JwtService>(JwtService);
+    });
+    [authController, userService, invitationService, roleService, jwtService] =
+      await getMocks([
+        LocalAuthController,
+        UserService,
+        InvitationService,
+        RoleService,
+        JwtService,
+      ]);
     role = await roleService.findOne({});
     baseUser = {
       email: 'test@testing.com',
@@ -142,9 +140,7 @@ describe('AuthController', () => {
     await invitationService.create(baseUser);
   });
 
-  afterAll(async () => {
-    await closeInMongodConnection();
-  });
+  afterAll(closeInMongodConnection);
 
   afterEach(jest.clearAllMocks);
 
diff --git a/api/src/user/controllers/model.controller.spec.ts b/api/src/user/controllers/model.controller.spec.ts
index 840adbcb..743d7d3c 100644
--- a/api/src/user/controllers/model.controller.spec.ts
+++ b/api/src/user/controllers/model.controller.spec.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,14 +7,11 @@
  */
 
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
 import { AttachmentRepository } from '@/attachment/repositories/attachment.repository';
 import { AttachmentModel } from '@/attachment/schemas/attachment.schema';
 import { AttachmentService } from '@/attachment/services/attachment.service';
-import { LoggerService } from '@/logger/logger.service';
 import {
   installModelFixtures,
   modelFixtures,
@@ -23,6 +20,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { InvitationRepository } from '../repositories/invitation.repository';
 import { ModelRepository } from '../repositories/model.repository';
@@ -47,7 +45,7 @@ describe('ModelController', () => {
   let permissionService: PermissionService;
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       controllers: [ModelController],
       imports: [
         rootMongooseTestModule(installModelFixtures),
@@ -61,7 +59,6 @@ describe('ModelController', () => {
         ]),
       ],
       providers: [
-        LoggerService,
         PermissionService,
         AttachmentService,
         AttachmentRepository,
@@ -73,7 +70,6 @@ describe('ModelController', () => {
         RoleRepository,
         InvitationRepository,
         PermissionRepository,
-        EventEmitter2,
         {
           provide: CACHE_MANAGER,
           useValue: {
@@ -83,10 +79,12 @@ describe('ModelController', () => {
           },
         },
       ],
-    }).compile();
-    modelController = module.get<ModelController>(ModelController);
-    modelService = module.get<ModelService>(ModelService);
-    permissionService = module.get<PermissionService>(PermissionService);
+    });
+    [modelController, modelService, permissionService] = await getMocks([
+      ModelController,
+      ModelService,
+      PermissionService,
+    ]);
   });
 
   afterAll(closeInMongodConnection);
diff --git a/api/src/user/controllers/permission.controller.spec.ts b/api/src/user/controllers/permission.controller.spec.ts
index 4fcf1916..4869dccb 100644
--- a/api/src/user/controllers/permission.controller.spec.ts
+++ b/api/src/user/controllers/permission.controller.spec.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -8,16 +8,14 @@
 
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
 import { NotFoundException } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test } from '@nestjs/testing';
 
-import { LoggerService } from '@/logger/logger.service';
 import { installPermissionFixtures } from '@/utils/test/fixtures/permission';
 import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { PermissionCreateDto } from '../dto/permission.dto';
 import { InvitationRepository } from '../repositories/invitation.repository';
@@ -51,7 +49,7 @@ describe('PermissionController', () => {
   let allPermissions: Permission[];
 
   beforeAll(async () => {
-    const permissionModuleRef = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       controllers: [PermissionController],
       imports: [
         rootMongooseTestModule(installPermissionFixtures),
@@ -63,7 +61,6 @@ describe('PermissionController', () => {
         ]),
       ],
       providers: [
-        LoggerService,
         RoleService,
         ModelService,
         PermissionService,
@@ -71,7 +68,6 @@ describe('PermissionController', () => {
         RoleRepository,
         InvitationRepository,
         ModelRepository,
-        EventEmitter2,
         {
           provide: CACHE_MANAGER,
           useValue: {
@@ -81,15 +77,14 @@ describe('PermissionController', () => {
           },
         },
       ],
-    }).compile();
-
-    permissionController =
-      permissionModuleRef.get<PermissionController>(PermissionController);
-    roleService = permissionModuleRef.get<RoleService>(RoleService);
-    modelService = permissionModuleRef.get<ModelService>(ModelService);
-    permissionService =
-      permissionModuleRef.get<PermissionService>(PermissionService);
-
+    });
+    [permissionController, roleService, modelService, permissionService] =
+      await getMocks([
+        PermissionController,
+        RoleService,
+        ModelService,
+        PermissionService,
+      ]);
     allPermissions = await permissionService.findAll();
     adminRole = (await roleService.findOne({ name: 'admin' })) as Role;
     contentModel = (await modelService.findOne({ name: 'Content' })) as Model;
diff --git a/api/src/user/controllers/permission.controller.ts b/api/src/user/controllers/permission.controller.ts
index 6f3acb03..798cbf6f 100644
--- a/api/src/user/controllers/permission.controller.ts
+++ b/api/src/user/controllers/permission.controller.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -21,7 +21,6 @@ import {
 import { CsrfCheck } from '@tekuconcept/nestjs-csrf';
 
 import { CsrfInterceptor } from '@/interceptors/csrf.interceptor';
-import { LoggerService } from '@/logger/logger.service';
 import { BaseController } from '@/utils/generics/base-controller';
 import { PopulatePipe } from '@/utils/pipes/populate.pipe';
 import { SearchFilterPipe } from '@/utils/pipes/search-filter.pipe';
@@ -48,7 +47,6 @@ export class PermissionController extends BaseController<
 > {
   constructor(
     private readonly permissionService: PermissionService,
-    private readonly logger: LoggerService,
     private readonly roleService: RoleService,
     private readonly modelService: ModelService,
   ) {
diff --git a/api/src/user/controllers/role.controller.spec.ts b/api/src/user/controllers/role.controller.spec.ts
index ae444686..19ad536d 100644
--- a/api/src/user/controllers/role.controller.spec.ts
+++ b/api/src/user/controllers/role.controller.spec.ts
@@ -8,15 +8,12 @@
 
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
 import { ForbiddenException, NotFoundException } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 import { Request } from 'express';
 
 import { AttachmentRepository } from '@/attachment/repositories/attachment.repository';
 import { AttachmentModel } from '@/attachment/schemas/attachment.schema';
 import { AttachmentService } from '@/attachment/services/attachment.service';
-import { LoggerService } from '@/logger/logger.service';
 import { installPermissionFixtures } from '@/utils/test/fixtures/permission';
 import { roleFixtures } from '@/utils/test/fixtures/role';
 import { getPageQuery } from '@/utils/test/pagination';
@@ -24,6 +21,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { RoleCreateDto, RoleUpdateDto } from '../dto/role.dto';
 import { InvitationRepository } from '../repositories/invitation.repository';
@@ -49,7 +47,7 @@ describe('RoleController', () => {
   let rolePublic: Role;
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       controllers: [RoleController],
       imports: [
         rootMongooseTestModule(installPermissionFixtures),
@@ -62,7 +60,6 @@ describe('RoleController', () => {
         ]),
       ],
       providers: [
-        LoggerService,
         PermissionService,
         UserService,
         UserRepository,
@@ -70,7 +67,6 @@ describe('RoleController', () => {
         RoleRepository,
         InvitationRepository,
         PermissionRepository,
-        EventEmitter2,
         AttachmentService,
         AttachmentRepository,
         {
@@ -82,18 +78,19 @@ describe('RoleController', () => {
           },
         },
       ],
-    }).compile();
-    roleController = module.get<RoleController>(RoleController);
-    roleService = module.get<RoleService>(RoleService);
-    permissionService = module.get<PermissionService>(PermissionService);
-    userService = module.get<UserService>(UserService);
+    });
+    [roleController, roleService, permissionService, userService] =
+      await getMocks([
+        RoleController,
+        RoleService,
+        PermissionService,
+        UserService,
+      ]);
     roleAdmin = (await roleService.findOne({ name: 'admin' })) as Role;
     rolePublic = (await roleService.findOne({ name: 'public' })) as Role;
   });
 
-  afterAll(async () => {
-    await closeInMongodConnection();
-  });
+  afterAll(closeInMongodConnection);
 
   afterEach(jest.clearAllMocks);
 
diff --git a/api/src/user/controllers/role.controller.ts b/api/src/user/controllers/role.controller.ts
index e494aca1..98a93f7f 100644
--- a/api/src/user/controllers/role.controller.ts
+++ b/api/src/user/controllers/role.controller.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -25,7 +25,6 @@ import { CsrfCheck } from '@tekuconcept/nestjs-csrf';
 import { Request } from 'express';
 
 import { CsrfInterceptor } from '@/interceptors/csrf.interceptor';
-import { LoggerService } from '@/logger/logger.service';
 import { BaseController } from '@/utils/generics/base-controller';
 import { PageQueryDto } from '@/utils/pagination/pagination-query.dto';
 import { PageQueryPipe } from '@/utils/pagination/pagination-query.pipe';
@@ -49,7 +48,6 @@ export class RoleController extends BaseController<
 > {
   constructor(
     private readonly roleService: RoleService,
-    private readonly logger: LoggerService,
     private readonly userService: UserService,
   ) {
     super(roleService);
diff --git a/api/src/user/controllers/user.controller.spec.ts b/api/src/user/controllers/user.controller.spec.ts
index c7f5d889..cb1cc277 100644
--- a/api/src/user/controllers/user.controller.spec.ts
+++ b/api/src/user/controllers/user.controller.spec.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -8,10 +8,8 @@
 
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
 import { ForbiddenException, NotFoundException } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { JwtModule, JwtService } from '@nestjs/jwt';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 import { ISendMailOptions, MailerService } from '@nestjs-modules/mailer';
 import { Session as ExpressSession } from 'express-session';
 import { SentMessageInfo } from 'nodemailer';
@@ -23,7 +21,6 @@ import { LanguageRepository } from '@/i18n/repositories/language.repository';
 import { LanguageModel } from '@/i18n/schemas/language.schema';
 import { I18nService } from '@/i18n/services/i18n.service';
 import { LanguageService } from '@/i18n/services/language.service';
-import { LoggerService } from '@/logger/logger.service';
 import { IGNORED_TEST_FIELDS } from '@/utils/test/constants';
 import { installLanguageFixtures } from '@/utils/test/fixtures/language';
 import { installPermissionFixtures } from '@/utils/test/fixtures/permission';
@@ -33,6 +30,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { InvitationCreateDto } from '../dto/invitation.dto';
 import {
@@ -69,7 +67,7 @@ describe('UserController', () => {
   let passwordResetService: PasswordResetService;
   let jwtService: JwtService;
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       controllers: [ReadWriteUserController],
       imports: [
         rootMongooseTestModule(async () => {
@@ -87,7 +85,6 @@ describe('UserController', () => {
         JwtModule,
       ],
       providers: [
-        LoggerService,
         RoleService,
         UserService,
         InvitationService,
@@ -105,7 +102,6 @@ describe('UserController', () => {
         RoleRepository,
         PermissionRepository,
         InvitationRepository,
-        EventEmitter2,
         {
           provide: CACHE_MANAGER,
           useValue: {
@@ -126,19 +122,25 @@ describe('UserController', () => {
           },
         },
       ],
-    }).compile();
-    userController = module.get<ReadWriteUserController>(
+    });
+    [
+      userController,
+      userService,
+      roleService,
+      invitationService,
+      jwtService,
+      passwordResetService,
+    ] = await getMocks([
       ReadWriteUserController,
-    );
-    userService = module.get<UserService>(UserService);
-    roleService = module.get<RoleService>(RoleService);
-    invitationService = module.get<InvitationService>(InvitationService);
+      UserService,
+      RoleService,
+      InvitationService,
+      JwtService,
+      PasswordResetService,
+    ]);
     role = await roleService.findOne({ name: 'admin' });
     roles = await roleService.findAll();
     user = await userService.findOne({ username: 'admin' });
-    jwtService = module.get<JwtService>(JwtService);
-    passwordResetService =
-      module.get<PasswordResetService>(PasswordResetService);
   });
 
   const IGNORED_FIELDS = [...IGNORED_TEST_FIELDS, 'resetToken'];
diff --git a/api/src/user/controllers/user.controller.ts b/api/src/user/controllers/user.controller.ts
index da6e64d8..8e50027c 100644
--- a/api/src/user/controllers/user.controller.ts
+++ b/api/src/user/controllers/user.controller.ts
@@ -38,7 +38,6 @@ import {
 } from '@/attachment/types';
 import { config } from '@/config';
 import { CsrfInterceptor } from '@/interceptors/csrf.interceptor';
-import { LoggerService } from '@/logger/logger.service';
 import { Roles } from '@/utils/decorators/roles.decorator';
 import { BaseController } from '@/utils/generics/base-controller';
 import { generateInitialsAvatar, getBotAvatar } from '@/utils/helpers/avatar';
@@ -78,7 +77,6 @@ export class ReadOnlyUserController extends BaseController<
     protected readonly invitationService: InvitationService,
     protected readonly permissionService: PermissionService,
     protected readonly attachmentService: AttachmentService,
-    protected readonly logger: LoggerService,
     protected readonly passwordResetService: PasswordResetService,
     protected readonly validateAccountService: ValidateAccountService,
   ) {
diff --git a/api/src/user/repositories/invitation.repository.spec.ts b/api/src/user/repositories/invitation.repository.spec.ts
index 0f61ef0b..09715dbf 100644
--- a/api/src/user/repositories/invitation.repository.spec.ts
+++ b/api/src/user/repositories/invitation.repository.spec.ts
@@ -1,17 +1,14 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule, getModelToken } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 import { Model } from 'mongoose';
 
-import { LoggerService } from '@/logger/logger.service';
 import { PageQueryDto } from '@/utils/pagination/pagination-query.dto';
 import {
   installInvitationFixtures,
@@ -22,6 +19,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import {
   Invitation,
@@ -40,7 +38,7 @@ describe('InvitationRepository', () => {
   let invitationRepository: InvitationRepository;
   let invitationModel: Model<Invitation>;
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installInvitationFixtures),
         MongooseModule.forFeature([
@@ -49,25 +47,17 @@ describe('InvitationRepository', () => {
           InvitationModel,
         ]),
       ],
-      providers: [
-        RoleRepository,
-        InvitationRepository,
-        PermissionRepository,
-        LoggerService,
-        EventEmitter2,
-      ],
-    }).compile();
-    roleRepository = module.get<RoleRepository>(RoleRepository);
-    invitationRepository =
-      module.get<InvitationRepository>(InvitationRepository);
-    invitationModel = module.get<Model<Invitation>>(
-      getModelToken('Invitation'),
-    );
-  });
-  afterAll(async () => {
-    await closeInMongodConnection();
+      providers: [RoleRepository, InvitationRepository, PermissionRepository],
+    });
+    [roleRepository, invitationRepository, invitationModel] = await getMocks([
+      RoleRepository,
+      InvitationRepository,
+      getModelToken(Invitation.name),
+    ]);
   });
 
+  afterAll(closeInMongodConnection);
+
   afterEach(jest.clearAllMocks);
 
   describe('findOneAndPopulate', () => {
diff --git a/api/src/user/repositories/invitation.repository.ts b/api/src/user/repositories/invitation.repository.ts
index 027e2bf8..c1f52235 100644
--- a/api/src/user/repositories/invitation.repository.ts
+++ b/api/src/user/repositories/invitation.repository.ts
@@ -1,12 +1,11 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
@@ -27,11 +26,8 @@ export class InvitationRepository extends BaseRepository<
   InvitationPopulate,
   InvitationFull
 > {
-  constructor(
-    readonly eventEmitter: EventEmitter2,
-    @InjectModel(Invitation.name) readonly model: Model<Invitation>,
-  ) {
-    super(eventEmitter, model, Invitation, INVITATION_POPULATE, InvitationFull);
+  constructor(@InjectModel(Invitation.name) readonly model: Model<Invitation>) {
+    super(model, Invitation, INVITATION_POPULATE, InvitationFull);
   }
 
   /**
diff --git a/api/src/user/repositories/model.repository.spec.ts b/api/src/user/repositories/model.repository.spec.ts
index 0679d34f..0d809179 100644
--- a/api/src/user/repositories/model.repository.spec.ts
+++ b/api/src/user/repositories/model.repository.spec.ts
@@ -1,14 +1,12 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule, getModelToken } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 import { Model } from 'mongoose';
 
 import { modelFixtures } from '@/utils/test/fixtures/model';
@@ -17,6 +15,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { ModelRepository } from '../repositories/model.repository';
 import { PermissionRepository } from '../repositories/permission.repository';
@@ -33,17 +32,18 @@ describe('ModelRepository', () => {
   let permissions: Permission[];
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installPermissionFixtures),
         MongooseModule.forFeature([ModelModel, PermissionModel]),
       ],
-      providers: [ModelRepository, PermissionRepository, EventEmitter2],
-    }).compile();
-    permissionRepository =
-      module.get<PermissionRepository>(PermissionRepository);
-    modelRepository = module.get<ModelRepository>(ModelRepository);
-    modelModel = module.get<Model<ModelType>>(getModelToken('Model'));
+      providers: [ModelRepository, PermissionRepository],
+    });
+    [permissionRepository, modelRepository, modelModel] = await getMocks([
+      PermissionRepository,
+      ModelRepository,
+      getModelToken(Model.name),
+    ]);
     model = await modelRepository.findOne({ name: 'ContentType' });
     permissions = await permissionRepository.find({ model: model!.id });
   });
diff --git a/api/src/user/repositories/model.repository.ts b/api/src/user/repositories/model.repository.ts
index 9080cc31..665a3cdc 100644
--- a/api/src/user/repositories/model.repository.ts
+++ b/api/src/user/repositories/model.repository.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,7 +7,6 @@
  */
 
 import { Injectable } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model as MongooseModel } from 'mongoose';
 
@@ -28,12 +27,11 @@ export class ModelRepository extends BaseRepository<
   ModelFull
 > {
   constructor(
-    readonly eventEmitter: EventEmitter2,
     @InjectModel(Model.name) readonly model: MongooseModel<Model>,
     @InjectModel(Permission.name)
     private readonly permissionModel: MongooseModel<Permission>,
   ) {
-    super(eventEmitter, model, Model, MODEL_POPULATE, ModelFull);
+    super(model, Model, MODEL_POPULATE, ModelFull);
   }
 
   /**
diff --git a/api/src/user/repositories/permission.repository.spec.ts b/api/src/user/repositories/permission.repository.spec.ts
index 12da8738..5a32ad19 100644
--- a/api/src/user/repositories/permission.repository.spec.ts
+++ b/api/src/user/repositories/permission.repository.spec.ts
@@ -6,9 +6,7 @@
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule, getModelToken } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 import { Model } from 'mongoose';
 
 import {
@@ -19,6 +17,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { ModelRepository } from '../repositories/model.repository';
 import { PermissionRepository } from '../repositories/permission.repository';
@@ -44,7 +43,7 @@ describe('PermissionRepository', () => {
   let permissionToDelete: Permission;
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installPermissionFixtures),
         MongooseModule.forFeature([
@@ -59,16 +58,15 @@ describe('PermissionRepository', () => {
         RoleRepository,
         PermissionRepository,
         InvitationRepository,
-        EventEmitter2,
       ],
-    }).compile();
-    roleRepository = module.get<RoleRepository>(RoleRepository);
-    modelRepository = module.get<ModelRepository>(ModelRepository);
-    permissionRepository =
-      module.get<PermissionRepository>(PermissionRepository);
-    permissionModel = module.get<Model<Permission>>(
-      getModelToken('Permission'),
-    );
+    });
+    [roleRepository, modelRepository, permissionRepository, permissionModel] =
+      await getMocks([
+        RoleRepository,
+        ModelRepository,
+        PermissionRepository,
+        getModelToken(Permission.name),
+      ]);
     permission = (await permissionRepository.findOne({
       action: Action.CREATE,
     })) as Permission;
@@ -77,9 +75,7 @@ describe('PermissionRepository', () => {
     })) as Permission;
   });
 
-  afterAll(async () => {
-    await closeInMongodConnection();
-  });
+  afterAll(closeInMongodConnection);
 
   afterEach(jest.clearAllMocks);
 
diff --git a/api/src/user/repositories/permission.repository.ts b/api/src/user/repositories/permission.repository.ts
index dff4f5d0..d4a69bc7 100644
--- a/api/src/user/repositories/permission.repository.ts
+++ b/api/src/user/repositories/permission.repository.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,7 +7,6 @@
  */
 
 import { Injectable } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
@@ -28,10 +27,7 @@ export class PermissionRepository extends BaseRepository<
   PermissionFull,
   PermissionDto
 > {
-  constructor(
-    readonly eventEmitter: EventEmitter2,
-    @InjectModel(Permission.name) readonly model: Model<Permission>,
-  ) {
-    super(eventEmitter, model, Permission, PERMISSION_POPULATE, PermissionFull);
+  constructor(@InjectModel(Permission.name) readonly model: Model<Permission>) {
+    super(model, Permission, PERMISSION_POPULATE, PermissionFull);
   }
 }
diff --git a/api/src/user/repositories/role.repository.spec.ts b/api/src/user/repositories/role.repository.spec.ts
index 50728b48..da573eb7 100644
--- a/api/src/user/repositories/role.repository.spec.ts
+++ b/api/src/user/repositories/role.repository.spec.ts
@@ -6,9 +6,7 @@
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule, getModelToken } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 import { Model } from 'mongoose';
 
 import { installPermissionFixtures } from '@/utils/test/fixtures/permission';
@@ -17,6 +15,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { PermissionRepository } from '../repositories/permission.repository';
 import { RoleRepository } from '../repositories/role.repository';
@@ -39,7 +38,7 @@ describe('RoleRepository', () => {
   let roleToDelete: Role;
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installPermissionFixtures),
         MongooseModule.forFeature([
@@ -54,14 +53,15 @@ describe('RoleRepository', () => {
         RoleRepository,
         InvitationRepository,
         PermissionRepository,
-        EventEmitter2,
       ],
-    }).compile();
-    roleRepository = module.get<RoleRepository>(RoleRepository);
-    userRepository = module.get<UserRepository>(UserRepository);
-    permissionRepository =
-      module.get<PermissionRepository>(PermissionRepository);
-    roleModel = module.get<Model<Role>>(getModelToken('Role'));
+    });
+    [roleRepository, userRepository, permissionRepository, roleModel] =
+      await getMocks([
+        RoleRepository,
+        UserRepository,
+        PermissionRepository,
+        getModelToken(Role.name),
+      ]);
     role = (await roleRepository.findOne({ name: 'admin' })) as Role;
     users = (await userRepository.findAll()).filter((user) =>
       user.roles.includes(role.id),
@@ -71,9 +71,7 @@ describe('RoleRepository', () => {
     })) as Role;
   });
 
-  afterAll(async () => {
-    await closeInMongodConnection();
-  });
+  afterAll(closeInMongodConnection);
 
   afterEach(jest.clearAllMocks);
 
diff --git a/api/src/user/repositories/role.repository.ts b/api/src/user/repositories/role.repository.ts
index c3e9fa56..c54b63fb 100644
--- a/api/src/user/repositories/role.repository.ts
+++ b/api/src/user/repositories/role.repository.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,7 +7,6 @@
  */
 
 import { Injectable } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
@@ -31,14 +30,13 @@ export class RoleRepository extends BaseRepository<
   RoleDto
 > {
   constructor(
-    readonly eventEmitter: EventEmitter2,
     @InjectModel(Role.name) readonly model: Model<Role>,
     @InjectModel(Permission.name)
     private readonly permissionModel: Model<Permission>,
     @InjectModel(Invitation.name)
     private readonly invitationModel: Model<Invitation>,
   ) {
-    super(eventEmitter, model, Role, ROLE_POPULATE, RoleFull);
+    super(model, Role, ROLE_POPULATE, RoleFull);
   }
 
   /**
diff --git a/api/src/user/repositories/user.repository.spec.ts b/api/src/user/repositories/user.repository.spec.ts
index 139a1a16..4f148491 100644
--- a/api/src/user/repositories/user.repository.spec.ts
+++ b/api/src/user/repositories/user.repository.spec.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,13 +7,10 @@
  */
 
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule, getModelToken } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 import { Model } from 'mongoose';
 
 import { AttachmentModel } from '@/attachment/schemas/attachment.schema';
-import { LoggerService } from '@/logger/logger.service';
 import { IGNORED_TEST_FIELDS } from '@/utils/test/constants';
 import { installPermissionFixtures } from '@/utils/test/fixtures/permission';
 import { userFixtures } from '@/utils/test/fixtures/user';
@@ -22,6 +19,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { PermissionRepository } from '../repositories/permission.repository';
 import { RoleRepository } from '../repositories/role.repository';
@@ -53,7 +51,7 @@ describe('UserRepository', () => {
   ];
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installPermissionFixtures),
         MongooseModule.forFeature([
@@ -65,12 +63,10 @@ describe('UserRepository', () => {
         ]),
       ],
       providers: [
-        LoggerService,
         UserRepository,
         RoleRepository,
         InvitationRepository,
         PermissionRepository,
-        EventEmitter2,
         {
           provide: CACHE_MANAGER,
           useValue: {
@@ -80,10 +76,12 @@ describe('UserRepository', () => {
           },
         },
       ],
-    }).compile();
-    roleRepository = module.get<RoleRepository>(RoleRepository);
-    userRepository = module.get<UserRepository>(UserRepository);
-    userModel = module.get<Model<User>>(getModelToken('User'));
+    });
+    [roleRepository, userRepository, userModel] = await getMocks([
+      RoleRepository,
+      UserRepository,
+      getModelToken(User.name),
+    ]);
     user = await userRepository.findOne({ username: 'admin' });
     allRoles = await roleRepository.findAll();
   });
diff --git a/api/src/user/repositories/user.repository.ts b/api/src/user/repositories/user.repository.ts
index 4a361ee5..7c8d0450 100644
--- a/api/src/user/repositories/user.repository.ts
+++ b/api/src/user/repositories/user.repository.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,7 +7,6 @@
  */
 
 import { Injectable } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
 import {
   Document,
@@ -37,11 +36,8 @@ export class UserRepository extends BaseRepository<
   UserFull,
   UserDto
 > {
-  constructor(
-    readonly eventEmitter: EventEmitter2,
-    @InjectModel(User.name) readonly model: Model<User>,
-  ) {
-    super(eventEmitter, model, User, USER_POPULATE, UserFull);
+  constructor(@InjectModel(User.name) readonly model: Model<User>) {
+    super(model, User, USER_POPULATE, UserFull);
   }
 
   /**
diff --git a/api/src/user/services/auth.service.spec.ts b/api/src/user/services/auth.service.spec.ts
index b3f0dd59..5eb04552 100644
--- a/api/src/user/services/auth.service.spec.ts
+++ b/api/src/user/services/auth.service.spec.ts
@@ -1,25 +1,23 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { JwtService } from '@nestjs/jwt';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
 import { AttachmentRepository } from '@/attachment/repositories/attachment.repository';
 import { AttachmentModel } from '@/attachment/schemas/attachment.schema';
 import { AttachmentService } from '@/attachment/services/attachment.service';
-import { LoggerService } from '@/logger/logger.service';
 import { installUserFixtures } from '@/utils/test/fixtures/user';
 import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { InvitationRepository } from '../repositories/invitation.repository';
 import { RoleRepository } from '../repositories/role.repository';
@@ -38,7 +36,7 @@ describe('AuthService', () => {
   let userRepository: UserRepository;
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installUserFixtures),
         MongooseModule.forFeature([
@@ -50,7 +48,6 @@ describe('AuthService', () => {
         ]),
       ],
       providers: [
-        LoggerService,
         AuthService,
         UserService,
         UserRepository,
@@ -58,13 +55,14 @@ describe('AuthService', () => {
         RoleRepository,
         InvitationRepository,
         JwtService,
-        EventEmitter2,
         AttachmentService,
         AttachmentRepository,
       ],
-    }).compile();
-    authService = module.get<AuthService>(AuthService);
-    userRepository = module.get<UserRepository>(UserRepository);
+    });
+    [authService, userRepository] = await getMocks([
+      AuthService,
+      UserRepository,
+    ]);
     jest.spyOn(userRepository, 'findOne');
   });
 
diff --git a/api/src/user/services/invitation.service.spec.ts b/api/src/user/services/invitation.service.spec.ts
index 7672fc1d..c59127a1 100644
--- a/api/src/user/services/invitation.service.spec.ts
+++ b/api/src/user/services/invitation.service.spec.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,11 +7,8 @@
  */
 
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
-import { Logger } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { JwtModule, JwtService } from '@nestjs/jwt';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 import { ISendMailOptions, MailerService } from '@nestjs-modules/mailer';
 import { SentMessageInfo } from 'nodemailer';
 
@@ -19,7 +16,6 @@ import { LanguageRepository } from '@/i18n/repositories/language.repository';
 import { LanguageModel } from '@/i18n/schemas/language.schema';
 import { I18nService } from '@/i18n/services/i18n.service';
 import { LanguageService } from '@/i18n/services/language.service';
-import { LoggerService } from '@/logger/logger.service';
 import { IGNORED_TEST_FIELDS } from '@/utils/test/constants';
 import {
   installInvitationFixtures,
@@ -30,6 +26,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { InvitationCreateDto } from '../dto/invitation.dto';
 import { InvitationRepository } from '../repositories/invitation.repository';
@@ -52,7 +49,7 @@ describe('InvitationService', () => {
   const IGNORED_FIELDS = ['iat', 'exp', 'token', ...IGNORED_TEST_FIELDS];
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(async () => {
           await installLanguageFixtures();
@@ -67,7 +64,6 @@ describe('InvitationService', () => {
         JwtModule,
       ],
       providers: [
-        LoggerService,
         PermissionService,
         RoleService,
         RoleRepository,
@@ -76,8 +72,6 @@ describe('InvitationService', () => {
         InvitationService,
         LanguageRepository,
         LanguageService,
-        JwtService,
-        Logger,
         {
           provide: I18nService,
           useValue: {
@@ -94,7 +88,6 @@ describe('InvitationService', () => {
             ),
           },
         },
-        EventEmitter2,
         {
           provide: CACHE_MANAGER,
           useValue: {
@@ -104,18 +97,24 @@ describe('InvitationService', () => {
           },
         },
       ],
-    }).compile();
-    roleRepository = module.get<RoleRepository>(RoleRepository);
-    invitationService = module.get<InvitationService>(InvitationService);
-    invitationRepository =
-      module.get<InvitationRepository>(InvitationRepository);
-    jwtService = module.get<JwtService>(JwtService);
-    mailerService = module.get<MailerService>(MailerService);
-  });
-  afterAll(async () => {
-    await closeInMongodConnection();
+    });
+    [
+      roleRepository,
+      invitationService,
+      invitationRepository,
+      jwtService,
+      mailerService,
+    ] = await getMocks([
+      RoleRepository,
+      InvitationService,
+      InvitationRepository,
+      JwtService,
+      MailerService,
+    ]);
   });
 
+  afterAll(closeInMongodConnection);
+
   afterEach(jest.clearAllMocks);
 
   describe('sign', () => {
diff --git a/api/src/user/services/invitation.service.ts b/api/src/user/services/invitation.service.ts
index 7ed82097..b510038d 100644
--- a/api/src/user/services/invitation.service.ts
+++ b/api/src/user/services/invitation.service.ts
@@ -19,7 +19,6 @@ import { JwtService, JwtSignOptions } from '@nestjs/jwt';
 import { config } from '@/config';
 import { I18nService } from '@/i18n/services/i18n.service';
 import { LanguageService } from '@/i18n/services/language.service';
-import { LoggerService } from '@/logger/logger.service';
 import { BaseService } from '@/utils/generics/base-service';
 
 import { InvitationCreateDto } from '../dto/invitation.dto';
@@ -40,7 +39,6 @@ export class InvitationService extends BaseService<
     @Inject(InvitationRepository)
     readonly repository: InvitationRepository,
     @Inject(JwtService) private readonly jwtService: JwtService,
-    private logger: LoggerService,
     protected readonly i18n: I18nService,
     public readonly languageService: LanguageService,
     @Optional() private readonly mailerService?: MailerService,
diff --git a/api/src/user/services/model.service.spec.ts b/api/src/user/services/model.service.spec.ts
index ec1c13af..61b29466 100644
--- a/api/src/user/services/model.service.spec.ts
+++ b/api/src/user/services/model.service.spec.ts
@@ -1,14 +1,12 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
 import { modelFixtures } from '@/utils/test/fixtures/model';
 import { installPermissionFixtures } from '@/utils/test/fixtures/permission';
@@ -16,6 +14,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { ModelRepository } from '../repositories/model.repository';
 import { PermissionRepository } from '../repositories/permission.repository';
@@ -32,22 +31,18 @@ describe('ModelService', () => {
   let permissions: Permission[];
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installPermissionFixtures),
         MongooseModule.forFeature([ModelModel, PermissionModel]),
       ],
-      providers: [
-        ModelService,
-        ModelRepository,
-        PermissionRepository,
-        EventEmitter2,
-      ],
-    }).compile();
-    modelService = module.get<ModelService>(ModelService);
-    permissionRepository =
-      module.get<PermissionRepository>(PermissionRepository);
-    modelRepository = module.get<ModelRepository>(ModelRepository);
+      providers: [ModelService, ModelRepository, PermissionRepository],
+    });
+    [modelService, permissionRepository, modelRepository] = await getMocks([
+      ModelService,
+      PermissionRepository,
+      ModelRepository,
+    ]);
     model = await modelRepository.findOne({ name: 'ContentType' });
     permissions = await permissionRepository.find({ model: model!.id });
   });
diff --git a/api/src/user/services/passwordReset.service.spec.ts b/api/src/user/services/passwordReset.service.spec.ts
index c5f18c6b..e7c66c59 100644
--- a/api/src/user/services/passwordReset.service.spec.ts
+++ b/api/src/user/services/passwordReset.service.spec.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -8,10 +8,8 @@
 
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
 import { NotFoundException } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { JwtModule, JwtService } from '@nestjs/jwt';
 import { MongooseModule, getModelToken } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 import { ISendMailOptions, MailerService } from '@nestjs-modules/mailer';
 import { compareSync } from 'bcryptjs';
 import { Model } from 'mongoose';
@@ -24,13 +22,13 @@ import { LanguageRepository } from '@/i18n/repositories/language.repository';
 import { LanguageModel } from '@/i18n/schemas/language.schema';
 import { I18nService } from '@/i18n/services/i18n.service';
 import { LanguageService } from '@/i18n/services/language.service';
-import { LoggerService } from '@/logger/logger.service';
 import { installLanguageFixtures } from '@/utils/test/fixtures/language';
 import { installUserFixtures, users } from '@/utils/test/fixtures/user';
 import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { InvitationRepository } from '../repositories/invitation.repository';
 import { RoleRepository } from '../repositories/role.repository';
@@ -50,7 +48,7 @@ describe('PasswordResetService', () => {
   let jwtService: JwtService;
   let userModel: Model<User>;
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(async () => {
           await installLanguageFixtures();
@@ -76,9 +74,7 @@ describe('PasswordResetService', () => {
         InvitationRepository,
         LanguageService,
         LanguageRepository,
-        LoggerService,
         PasswordResetService,
-        JwtService,
         {
           provide: MailerService,
           useValue: {
@@ -94,7 +90,6 @@ describe('PasswordResetService', () => {
             t: jest.fn().mockImplementation((t) => t),
           },
         },
-        EventEmitter2,
         {
           provide: CACHE_MANAGER,
           useValue: {
@@ -104,12 +99,14 @@ describe('PasswordResetService', () => {
           },
         },
       ],
-    }).compile();
-    passwordResetService =
-      module.get<PasswordResetService>(PasswordResetService);
-    mailerService = module.get<MailerService>(MailerService);
-    jwtService = module.get<JwtService>(JwtService);
-    userModel = module.get<Model<User>>(getModelToken('User'));
+    });
+    [passwordResetService, mailerService, jwtService, userModel] =
+      await getMocks([
+        PasswordResetService,
+        MailerService,
+        JwtService,
+        getModelToken(User.name),
+      ]);
   });
 
   afterAll(closeInMongodConnection);
diff --git a/api/src/user/services/permission.service.spec.ts b/api/src/user/services/permission.service.spec.ts
index 1547acc1..7f70ad9a 100644
--- a/api/src/user/services/permission.service.spec.ts
+++ b/api/src/user/services/permission.service.spec.ts
@@ -7,11 +7,8 @@
  */
 
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
-import { LoggerService } from '@/logger/logger.service';
 import {
   installPermissionFixtures,
   permissionFixtures,
@@ -20,6 +17,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { InvitationRepository } from '../repositories/invitation.repository';
 import { ModelRepository } from '../repositories/model.repository';
@@ -45,7 +43,7 @@ describe('PermissionService', () => {
   let permission: Permission;
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installPermissionFixtures),
         MongooseModule.forFeature([
@@ -61,7 +59,6 @@ describe('PermissionService', () => {
         RoleRepository,
         InvitationRepository,
         PermissionRepository,
-        EventEmitter2,
         {
           provide: CACHE_MANAGER,
           useValue: {
@@ -70,22 +67,21 @@ describe('PermissionService', () => {
             set: jest.fn(),
           },
         },
-        LoggerService,
       ],
-    }).compile();
-    permissionService = module.get<PermissionService>(PermissionService);
-    roleRepository = module.get<RoleRepository>(RoleRepository);
-    modelRepository = module.get<ModelRepository>(ModelRepository);
-    permissionRepository =
-      module.get<PermissionRepository>(PermissionRepository);
+    });
+    [permissionService, roleRepository, modelRepository, permissionRepository] =
+      await getMocks([
+        PermissionService,
+        RoleRepository,
+        ModelRepository,
+        PermissionRepository,
+      ]);
     permission = (await permissionRepository.findOne({
       action: Action.CREATE,
     })) as Permission;
   });
 
-  afterAll(async () => {
-    await closeInMongodConnection();
-  });
+  afterAll(closeInMongodConnection);
 
   afterEach(jest.clearAllMocks);
 
diff --git a/api/src/user/services/role.service.spec.ts b/api/src/user/services/role.service.spec.ts
index de6533a7..9d46651f 100644
--- a/api/src/user/services/role.service.spec.ts
+++ b/api/src/user/services/role.service.spec.ts
@@ -6,9 +6,7 @@
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
 import { installPermissionFixtures } from '@/utils/test/fixtures/permission';
 import { getPageQuery } from '@/utils/test/pagination';
@@ -16,6 +14,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { InvitationRepository } from '../repositories/invitation.repository';
 import { PermissionRepository } from '../repositories/permission.repository';
@@ -39,7 +38,7 @@ describe('RoleService', () => {
   let permissions: Permission[];
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installPermissionFixtures),
         MongooseModule.forFeature([
@@ -55,14 +54,15 @@ describe('RoleService', () => {
         RoleRepository,
         InvitationRepository,
         PermissionRepository,
-        EventEmitter2,
       ],
-    }).compile();
-    roleService = module.get<RoleService>(RoleService);
-    roleRepository = module.get<RoleRepository>(RoleRepository);
-    userRepository = module.get<UserRepository>(UserRepository);
-    permissionRepository =
-      module.get<PermissionRepository>(PermissionRepository);
+    });
+    [roleService, roleRepository, userRepository, permissionRepository] =
+      await getMocks([
+        RoleService,
+        RoleRepository,
+        UserRepository,
+        PermissionRepository,
+      ]);
     role = (await roleRepository.findOne({ name: 'admin' })) as Role;
     users = (await userRepository.findAll()).filter((user) =>
       user.roles.includes(role.id),
@@ -71,9 +71,7 @@ describe('RoleService', () => {
     permissions = await permissionRepository.find({ role: role.id });
   });
 
-  afterAll(async () => {
-    await closeInMongodConnection();
-  });
+  afterAll(closeInMongodConnection);
 
   afterEach(jest.clearAllMocks);
 
diff --git a/api/src/user/services/user.service.spec.ts b/api/src/user/services/user.service.spec.ts
index 7b357984..b5b4b882 100644
--- a/api/src/user/services/user.service.spec.ts
+++ b/api/src/user/services/user.service.spec.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,14 +7,11 @@
  */
 
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 
 import { AttachmentRepository } from '@/attachment/repositories/attachment.repository';
 import { AttachmentModel } from '@/attachment/schemas/attachment.schema';
 import { AttachmentService } from '@/attachment/services/attachment.service';
-import { LoggerService } from '@/logger/logger.service';
 import { IGNORED_TEST_FIELDS } from '@/utils/test/constants';
 import { installPermissionFixtures } from '@/utils/test/fixtures/permission';
 import { userFixtures } from '@/utils/test/fixtures/user';
@@ -23,6 +20,7 @@ import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { InvitationRepository } from '../repositories/invitation.repository';
 import { PermissionRepository } from '../repositories/permission.repository';
@@ -56,7 +54,7 @@ describe('UserService', () => {
   ];
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(installPermissionFixtures),
         MongooseModule.forFeature([
@@ -68,7 +66,6 @@ describe('UserService', () => {
         ]),
       ],
       providers: [
-        LoggerService,
         UserService,
         AttachmentService,
         AttachmentRepository,
@@ -78,7 +75,6 @@ describe('UserService', () => {
         RoleRepository,
         InvitationRepository,
         PermissionRepository,
-        EventEmitter2,
         {
           provide: CACHE_MANAGER,
           useValue: {
@@ -88,10 +84,12 @@ describe('UserService', () => {
           },
         },
       ],
-    }).compile();
-    userService = module.get<UserService>(UserService);
-    roleRepository = module.get<RoleRepository>(RoleRepository);
-    userRepository = module.get<UserRepository>(UserRepository);
+    });
+    [userService, roleRepository, userRepository] = await getMocks([
+      UserService,
+      RoleRepository,
+      UserRepository,
+    ]);
     user = await userRepository.findOne({ username: 'admin' });
     allRoles = await roleRepository.findAll();
   });
diff --git a/api/src/user/services/validate-account.service.spec.ts b/api/src/user/services/validate-account.service.spec.ts
index 84bad094..cae6ab77 100644
--- a/api/src/user/services/validate-account.service.spec.ts
+++ b/api/src/user/services/validate-account.service.spec.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,10 +7,8 @@
  */
 
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { JwtModule } from '@nestjs/jwt';
 import { MongooseModule } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 import { ISendMailOptions, MailerService } from '@nestjs-modules/mailer';
 import { SentMessageInfo } from 'nodemailer';
 
@@ -21,13 +19,13 @@ import { LanguageRepository } from '@/i18n/repositories/language.repository';
 import { LanguageModel } from '@/i18n/schemas/language.schema';
 import { I18nService } from '@/i18n/services/i18n.service';
 import { LanguageService } from '@/i18n/services/language.service';
-import { LoggerService } from '@/logger/logger.service';
 import { installLanguageFixtures } from '@/utils/test/fixtures/language';
 import { installUserFixtures, users } from '@/utils/test/fixtures/user';
 import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { InvitationRepository } from '../repositories/invitation.repository';
 import { RoleRepository } from '../repositories/role.repository';
@@ -45,7 +43,7 @@ describe('ValidateAccountService', () => {
   let validateAccountService: ValidateAccountService;
   let mailerService: MailerService;
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [
         rootMongooseTestModule(async () => {
           await installLanguageFixtures();
@@ -71,7 +69,6 @@ describe('ValidateAccountService', () => {
         InvitationRepository,
         LanguageService,
         LanguageRepository,
-        LoggerService,
         {
           provide: MailerService,
           useValue: {
@@ -81,7 +78,6 @@ describe('ValidateAccountService', () => {
             ),
           },
         },
-        EventEmitter2,
         ValidateAccountService,
         {
           provide: I18nService,
@@ -98,18 +94,17 @@ describe('ValidateAccountService', () => {
           },
         },
       ],
-    }).compile();
-    validateAccountService = module.get<ValidateAccountService>(
+    });
+    [validateAccountService, mailerService] = await getMocks([
       ValidateAccountService,
-    );
+      MailerService,
+    ]);
+  });
 
-    mailerService = module.get<MailerService>(MailerService);
-  });
-  afterAll(async () => {
-    await closeInMongodConnection();
-  });
+  afterAll(closeInMongodConnection);
 
   afterEach(jest.clearAllMocks);
+
   describe('sendConfirmationEmail', () => {
     it('should send an email with a token', async () => {
       const sendMailSpy = jest.spyOn(mailerService, 'sendMail');
diff --git a/api/src/utils/generics/base-controller.ts b/api/src/utils/generics/base-controller.ts
index bb427c71..d8c46572 100644
--- a/api/src/utils/generics/base-controller.ts
+++ b/api/src/utils/generics/base-controller.ts
@@ -6,8 +6,9 @@
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { NotFoundException } from '@nestjs/common';
+import { Inject, NotFoundException } from '@nestjs/common';
 
+import { LoggerService } from '@/logger/logger.service';
 import { TFilterQuery } from '@/utils/types/filter.types';
 
 import { DtoConfig } from '../types/dto.types';
@@ -23,7 +24,14 @@ export abstract class BaseController<
   TFull extends Omit<T, P> = never,
   Dto extends DtoConfig = object,
 > {
-  constructor(protected readonly service: BaseService<T, P, TFull, Dto>) {}
+  eventEmitter: typeof this.service.eventEmitter;
+
+  @Inject(LoggerService)
+  readonly logger: LoggerService;
+
+  constructor(protected readonly service: BaseService<T, P, TFull, Dto>) {
+    this.eventEmitter = service.eventEmitter;
+  }
 
   /**
    * Checks if the given populate fields are allowed based on the allowed fields list.
diff --git a/api/src/utils/generics/base-repository.spec.ts b/api/src/utils/generics/base-repository.spec.ts
index 06241861..95d19fdb 100644
--- a/api/src/utils/generics/base-repository.spec.ts
+++ b/api/src/utils/generics/base-repository.spec.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,7 +7,6 @@
  */
 
 import { getModelToken } from '@nestjs/mongoose';
-import { Test, TestingModule } from '@nestjs/testing';
 import { Model, Types } from 'mongoose';
 
 import { DummyRepository } from '@/utils/test/dummy/repositories/dummy.repository';
@@ -15,6 +14,7 @@ import { closeInMongodConnection } from '@/utils/test/test';
 
 import { DummyModule } from '../test/dummy/dummy.module';
 import { Dummy } from '../test/dummy/schemas/dummy.schema';
+import { buildTestingMocks } from '../test/utils';
 
 describe('BaseRepository', () => {
   let dummyModel: Model<Dummy>;
@@ -22,11 +22,13 @@ describe('BaseRepository', () => {
   let createdId: string;
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [DummyModule],
-    }).compile();
-    dummyModel = module.get<Model<Dummy>>(getModelToken(Dummy.name));
-    dummyRepository = module.get<DummyRepository>(DummyRepository);
+    });
+    [dummyRepository, dummyModel] = await getMocks([
+      DummyRepository,
+      getModelToken(Dummy.name),
+    ]);
   });
   afterEach(jest.clearAllMocks);
   afterAll(closeInMongodConnection);
diff --git a/api/src/utils/generics/base-repository.ts b/api/src/utils/generics/base-repository.ts
index 42174e82..38834083 100644
--- a/api/src/utils/generics/base-repository.ts
+++ b/api/src/utils/generics/base-repository.ts
@@ -6,6 +6,7 @@
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
+import { Inject } from '@nestjs/common';
 import {
   EventEmitter2,
   IHookEntities,
@@ -27,6 +28,7 @@ import {
   UpdateWriteOpResult,
 } from 'mongoose';
 
+import { LoggerService } from '@/logger/logger.service';
 import { TFilterQuery } from '@/utils/types/filter.types';
 
 import { PageQueryDto, QuerySortDto } from '../pagination/pagination-query.dto';
@@ -79,8 +81,13 @@ export abstract class BaseRepository<
 
   private readonly leanOpts = { virtuals: true, defaults: true, getters: true };
 
+  @Inject(EventEmitter2)
+  readonly eventEmitter: EventEmitter2;
+
+  @Inject(LoggerService)
+  readonly logger: LoggerService;
+
   constructor(
-    private readonly emitter: EventEmitter2,
     readonly model: Model<T>,
     private readonly cls: new () => T,
     protected readonly populate: P[] = [],
@@ -112,7 +119,7 @@ export abstract class BaseRepository<
     hooks.validate.pre.execute(async function () {
       const doc = this as HydratedDocument<T>;
       await repository.preCreateValidate(doc);
-      await repository.emitter.emitAsync(
+      await repository.eventEmitter.emitAsync(
         repository.getEventName(EHook.preCreateValidate),
         doc,
       );
@@ -120,7 +127,7 @@ export abstract class BaseRepository<
 
     hooks.validate.post.execute(async function (created: HydratedDocument<T>) {
       await repository.postCreateValidate(created);
-      await repository.emitter.emitAsync(
+      await repository.eventEmitter.emitAsync(
         repository.getEventName(EHook.postCreateValidate),
         created,
       );
@@ -129,7 +136,7 @@ export abstract class BaseRepository<
     hooks.save.pre.execute(async function () {
       const doc = this as HydratedDocument<T>;
       await repository.preCreate(doc);
-      await repository.emitter.emitAsync(
+      await repository.eventEmitter.emitAsync(
         repository.getEventName(EHook.preCreate),
         doc,
       );
@@ -137,7 +144,7 @@ export abstract class BaseRepository<
 
     hooks.save.post.execute(async function (created: HydratedDocument<T>) {
       await repository.postCreate(created);
-      await repository.emitter.emitAsync(
+      await repository.eventEmitter.emitAsync(
         repository.getEventName(EHook.postCreate),
         created,
       );
@@ -147,7 +154,7 @@ export abstract class BaseRepository<
       const query = this as Query<DeleteResult, D, unknown, T, 'deleteOne'>;
       const criteria = query.getQuery();
       await repository.preDelete(query, criteria);
-      await repository.emitter.emitAsync(
+      await repository.eventEmitter.emitAsync(
         repository.getEventName(EHook.preDelete),
         query,
         criteria,
@@ -157,7 +164,7 @@ export abstract class BaseRepository<
     hooks?.deleteOne.post.execute(async function (result: DeleteResult) {
       const query = this as Query<DeleteResult, D, unknown, T, 'deleteOne'>;
       await repository.postDelete(query, result);
-      await repository.emitter.emitAsync(
+      await repository.eventEmitter.emitAsync(
         repository.getEventName(EHook.postDelete),
         query,
         result,
@@ -168,15 +175,21 @@ export abstract class BaseRepository<
       const query = this as Query<DeleteResult, D, unknown, T, 'deleteMany'>;
       const criteria = query.getQuery();
       await repository.preDelete(query, criteria);
+      await repository.eventEmitter.emitAsync(
+        repository.getEventName(EHook.preDelete),
+        query,
+        criteria,
+      );
     });
 
     hooks.deleteMany.post.execute(async function (result: DeleteResult) {
-      await repository.emitter.emitAsync(
-        repository.getEventName(EHook.postDelete),
-        result,
-      );
       const query = this as Query<DeleteResult, D, unknown, T, 'deleteMany'>;
       await repository.postDelete(query, result);
+      await repository.eventEmitter.emitAsync(
+        repository.getEventName(EHook.postDelete),
+        query,
+        result,
+      );
     });
 
     hooks.findOneAndUpdate.pre.execute(async function () {
@@ -187,7 +200,7 @@ export abstract class BaseRepository<
         throw new Error('Unable to run findOneAndUpdate pre hook');
       }
       await repository.preUpdate(query, criteria, updates);
-      await repository.emitter.emitAsync(
+      await repository.eventEmitter.emitAsync(
         repository.getEventName(EHook.preUpdate),
         criteria,
         updates?.['$set'],
@@ -202,7 +215,7 @@ export abstract class BaseRepository<
         throw new Error('Unable to execute updateMany() pre-hook');
       }
       await repository.preUpdateMany(query, criteria, updates);
-      await repository.emitter.emitAsync(
+      await repository.eventEmitter.emitAsync(
         repository.getEventName(EHook.preUpdateMany),
         criteria,
         updates?.['$set'],
@@ -212,7 +225,7 @@ export abstract class BaseRepository<
     hooks.updateMany.post.execute(async function (updated: any) {
       const query = this as Query<D, D, unknown, T, 'updateMany'>;
       await repository.postUpdateMany(query, updated);
-      await repository.emitter.emitAsync(
+      await repository.eventEmitter.emitAsync(
         repository.getEventName(EHook.postUpdateMany),
         updated,
       );
@@ -227,7 +240,7 @@ export abstract class BaseRepository<
           query,
           plainToClass(repository.cls, updated, repository.transformOpts),
         );
-        await repository.emitter.emitAsync(
+        await repository.eventEmitter.emitAsync(
           repository.getEventName(EHook.postUpdate),
           updated,
         );
@@ -503,14 +516,14 @@ export abstract class BaseRepository<
     }
 
     await this.preUpdateValidate(filterCriteria, queryUpdates);
-    await this.emitter.emitAsync(
+    await this.eventEmitter.emitAsync(
       this.getEventName(EHook.preUpdateValidate),
       filterCriteria,
       queryUpdates,
     );
 
     await this.postUpdateValidate(filterCriteria, queryUpdates);
-    await this.emitter.emitAsync(
+    await this.eventEmitter.emitAsync(
       this.getEventName(EHook.postUpdateValidate),
       filterCriteria,
       queryUpdates,
diff --git a/api/src/utils/generics/base-service.spec.ts b/api/src/utils/generics/base-service.spec.ts
index 20ffc076..4b45d868 100644
--- a/api/src/utils/generics/base-service.spec.ts
+++ b/api/src/utils/generics/base-service.spec.ts
@@ -6,13 +6,12 @@
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { Test, TestingModule } from '@nestjs/testing';
-
 import { DummyService } from '@/utils/test/dummy/services/dummy.service';
 import { closeInMongodConnection } from '@/utils/test/test';
 
 import { DummyModule } from '../test/dummy/dummy.module';
 import { DummyRepository } from '../test/dummy/repositories/dummy.repository';
+import { buildTestingMocks } from '../test/utils';
 
 describe('BaseService', () => {
   let dummyRepository: DummyRepository;
@@ -30,11 +29,13 @@ describe('BaseService', () => {
   };
 
   beforeAll(async () => {
-    const module: TestingModule = await Test.createTestingModule({
+    const { getMocks } = await buildTestingMocks({
       imports: [DummyModule],
-    }).compile();
-    dummyRepository = module.get<DummyRepository>(DummyRepository);
-    dummyService = module.get<DummyService>(DummyService);
+    });
+    [dummyRepository, dummyService] = await getMocks([
+      DummyRepository,
+      DummyService,
+    ]);
   });
   afterEach(jest.clearAllMocks);
   afterAll(closeInMongodConnection);
diff --git a/api/src/utils/generics/base-service.ts b/api/src/utils/generics/base-service.ts
index 3a74b202..a4a004c1 100644
--- a/api/src/utils/generics/base-service.ts
+++ b/api/src/utils/generics/base-service.ts
@@ -6,11 +6,12 @@
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { ConflictException } from '@nestjs/common';
+import { ConflictException, Inject } from '@nestjs/common';
 import { ClassTransformOptions } from 'class-transformer';
 import { MongoError } from 'mongodb';
 import { ProjectionType, QueryOptions } from 'mongoose';
 
+import { LoggerService } from '@/logger/logger.service';
 import { TFilterQuery } from '@/utils/types/filter.types';
 
 import { PageQueryDto, QuerySortDto } from '../pagination/pagination-query.dto';
@@ -26,9 +27,14 @@ export abstract class BaseService<
   Dto extends DtoConfig = object,
   U extends Omit<T, keyof BaseSchema> = Omit<T, keyof BaseSchema>,
 > {
-  constructor(
-    protected readonly repository: BaseRepository<T, P, TFull, Dto>,
-  ) {}
+  eventEmitter: typeof this.repository.eventEmitter;
+
+  @Inject(LoggerService)
+  readonly logger: LoggerService;
+
+  constructor(protected readonly repository: BaseRepository<T, P, TFull, Dto>) {
+    this.eventEmitter = repository.eventEmitter;
+  }
 
   getRepository() {
     return this.repository;
diff --git a/api/src/utils/test/dummy/dummy.module.ts b/api/src/utils/test/dummy/dummy.module.ts
index fccb2a70..a0bdea62 100644
--- a/api/src/utils/test/dummy/dummy.module.ts
+++ b/api/src/utils/test/dummy/dummy.module.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -10,6 +10,7 @@ import { Module } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { MongooseModule } from '@nestjs/mongoose';
 
+import { LoggerService } from '@/logger/logger.service';
 import { installDummyFixtures } from '@/utils/test/fixtures/dummy';
 import { rootMongooseTestModule } from '@/utils/test/test';
 
@@ -22,6 +23,6 @@ import { DummyService } from './services/dummy.service';
     rootMongooseTestModule(installDummyFixtures),
     MongooseModule.forFeature([DummyModel]),
   ],
-  providers: [DummyRepository, DummyService, EventEmitter2],
+  providers: [DummyRepository, DummyService, EventEmitter2, LoggerService],
 })
 export class DummyModule {}
diff --git a/api/src/utils/test/dummy/repositories/dummy.repository.ts b/api/src/utils/test/dummy/repositories/dummy.repository.ts
index 8d9a3ca5..1411e9db 100644
--- a/api/src/utils/test/dummy/repositories/dummy.repository.ts
+++ b/api/src/utils/test/dummy/repositories/dummy.repository.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,7 +7,6 @@
  */
 
 import { Injectable } from '@nestjs/common';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 
@@ -17,10 +16,7 @@ import { Dummy } from '../schemas/dummy.schema';
 
 @Injectable()
 export class DummyRepository extends BaseRepository<Dummy> {
-  constructor(
-    readonly eventEmitter: EventEmitter2,
-    @InjectModel(Dummy.name) readonly model: Model<Dummy>,
-  ) {
-    super(eventEmitter, model, Dummy);
+  constructor(@InjectModel(Dummy.name) readonly model: Model<Dummy>) {
+    super(model, Dummy);
   }
 }
diff --git a/api/src/utils/test/fixtures/setting.ts b/api/src/utils/test/fixtures/setting.ts
index 39ccfadb..7e848aee 100644
--- a/api/src/utils/test/fixtures/setting.ts
+++ b/api/src/utils/test/fixtures/setting.ts
@@ -11,6 +11,7 @@ import mongoose from 'mongoose';
 import { SettingCreateDto } from '@/setting/dto/setting.dto';
 import { SettingModel } from '@/setting/schemas/setting.schema';
 import { SettingType } from '@/setting/schemas/types';
+import { getRandom } from '@/utils/helpers/safeRandom';
 
 export const settingFixtures: SettingCreateDto[] = [
   {
@@ -90,6 +91,41 @@ export const settingFixtures: SettingCreateDto[] = [
     type: SettingType.text,
     weight: 10,
   },
+  {
+    group: `${getRandom()}_channel`,
+    label: `${getRandom()}`,
+    value: '',
+    type: SettingType.text,
+    weight: 11,
+  },
+  {
+    group: `${getRandom()}_helper`,
+    label: `${getRandom()}`,
+    value: '',
+    type: SettingType.text,
+    weight: 12,
+  },
+  {
+    group: `${getRandom()}_channel`,
+    label: `${getRandom()}`,
+    value: '',
+    type: SettingType.text,
+    weight: 13,
+  },
+  {
+    group: `${getRandom()}_helper`,
+    label: `${getRandom()}`,
+    value: '',
+    type: SettingType.text,
+    weight: 14,
+  },
+  {
+    group: 'local_storage_helper',
+    label: 'default storage helper label',
+    value: 'local-storage-helper',
+    type: SettingType.text,
+    weight: 15,
+  },
 ];
 
 export const installSettingFixtures = async () => {
diff --git a/api/src/utils/test/utils.ts b/api/src/utils/test/utils.ts
new file mode 100644
index 00000000..13da6e7d
--- /dev/null
+++ b/api/src/utils/test/utils.ts
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2025 Hexastack. All rights reserved.
+ *
+ * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
+ * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
+ * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
+ */
+
+import { ModuleMetadata } from '@nestjs/common';
+import { EventEmitter2 } from '@nestjs/event-emitter';
+import { Test, TestingModule } from '@nestjs/testing';
+
+import { LoggerService } from '@/logger/logger.service';
+
+type TTypeOrToken = [
+  new (...args: any[]) => any,
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-expect-error
+  ...(new (...args: any[]) => any[]),
+];
+const findInstances = async <T extends TTypeOrToken>(
+  type: keyof TestingModule,
+  module: TestingModule,
+  typesOrTokens: T,
+): Promise<{ [K in keyof T]: InstanceType<T[K]> }> =>
+  Promise.all(
+    typesOrTokens.map((typeOrToken) =>
+      module[type.toString()]<InstanceType<typeof typeOrToken>>(typeOrToken),
+    ),
+  );
+
+const extractInstances =
+  (type: keyof TestingModule, module: TestingModule) =>
+  async <T extends TTypeOrToken>(types: T) =>
+    await findInstances(type, module, types);
+
+export const buildTestingMocks = async ({
+  providers,
+  ...rest
+}: ModuleMetadata) => {
+  const module = await Test.createTestingModule({
+    ...rest,
+    ...(providers && {
+      providers: [LoggerService, EventEmitter2, ...providers],
+    }),
+  }).compile();
+
+  return {
+    module,
+    getMocks: extractInstances('get', module),
+    resolveMocks: extractInstances('resolve', module),
+  };
+};
diff --git a/api/src/utils/types/format.types.ts b/api/src/utils/types/format.types.ts
new file mode 100644
index 00000000..2336a6c1
--- /dev/null
+++ b/api/src/utils/types/format.types.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright © 2025 Hexastack. All rights reserved.
+ *
+ * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
+ * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
+ * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
+ */
+
+export enum Format {
+  NONE = 0,
+  STUB = 1,
+  BASIC = 2,
+  FULL = 3,
+}
+
+export type TStubOrFull<TF, TStub, TFull> = TF extends Format.STUB
+  ? TStub
+  : TFull;
diff --git a/api/src/websocket/services/socket-event-dispatcher.service.ts b/api/src/websocket/services/socket-event-dispatcher.service.ts
index bd25dd37..326bb3e9 100644
--- a/api/src/websocket/services/socket-event-dispatcher.service.ts
+++ b/api/src/websocket/services/socket-event-dispatcher.service.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -16,8 +16,6 @@ import { ModulesContainer } from '@nestjs/core';
 import { InstanceWrapper } from '@nestjs/core/injector/instance-wrapper';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 
-import { LoggerService } from '@/logger/logger.service';
-
 import { SocketEventMetadataStorage } from '../storage/socket-event-metadata.storage';
 import { SocketRequest } from '../utils/socket-request';
 import { SocketResponse } from '../utils/socket-response';
@@ -39,7 +37,6 @@ export class SocketEventDispatcherService implements OnModuleInit {
   constructor(
     private readonly eventEmitter: EventEmitter2,
     private readonly modulesContainer: ModulesContainer,
-    private readonly logger: LoggerService,
   ) {}
 
   async handleEvent(
diff --git a/api/src/websocket/websocket.gateway.spec.ts b/api/src/websocket/websocket.gateway.spec.ts
index b47cedac..d64e3a3b 100644
--- a/api/src/websocket/websocket.gateway.spec.ts
+++ b/api/src/websocket/websocket.gateway.spec.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -8,14 +8,13 @@
 
 import { INestApplication } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
-import { Test } from '@nestjs/testing';
 import { Socket, io } from 'socket.io-client';
 
-import { LoggerService } from '@/logger/logger.service';
 import {
   closeInMongodConnection,
   rootMongooseTestModule,
 } from '@/utils/test/test';
+import { buildTestingMocks } from '@/utils/test/utils';
 
 import { SocketEventDispatcherService } from './services/socket-event-dispatcher.service';
 import { WebsocketGateway } from './websocket.gateway';
@@ -27,10 +26,9 @@ describe('WebsocketGateway', () => {
 
   beforeAll(async () => {
     // Instantiate the app
-    const testingModule = await Test.createTestingModule({
+    const { module } = await buildTestingMocks({
       providers: [
         WebsocketGateway,
-        LoggerService,
         EventEmitter2,
         SocketEventDispatcherService,
       ],
@@ -41,8 +39,8 @@ describe('WebsocketGateway', () => {
           return Promise.resolve();
         }),
       ],
-    }).compile();
-    app = testingModule.createNestApplication();
+    });
+    app = module.createNestApplication();
     // Get the gateway instance from the app instance
     gateway = app.get<WebsocketGateway>(WebsocketGateway);
     // Create a new client that will interact with the gateway
diff --git a/api/test/app.e2e-spec.ts b/api/test/app.e2e-spec.ts
index 8aa73c07..f78c3fbc 100644
--- a/api/test/app.e2e-spec.ts
+++ b/api/test/app.e2e-spec.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,20 +7,21 @@
  */
 
 import { INestApplication } from '@nestjs/common';
-import { Test, TestingModule } from '@nestjs/testing';
 import request from 'supertest';
 
+import { buildTestingMocks } from '@/utils/test/utils';
+
 import { HexabotModule } from './../src/app.module';
 
 describe('AppController (e2e)', () => {
   let app: INestApplication;
 
   beforeEach(async () => {
-    const moduleFixture: TestingModule = await Test.createTestingModule({
+    const { module } = await buildTestingMocks({
       imports: [HexabotModule],
-    }).compile();
+    });
 
-    app = moduleFixture.createNestApplication();
+    app = module.createNestApplication();
     await app.init();
   });
 
diff --git a/api/types/event-emitter.d.ts b/api/types/event-emitter.d.ts
index 1c8869e4..6d9ce2d3 100644
--- a/api/types/event-emitter.d.ts
+++ b/api/types/event-emitter.d.ts
@@ -330,11 +330,18 @@ declare module '@nestjs/event-emitter' {
         : `hook:${G}:${TNormalizedOrCustomized<G>}`
       : never;
 
+  type TEventName = Exclude<
+    customEvent<EventNamespaces | ConstrainedString>,
+    `${string}:*`
+  >;
+
   interface ListenerFn<G extends EventNamespaces | ConstrainedString> {
     (value: EventValueOf<G>, ...values: any[]): void;
   }
 
   class EventEmitter2 {
+    constructor(options?: ConstructorOptions);
+
     emit<G extends EventNamespaces | ConstrainedString, H extends G>(
       customEvent: customEvent<G>,
       value: EventValueOf<H>,
@@ -396,6 +403,8 @@ declare module '@nestjs/event-emitter' {
       customEvent: customEvent<G>,
       listener: ListenerFn<H>,
     ): this;
+
+    readonly event: TEventName;
   }
 
   declare type OnEventMethodDecorator<
diff --git a/frontend/public/locales/en/translation.json b/frontend/public/locales/en/translation.json
index 93781e15..94124e91 100644
--- a/frontend/public/locales/en/translation.json
+++ b/frontend/public/locales/en/translation.json
@@ -334,6 +334,7 @@
     "nlp": "NLU",
     "nlp_entity": "Entity",
     "nlp_entity_value": "Value",
+    "nlp_samples_count": "Samples count",
     "value": "Value",
     "synonyms": "Synonyms",
     "lookups": "Lookups",
diff --git a/frontend/public/locales/fr/translation.json b/frontend/public/locales/fr/translation.json
index 208dfc25..cd32248c 100644
--- a/frontend/public/locales/fr/translation.json
+++ b/frontend/public/locales/fr/translation.json
@@ -334,6 +334,7 @@
     "nlp": "NLU",
     "nlp_entity": "Entité NLU",
     "nlp_entity_value": "Valeur NLU",
+    "nlp_samples_count": "Nombre des échantillons",
     "value": "Valeur",
     "lookups": "Stratégies",
     "lookup_strategies": "Stratégie de recherche",
diff --git a/frontend/src/app-components/dialogs/GenericFormDialog.tsx b/frontend/src/app-components/dialogs/GenericFormDialog.tsx
index f73e0e57..df387ecb 100644
--- a/frontend/src/app-components/dialogs/GenericFormDialog.tsx
+++ b/frontend/src/app-components/dialogs/GenericFormDialog.tsx
@@ -24,11 +24,13 @@ export const GenericFormDialog = <T,>({
   Form,
   rowKey,
   payload: data,
+  editText,
+  addText,
   ...rest
 }: GenericFormDialogProps<T>) => {
   const { t } = useTranslate();
   const hasRow = rowKey ? data?.[rowKey] : data;
-  const translationKey = hasRow ? rest.editText : rest.addText;
+  const translationKey = hasRow ? editText : addText;
 
   return (
     <Form
diff --git a/frontend/src/components/nlp/components/NlpSample.tsx b/frontend/src/components/nlp/components/NlpSample.tsx
index 8c068a4f..bde59faa 100644
--- a/frontend/src/components/nlp/components/NlpSample.tsx
+++ b/frontend/src/components/nlp/components/NlpSample.tsx
@@ -392,6 +392,7 @@ export default function NlpSample() {
                   `nlpsample/export${type ? `?type=${type}` : ""}`,
                 )}
                 startIcon={<DownloadIcon />}
+                disabled={dataGridProps?.rows?.length === 0}
               >
                 {t("button.export")}
               </Button>
diff --git a/frontend/src/components/nlp/components/NlpValue.tsx b/frontend/src/components/nlp/components/NlpValue.tsx
index 12c462e8..c6094204 100644
--- a/frontend/src/components/nlp/components/NlpValue.tsx
+++ b/frontend/src/components/nlp/components/NlpValue.tsx
@@ -55,10 +55,10 @@ export const NlpValues = ({ entityId }: { entityId: string }) => {
   const canHaveSynonyms = nlpEntity?.lookups?.[0] === NlpLookups.keywords;
   const { onSearch, searchPayload } = useSearch<INlpValue>({
     $eq: [{ entity: entityId }],
-    $or: ["doc", "value"]
+    $or: ["doc", "value"],
   });
   const { dataGridProps } = useFind(
-    { entity: EntityType.NLP_VALUE },
+    { entity: EntityType.NLP_VALUE, format: Format.FULL },
     {
       params: searchPayload,
     },
@@ -103,7 +103,7 @@ export const NlpValues = ({ entityId }: { entityId: string }) => {
     ],
     t("label.operations"),
   );
-  const synonymsColumn =  {
+  const synonymsColumn = {
     flex: 3,
     field: "synonyms",
     headerName: t("label.synonyms"),
@@ -125,6 +125,24 @@ export const NlpValues = ({ entityId }: { entityId: string }) => {
       disableColumnMenu: true,
       renderHeader,
     },
+    {
+      flex: 2,
+      field: "nlpSamplesCount",
+      align: "center",
+      headerName: t("label.nlp_samples_count"),
+      sortable: true,
+      disableColumnMenu: true,
+      headerAlign: "center",
+      renderHeader,
+      renderCell: ({ row }) => (
+        <Chip
+          sx={{ alignContent: "center" }}
+          id={row.id}
+          label={row.nlpSamplesCount}
+          variant="inbox"
+        />
+      ),
+    },
     {
       flex: 3,
       field: "doc",
diff --git a/frontend/src/components/visual-editor/CustomBlocks.tsx b/frontend/src/components/visual-editor/CustomBlocks.tsx
index 249cbe78..11304829 100644
--- a/frontend/src/components/visual-editor/CustomBlocks.tsx
+++ b/frontend/src/components/visual-editor/CustomBlocks.tsx
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -7,6 +7,7 @@
  */
 
 import { Grid } from "@mui/material";
+import { useMemo } from "react";
 
 import PluginIcon from "@/app-components/svg/toolbar/PluginIcon";
 import { useFind } from "@/hooks/crud/useFind";
@@ -17,18 +18,22 @@ import { Block, StyledTitle } from "./Aside";
 
 export const CustomBlocks = () => {
   const { t } = useTranslate();
-  const { data: customBlocks } = useFind(
+  const { data: customBlocks = [] } = useFind(
     { entity: EntityType.CUSTOM_BLOCK },
     { hasCount: false },
   );
+  const memoizedCustomBlocks = useMemo(
+    () => customBlocks.sort((a, b) => a.id.localeCompare(b.id)),
+    [customBlocks],
+  );
 
-  return customBlocks?.length ? (
+  return memoizedCustomBlocks.length ? (
     <>
       <Grid mb="2">
         <StyledTitle>{t("title.custom_blocks")}</StyledTitle>
       </Grid>
       <Grid container>
-        {customBlocks?.map((customBlock) => (
+        {memoizedCustomBlocks.map((customBlock) => (
           <Block
             key={customBlock.id}
             title={t(`title.${customBlock.namespace}`, {
diff --git a/frontend/src/components/visual-editor/form/BlockFormProvider.tsx b/frontend/src/components/visual-editor/form/BlockFormProvider.tsx
index 043749a4..a11fa067 100644
--- a/frontend/src/components/visual-editor/form/BlockFormProvider.tsx
+++ b/frontend/src/components/visual-editor/form/BlockFormProvider.tsx
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
@@ -9,13 +9,21 @@
 import { createContext, ReactNode, useContext } from "react";
 import { FormProvider, UseFormReturn } from "react-hook-form";
 
-import { IBlockAttributes, IBlock } from "@/types/block.types";
+import { IBlock, IBlockAttributes } from "@/types/block.types";
 
 // Create a custom context for the block value
 const BlockContext = createContext<IBlock | undefined>(undefined);
 
 // Custom hook to use block context
-export const useBlock = () => useContext(BlockContext);
+export const useBlock = () => {
+  const context = useContext(BlockContext);
+
+  if (!context) {
+    throw new Error("useBlock must be used within an BlockContext");
+  }
+
+  return context;
+};
 
 // This component wraps FormProvider and adds block to its context
 function BlockFormProvider({
@@ -23,7 +31,7 @@ function BlockFormProvider({
   methods,
   block,
 }: {
-  methods: UseFormReturn<IBlockAttributes, any, undefined>;
+  methods: UseFormReturn<IBlockAttributes>;
   block: IBlock | undefined;
   children: ReactNode;
 }) {
diff --git a/frontend/src/components/visual-editor/v2/AdvancedLink/AdvancedLinkFactory.tsx b/frontend/src/components/visual-editor/v2/AdvancedLink/AdvancedLinkFactory.tsx
index 7d9a6882..242dcb84 100644
--- a/frontend/src/components/visual-editor/v2/AdvancedLink/AdvancedLinkFactory.tsx
+++ b/frontend/src/components/visual-editor/v2/AdvancedLink/AdvancedLinkFactory.tsx
@@ -11,15 +11,190 @@ import styled from "@emotion/styled";
 import {
   DefaultLinkFactory,
   DefaultLinkWidget,
+  NodeModel,
+  PortModel
 } from "@projectstorm/react-diagrams";
 
 import { AdvancedLinkModel } from "./AdvancedLinkModel";
 
+const PROXIMITY_THRESHOLD = 500;
+const MIN_DISTANCE = 0.1;
+const MAX_DISTANCE = 2000;
+const CONTROL_POINT_PADDING = 10;
+const BACKWARD_LINK_THRESHOLD = 12; // pixels
+const MIN_SCALE_FACTOR = 1.5;
+const MAX_SCALE_FACTOR = 2.0;
+
 interface Point {
   x: number;
   y: number;
 }
 
+interface Boundaries {
+  left: number,
+  right: number,
+  top: number,
+  bottom: number,
+}
+
+interface Dimensions {
+  width: number,
+  height: number,
+}
+// Helper function to get port dimensions
+const getPortDimensions = (port: PortModel): Dimensions => {
+  return {
+    width: port.width || CONTROL_POINT_PADDING,
+    height: port.height || CONTROL_POINT_PADDING,
+  };
+};
+// Helper function to calculate port center point
+const getPortCenterPoint = (port: PortModel): Point => {
+  const portSize = getPortDimensions(port);
+
+  return {
+    x: port.getPosition().x + portSize.width / 2,
+    y: port.getPosition().y + portSize.height / 2,
+  };
+};
+/**
+ * Logarithmic scaling function that adjusts between 1.5 and 2 based on distance,
+ * minimum distance, and maximum distance.
+ * @param distance - The distance to scale.
+ * @param minDistance - A small value to prevent division by zero or too small values.
+ * @param maxDistance - The maximum expected distance.
+ */
+const logFactor = (
+  distance: number,
+  minDistance: number,
+  maxDistance: number
+): number => {
+  const scale = Math.log(distance + minDistance) / Math.log(maxDistance + minDistance);
+
+  return MIN_SCALE_FACTOR + scale * (MAX_SCALE_FACTOR - MIN_SCALE_FACTOR); // Scaled to range between 1.5 and 2
+};
+/**
+ * Calculates the horizontal (X-axis) overlap in pixels between two node boundaries.
+ * Returns 0 if there is no overlap.
+ */
+const calculateXOverlap = (
+  sourceBounds: Boundaries,
+  targetBounds: Boundaries
+): number => {
+  return Math.max(
+    0,
+    Math.min(sourceBounds.right, targetBounds.right) -
+      Math.max(sourceBounds.left, targetBounds.left)
+  );
+};
+/**
+ * Calculates the vertical (Y-axis) overlap in pixels between two node boundaries.
+ * Returns 0 if there is no overlap.
+ */
+const calculateYOverlap = (
+  sourceBounds: Boundaries,
+  targetBounds: Boundaries
+): number => {
+  return Math.max(
+    0,
+    Math.min(sourceBounds.bottom, targetBounds.bottom) -
+      Math.max(sourceBounds.top, targetBounds.top)
+  );
+};
+/**
+ * Converts an overlap amount into a ratio (0 to 1) based on the larger of the two node dimensions.
+ * Useful for dynamically adjusting offsets based on how much nodes visually intersect.
+ */
+const calculateOverlapRatio = (
+  overlapAmount: number,
+  sourceDimension: number,
+  targetDimension: number
+): number => {
+  const maxRange = Math.max(sourceDimension, targetDimension);
+
+  return overlapAmount / maxRange;
+};
+/**
+ * Computes the Euclidean distance between two points.
+ * Used to scale offsets and curve control points based on how far apart nodes are.
+ */
+const calculateDistance = (startPoint: Point, endPoint: Point): number => {
+  return Math.sqrt(
+    Math.pow(endPoint.x - startPoint.x, 2) + Math.pow(endPoint.y - startPoint.y, 2)
+  );
+};
+/**
+ * Calculates the bounding box of a node based on its position and size.
+ * Returns an object with `left`, `right`, `top`, and `bottom` properties representing the node's edges.
+ */
+const calculateNodeBoundaries = (node: NodeModel): Boundaries => {
+  return {
+    left: node.getPosition().x,
+    right: node.getPosition().x + node.width,
+    top: node.getPosition().y,
+    bottom: node.getPosition().y + node.height,
+  };
+};
+/**
+ * Calculates the width and height of a node based on the position of one of its ports.
+ * 
+ * This approach avoids relying on the node's width and height properties,
+ * which may not be accurate or available at render time due to asynchronous rendering behavior.
+ * 
+ * Instead, it uses the relative position of the port to infer the size of the node.
+ * Assumes that the port's position reflects the visual layout and placement on the node.
+ *
+ * @param port - A PortModel instance attached to the node
+ * @returns An object containing the inferred width and height of the node
+ */
+const calculateNodeDimension = (port: PortModel): Dimensions => {
+  // Get the top-left position of the node
+  const nodePos = port.getNode().getPosition();
+  // Get the top-left position of the port
+  const portPos = port.getPosition();
+  // Width is the horizontal distance from the node's left to the port's right edge
+  const width = (portPos.x - nodePos.x) + port.width;
+  // Height is estimated by doubling the vertical offset from the node to the port
+  // (port is vertically centered), then adding the port's height
+  const height = Math.abs(portPos.y - nodePos.y) * 2 + port.height;
+
+  return { width, height };
+};
+/**
+ * Calculates a single control point for a cubic Bézier curve.
+ * Adjusts based on direction, dynamic offset, and node boundaries.
+ */
+const calculateControlPoint = (
+  anchor: Point,
+  horizontalOffset: number,
+  verticalOffset: number,
+  verticalDirection: number,
+  nodeBounds: Boundaries,
+  isStart: boolean,
+  controlPointPadding: number
+): Point => {
+  let x =
+    anchor.x + (isStart ? horizontalOffset : -horizontalOffset);
+  let y =
+    anchor.y + (isStart ? verticalDirection * verticalOffset : -verticalDirection * verticalOffset);
+
+  // Apply minimum horizontal constraint
+  x = isStart
+    ? Math.max(x, nodeBounds.right + controlPointPadding)
+    : Math.min(x, nodeBounds.left - controlPointPadding);
+
+  // Apply vertical constraint based on direction
+  y =
+    verticalDirection > 0
+      ? isStart
+        ? Math.max(y, nodeBounds.bottom + controlPointPadding)
+        : Math.min(y, nodeBounds.top - controlPointPadding)
+      : isStart
+      ? Math.min(y, nodeBounds.top - controlPointPadding)
+      : Math.max(y, nodeBounds.bottom + controlPointPadding);
+
+  return { x, y };
+};
 const createCurvedPath = (start: Point, end: Point, nodeHeight: number) => {
   const controlPoint1X = start.x + nodeHeight - 20;
   const controlPoint1Y = start.y - nodeHeight;
@@ -28,6 +203,74 @@ const createCurvedPath = (start: Point, end: Point, nodeHeight: number) => {
 
   return `M ${start.x},${start.y} C ${controlPoint1X},${controlPoint1Y} ${controlPoint2X},${controlPoint2Y} ${end.x},${end.y}`;
 };
+const createBackwardCurvedPath = (
+  sourcePort: PortModel,
+  targetPort: PortModel,
+) => {
+  // Set a threshold for node proximity, below which dynamic adjustments to offsets are applied
+  // This helps in reducing abrupt curve steepness when nodes are close to each other
+  const proximityThreshold = PROXIMITY_THRESHOLD;
+  const minDistance = MIN_DISTANCE;
+  const maxDistance = MAX_DISTANCE;
+  const sourceNode = sourcePort.getNode();
+  const targetNode = targetPort.getNode();
+  // Get node dimensions
+  const { width: sourceNodeWidth, height: sourceNodeHeight } = calculateNodeDimension(sourcePort);
+  const { width: targetNodeWidth, height: targetNodeHeight } = calculateNodeDimension(targetPort);
+  // Get node boundaries
+  const sourceNodeBounds: Boundaries = calculateNodeBoundaries(sourceNode);
+  const targetNodeBounds: Boundaries = calculateNodeBoundaries(targetNode);
+  // **NEW:** Adjust `start` and `end` to match the exact center of ports
+  const adjustedStart: Point = getPortCenterPoint(sourcePort);
+  const adjustedEnd: Point = getPortCenterPoint(targetPort);
+  // Calculate the distance between nodes
+  const nodeDistance: number = calculateDistance(adjustedStart, adjustedEnd);
+  // Use node dimensions and distance to calculate dynamic offsets
+  const horizontalOffset: number = Math.max(sourceNodeWidth, targetNodeWidth);
+  const verticalOffset: number = Math.max(sourceNodeHeight, targetNodeHeight);
+
+  // Dynamic factor, adjusting horizontal and vertical offsets based on the distance
+  let adjustedHorizontalOffset: number = horizontalOffset * logFactor(nodeDistance, minDistance, maxDistance);
+  let adjustedVerticalOffset: number = verticalOffset * logFactor(nodeDistance, minDistance, maxDistance);
+
+  // Horizontal overlap ratio (0 = no overlap, 1 = fully overlapping horizontally)
+  const xOverlapAmount: number = calculateXOverlap(sourceNodeBounds, targetNodeBounds);
+  const xOverlapRatio: number = calculateOverlapRatio(xOverlapAmount, sourceNodeWidth, targetNodeWidth);
+  // Vertical overlap ratio (0 = no overlap, 1 = fully overlapping vertically)
+  const yOverlapAmount: number = calculateYOverlap(sourceNodeBounds, targetNodeBounds);
+  const yOverlapRatio: number = calculateOverlapRatio(yOverlapAmount, sourceNodeHeight, targetNodeHeight);
+  // Determine vertical direction for Y alignment
+  const verticalDirection: number = adjustedEnd.y >= adjustedStart.y ? 1 : -1;
+
+  // If Node Distance is small, multiply offsets by overlap ratios
+  // to avoid abrupt curve steepness
+  if (nodeDistance < proximityThreshold) {
+    adjustedHorizontalOffset *= xOverlapRatio;
+    adjustedVerticalOffset *= yOverlapRatio;
+  }
+  // Compute control points with dynamic offset
+  const controlPoint1 = calculateControlPoint(
+    adjustedStart,
+    adjustedHorizontalOffset,
+    adjustedVerticalOffset,
+    verticalDirection,
+    sourceNodeBounds,
+    true,
+    CONTROL_POINT_PADDING
+  );
+  const controlPoint2 = calculateControlPoint(
+    adjustedEnd,
+    adjustedHorizontalOffset,
+    adjustedVerticalOffset,
+    verticalDirection,
+    targetNodeBounds,
+    false,
+    CONTROL_POINT_PADDING
+  );
+
+  // Return the cubic Bezier curve
+  return `M ${adjustedStart.x},${adjustedStart.y} C ${controlPoint1.x},${controlPoint1.y} ${controlPoint2.x},${controlPoint2.y} ${adjustedEnd.x},${adjustedEnd.y}`;
+};
 
 namespace S {
   export const Keyframes = keyframes`
@@ -68,41 +311,52 @@ export class AdvancedLinkFactory extends DefaultLinkFactory {
     model: AdvancedLinkModel,
     selected: boolean,
     path: string,
-  ) {
-    const isSelfLoop =
-      model.getSourcePort().getNode() === model.getTargetPort().getNode();
+  ) {  
+    const backwardLinkThreshold = BACKWARD_LINK_THRESHOLD;
+    const sourcePort = model.getSourcePort();
+    const targetPort = model.getTargetPort();
+    const isSelfLoop = sourcePort.getNode() === targetPort.getNode();
+    const sourcePortPosition = sourcePort.getPosition();
+    const targetPortPosition = targetPort.getPosition();
+    const startPoint: Point = {
+      x: sourcePortPosition.x + 20,
+      y: sourcePortPosition.y + 20,
+    };
+    const endPoint: Point = {
+      x: targetPortPosition.x + 20,
+      y: targetPortPosition.y + 20,
+    };
+    // Check if it's a backward link (moving left)
+    const isBackward = startPoint.x - endPoint.x > backwardLinkThreshold;
 
     if (isSelfLoop) {
-      // Adjust the path to create a curve
-      const sourcePortPosition = model.getSourcePort().getPosition();
-      const targetPortPosition = model.getTargetPort().getPosition();
-      const startPoint: Point = {
-        x: sourcePortPosition.x + 20,
-        y: sourcePortPosition.y + 20,
-      };
-      const endPoint: Point = {
-        x: targetPortPosition.x + 20,
-        y: targetPortPosition.y + 20,
-      };
-      const targetPortHeight = model.getTargetPort().height;
-      const targetNdeHeight =
-        (model.getTargetPort().getPosition().y -
-          model.getTargetPort().getNode().getPosition().y) *
+      // Adjust start Point to match the exact source port's centre
+      const adjustedStartPoint: Point = getPortCenterPoint(sourcePort);
+      // Handle self-loop (curved) links
+      const targetPortHeight = targetPort.height;
+      const targetNodeHeight =
+        (targetPort.getPosition().y -
+        targetPort.getNode().getPosition().y) *
           2 +
         targetPortHeight;
 
-      path = createCurvedPath(startPoint, endPoint, targetNdeHeight);
-    }
-
-    return (
+      path = createCurvedPath(adjustedStartPoint, endPoint, targetNodeHeight);
+    } else if (isBackward) {
+      // Handle backward (leftward) link with refined function
+      path = createBackwardCurvedPath(sourcePort, targetPort);
+    } 
+    
+return (
       <S.Path
         selected={selected}
         stroke={
-          selected ? model.getOptions().selectedColor : model.getOptions().color
+          selected
+            ? model.getOptions().selectedColor
+            : model.getOptions().color
         }
         strokeWidth={model.getOptions().width}
         d={path}
       />
     );
   }
-}
+}
\ No newline at end of file
diff --git a/frontend/src/contexts/auth.context.tsx b/frontend/src/contexts/auth.context.tsx
index 99978f15..04e21c4d 100644
--- a/frontend/src/contexts/auth.context.tsx
+++ b/frontend/src/contexts/auth.context.tsx
@@ -8,7 +8,7 @@
 
 import getConfig from "next/config";
 import { useRouter } from "next/router";
-import { createContext, ReactNode, useEffect, useState } from "react";
+import { createContext, ReactNode } from "react";
 import {
   QueryObserverResult,
   RefetchOptions,
@@ -25,7 +25,6 @@ import { useSubscribeBroadcastChannel } from "@/hooks/useSubscribeBroadcastChann
 import { useTranslate } from "@/hooks/useTranslate";
 import { RouterType } from "@/services/types";
 import { IUser } from "@/types/user.types";
-import { getFromQuery } from "@/utils/URL";
 
 export interface AuthContextValue {
   user: IUser | undefined;
@@ -51,10 +50,8 @@ const { publicRuntimeConfig } = getConfig();
 
 export const AuthProvider = ({ children }: AuthProviderProps): JSX.Element => {
   const router = useRouter();
-  const [search, setSearch] = useState("");
   const hasPublicPath = PUBLIC_PATHS.includes(router.pathname);
   const { i18n } = useTranslate();
-  const [isReady, setIsReady] = useState(false);
   const queryClient = useQueryClient();
   const updateLanguage = (lang: string) => {
     i18n.changeLanguage(lang);
@@ -66,11 +63,11 @@ export const AuthProvider = ({ children }: AuthProviderProps): JSX.Element => {
   };
   const authRedirection = async (isAuthenticated: boolean) => {
     if (isAuthenticated) {
-      const redirect = getFromQuery({ search, key: "redirect" });
-      const nextPage = redirect && decodeURIComponent(redirect);
-
-      if (nextPage?.startsWith("/")) {
-        await router.push(nextPage);
+      if (
+        router.query.redirect &&
+        router.query.redirect.toString().startsWith("/")
+      ) {
+        await router.push(router.query.redirect.toString());
       } else if (hasPublicPath) {
         await router.push(RouterType.HOME);
       }
@@ -109,14 +106,9 @@ export const AuthProvider = ({ children }: AuthProviderProps): JSX.Element => {
     router.reload();
   });
 
-  useEffect(() => {
-    const search = location.search;
-
-    setSearch(search);
-    setIsReady(true);
-  }, []);
-
-  if (!isReady || isLoading) return <Progress />;
+  if (isLoading) {
+    return <Progress />;
+  }
 
   return (
     <AuthContext.Provider
diff --git a/frontend/src/types/nlp-value.types.ts b/frontend/src/types/nlp-value.types.ts
index 7b7a1e5e..4986ee8d 100644
--- a/frontend/src/types/nlp-value.types.ts
+++ b/frontend/src/types/nlp-value.types.ts
@@ -19,6 +19,7 @@ export interface INlpValueAttributes {
   expressions?: string[];
   metadata?: Record<string, any>;
   builtin?: boolean;
+  nlpSamplesCount?: number;
 }
 
 export interface INlpValueStub extends IBaseSchema, INlpValueAttributes {}
diff --git a/frontend/src/utils/URL.ts b/frontend/src/utils/URL.ts
index e169dbe2..4656c4ee 100644
--- a/frontend/src/utils/URL.ts
+++ b/frontend/src/utils/URL.ts
@@ -8,26 +8,6 @@
 
 import qs from "qs";
 
-export const getFromQuery = ({
-  key,
-  search,
-  defaultValue = "",
-}: {
-  key: string;
-  search?: string;
-  defaultValue?: string;
-}) => {
-  try {
-    const paramsString = search || window.location.search;
-    const searchParams = new URLSearchParams(paramsString);
-    const loadCampaign = searchParams.get(key) || defaultValue;
-
-    return loadCampaign;
-  } catch (e) {
-    return defaultValue;
-  }
-};
-
 export const buildURL = (baseUrl: string, relativePath: string): string => {
   try {
     return new URL(relativePath).toString();