diff --git a/packages/core-enrollments/src/module/buildFindSelector.test.ts b/packages/core-enrollments/src/module/buildFindSelector.test.ts
index 98f2e29322..4add0f4560 100644
--- a/packages/core-enrollments/src/module/buildFindSelector.test.ts
+++ b/packages/core-enrollments/src/module/buildFindSelector.test.ts
@@ -1,40 +1,36 @@
 import { EnrollmentStatus } from "@unchainedshop/core-enrollments";
 import { buildFindSelector } from "./configureEnrollmentsModule.js";
 
+describe('buildFindSelector', () => {
+  it('Should correct filter when passed status, userId and queryString', () => {
+    expect(buildFindSelector({queryString: "Hello World", status: [EnrollmentStatus.ACTIVE], userId: 'admin-id'})).toEqual({
+      deleted: null,
+      status: { '$in': [ 'ACTIVE' ] },
+      userId: 'admin-id',
+      '$text': { '$search': 'Hello World' }
+    })    
+  });
+  it('Should correct filter when passed userId and queryString', () => {
+    
+    expect(buildFindSelector({queryString: "Hello World",  userId: 'admin-id'})).toEqual({
+      deleted: null,
+      userId: 'admin-id',
+      '$text': { '$search': 'Hello World' }
+    })    
+  });
 
+  it('Should correct filter when passed  queryString', () => {
+    
+    expect(buildFindSelector({queryString: "Hello World"})).toEqual({
+      deleted: null,        
+      '$text': { '$search': 'Hello World' }
+    })    
+  });
 
-
-
-  describe('buildFindSelector', () => {
-    it('Should correct filter when passed status, userId and queryString', async () => {
-      expect(buildFindSelector({queryString: "Hello World", status: [EnrollmentStatus.ACTIVE], userId: 'admin-id'})).toEqual({
-        deleted: null,
-        status: { '$in': [ 'ACTIVE' ] },
-        userId: 'admin-id',
-        '$text': { '$search': 'Hello World' }
-      })    
-    });
-    it('Should correct filter when passed userId and queryString', async () => {
-      
-      expect(buildFindSelector({queryString: "Hello World",  userId: 'admin-id'})).toEqual({
-        deleted: null,
-        userId: 'admin-id',
-        '$text': { '$search': 'Hello World' }
-      })    
-    });
-
-    it('Should correct filter when passed  queryString', async () => {
-      
-      expect(buildFindSelector({queryString: "Hello World"})).toEqual({
-        deleted: null,        
-        '$text': { '$search': 'Hello World' }
-      })    
-    });
-
-    it('Should correct filter when passed  no argument', async () => {
-      
-      expect(buildFindSelector({})).toEqual({
-        deleted: null,        
-      })    
-    });
-  })
+  it('Should correct filter when passed  no argument', () => {
+    
+    expect(buildFindSelector({})).toEqual({
+      deleted: null,        
+    })    
+  });
+})
diff --git a/packages/core-events/src/module/buildFindSelector.test.ts b/packages/core-events/src/module/buildFindSelector.test.ts
index 95f9cc9dbf..f41507ceee 100644
--- a/packages/core-events/src/module/buildFindSelector.test.ts
+++ b/packages/core-events/src/module/buildFindSelector.test.ts
@@ -1,30 +1,28 @@
 import { buildFindSelector } from "./configureEventsModule.js";
 
-describe('Event', () => {
-  describe('buildFindSelector', () => {
-    it('Return correct filter object when passed create, queryString, types', () => {
+describe('buildFindSelector', () => {
+  it('Return correct filter object when passed create, queryString, types', () => {
     expect(buildFindSelector({created: new Date("2022-12-03T18:23:38.278Z"), queryString: "Hello world", types: ['PRODUCT_CREATED']})).toEqual({
-        type: { '$in': [ 'PRODUCT_CREATED' ] },
-        '$text': { '$search': 'Hello world' },
-        created: { '$gte': new Date( "2022-12-03T18:23:38.278Z" )}
-      })
-    });
+      type: { '$in': [ 'PRODUCT_CREATED' ] },
+      '$text': { '$search': 'Hello world' },
+      created: { '$gte': new Date( "2022-12-03T18:23:38.278Z" )}
+    })
+  });
 
-    it('Return correct filter object when passed create, queryString', () => {
-      expect(buildFindSelector({created: new Date("2022-12-03T18:23:38.278Z"), queryString: "Hello world"})).toEqual({       
-        '$text': { '$search': 'Hello world' },
-        created: { '$gte': new Date( "2022-12-03T18:23:38.278Z" )}
-      })
-    });
+  it('Return correct filter object when passed create, queryString', () => {
+    expect(buildFindSelector({created: new Date("2022-12-03T18:23:38.278Z"), queryString: "Hello world"})).toEqual({       
+      '$text': { '$search': 'Hello world' },
+      created: { '$gte': new Date( "2022-12-03T18:23:38.278Z" )}
+    })
+  });
 
-    it('Return correct filter object when passed create', () => {
-      expect(buildFindSelector({created: new Date("2022-12-03T18:23:38.278Z")})).toEqual({              
-        created: { '$gte': new Date( "2022-12-03T18:23:38.278Z" )}
-      })
-    });
+  it('Return correct filter object when passed create', () => {
+    expect(buildFindSelector({created: new Date("2022-12-03T18:23:38.278Z")})).toEqual({              
+      created: { '$gte': new Date( "2022-12-03T18:23:38.278Z" )}
+    })
+  });
 
-    it('Return correct filter object when passed no argument', () => {
-      expect(buildFindSelector({})).toEqual({})
-    });
-  })
-});
+  it('Return correct filter object when passed no argument', () => {
+    expect(buildFindSelector({})).toEqual({})
+  });
+})