diff --git a/package.json b/package.json
index 1a71c23..43bc982 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,6 @@
     "loglevel": "^1.7.1",
     "mingo": "^4.2.0",
     "obop": "^0.2.1",
-    "p-queue": "6.6.2",
     "path-browserify": "^1.0.1",
     "reflect-metadata": "^0.1.13",
     "sift": "^15.0.0",
diff --git a/src/mocks/createMockContainer.ts b/src/mocks/createMockContainer.ts
index 5551512..e63931e 100644
--- a/src/mocks/createMockContainer.ts
+++ b/src/mocks/createMockContainer.ts
@@ -13,7 +13,8 @@ import { PersistenceAdapterMock } from './persistence-adapter';
 import { IQueryService } from '../interfaces/query-service.interface';
 import { QueryServiceMock } from './query.service';
 import { ICollectionConfig } from '../interfaces/collection-config.interface';
-
+import QueueModule from '../modules/queue';
+import SystemModule from '../modules/system';
 export const createMockContainer = (collectionName: string, camaConfig: ICamaConfig, collectionConfig: ICollectionConfig): Container => {
   const container = new Container();
 
@@ -23,7 +24,8 @@ export const createMockContainer = (collectionName: string, camaConfig: ICamaCon
   container.bind<ICamaConfig>(TYPES.CamaConfig).toConstantValue(camaConfig);
   container.bind<ICollectionConfig>(TYPES.CollectionConfig).toConstantValue(collectionConfig);
   container.bind<string>(TYPES.CollectionName).toConstantValue(collectionName);
-
+  container.load(SystemModule);
+  container.load(QueueModule);
   container.bind<IPersistenceAdapter>(TYPES.PersistenceAdapter).to(PersistenceAdapterMock).inSingletonScope();
   container.bind<IQueryService<any>>(TYPES.QueryService).to(QueryServiceMock).inSingletonScope()
   return container;
diff --git a/yarn.lock b/yarn.lock
index b1ca21c..c875cc2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2295,11 +2295,6 @@ esutils@^2.0.2:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-eventemitter3@^4.0.4:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
-  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
-
 exec-sh@^0.3.2:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc"
@@ -4959,14 +4954,6 @@ p-map@^4.0.0:
   dependencies:
     aggregate-error "^3.0.0"
 
-p-queue@6.6.2:
-  version "6.6.2"
-  resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-6.6.2.tgz#2068a9dcf8e67dd0ec3e7a2bcb76810faa85e426"
-  integrity sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==
-  dependencies:
-    eventemitter3 "^4.0.4"
-    p-timeout "^3.2.0"
-
 p-retry@^4.0.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c"
@@ -4975,13 +4962,6 @@ p-retry@^4.0.0:
     "@types/retry" "^0.12.0"
     retry "^0.13.1"
 
-p-timeout@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
-  integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==
-  dependencies:
-    p-finally "^1.0.0"
-
 p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"