diff --git a/test/async.js b/test/async.js
index 02c10e7..20cbc4f 100644
--- a/test/async.js
+++ b/test/async.js
@@ -1,10 +1,5 @@
 global.self = global;
-console.log(process.argv)
-const env = process.argv[4] && process.argv[4] === "--exit"
-    ? process.argv[5]
-    : process.argv[3] && process.argv[3] === "--exit"
-        ? process.argv[4]
-        : process.argv[3];
+const env = process.argv[3] && process.argv[3] === "--exit" ? process.argv[4] : process.argv[3];
 import { expect } from "chai";
 console.log("--RELEASE-------------");
 console.log(env ? "dist/" + env + ".js" : "src/bundle.js")
@@ -62,7 +57,7 @@ if(!build_light) describe("Add (Async)", function(){
             if(duration) break;
         }
 
-        expect(duration).to.closeTo(0, 2);
+        expect(duration).to.closeTo(0, 3);
 
         for(let i = 0; i < 999999999; i++){
             await index.addAsync(i, "foo");
@@ -71,7 +66,7 @@ if(!build_light) describe("Add (Async)", function(){
             }
         }
 
-        expect(duration).to.closeTo(4, 2);
+        expect(duration).to.closeTo(4, 3);
     });
 
     it("Should have been added asynchronously to the index (priority: 9)", async function(){
diff --git a/test/basic.js b/test/basic.js
index 5d90f41..9b74589 100644
--- a/test/basic.js
+++ b/test/basic.js
@@ -1,9 +1,5 @@
 global.self = global;
-const env = process.argv[4] && process.argv[4] === "--exit"
-    ? process.argv[5]
-    : process.argv[3] && process.argv[3] === "--exit"
-        ? process.argv[4]
-        : process.argv[3];
+const env = process.argv[3] && process.argv[3] === "--exit" ? process.argv[4] : process.argv[3];
 import { expect } from "chai";
 let FlexSearch = await import(env ? "../dist/" + env + ".js" : "../src/bundle.js");
 if(FlexSearch.default) FlexSearch = FlexSearch.default;
diff --git a/test/cache.js b/test/cache.js
index 39593d3..91e181e 100644
--- a/test/cache.js
+++ b/test/cache.js
@@ -1,9 +1,5 @@
 global.self = global;
-const env = process.argv[4] && process.argv[4] === "--exit"
-    ? process.argv[5]
-    : process.argv[3] && process.argv[3] === "--exit"
-        ? process.argv[4]
-        : process.argv[3];
+const env = process.argv[3] && process.argv[3] === "--exit" ? process.argv[4] : process.argv[3];
 import { expect } from "chai";
 let FlexSearch = await import(env ? "../dist/" + env + ".js" : "../src/bundle.js");
 if(FlexSearch.default) FlexSearch = FlexSearch.default;
diff --git a/test/context.js b/test/context.js
index 10556aa..9a59979 100644
--- a/test/context.js
+++ b/test/context.js
@@ -1,9 +1,5 @@
 global.self = global;
-const env = process.argv[4] && process.argv[4] === "--exit"
-    ? process.argv[5]
-    : process.argv[3] && process.argv[3] === "--exit"
-        ? process.argv[4]
-        : process.argv[3];
+const env = process.argv[3] && process.argv[3] === "--exit" ? process.argv[4] : process.argv[3];
 import { expect } from "chai";
 let FlexSearch = await import(env ? "../dist/" + env + ".js" : "../src/bundle.js");
 if(FlexSearch.default) FlexSearch = FlexSearch.default;
diff --git a/test/debug.js b/test/debug.js
index f5c0dee..415a9c3 100644
--- a/test/debug.js
+++ b/test/debug.js
@@ -1,9 +1,5 @@
 global.self = global;
-const env = process.argv[4] && process.argv[4] === "--exit"
-    ? process.argv[5]
-    : process.argv[3] && process.argv[3] === "--exit"
-        ? process.argv[4]
-        : process.argv[3];
+const env = process.argv[3] && process.argv[3] === "--exit" ? process.argv[4] : process.argv[3];
 import { expect } from "chai";
 let FlexSearch = await import(env ? "../dist/" + env + ".js" : "../src/bundle.js");
 if(FlexSearch.default) FlexSearch = FlexSearch.default;
diff --git a/test/document.js b/test/document.js
index 8078f18..87f666f 100644
--- a/test/document.js
+++ b/test/document.js
@@ -1,9 +1,5 @@
 global.self = global;
-const env = process.argv[4] && process.argv[4] === "--exit"
-    ? process.argv[5]
-    : process.argv[3] && process.argv[3] === "--exit"
-        ? process.argv[4]
-        : process.argv[3];
+const env = process.argv[3] && process.argv[3] === "--exit" ? process.argv[4] : process.argv[3];
 import { expect } from "chai";
 let FlexSearch = await import(env ? "../dist/" + env + ".js" : "../src/bundle.js");
 if(FlexSearch.default) FlexSearch = FlexSearch.default;
diff --git a/test/document.tag.js b/test/document.tag.js
index 4942307..e52a6bf 100644
--- a/test/document.tag.js
+++ b/test/document.tag.js
@@ -1,9 +1,5 @@
 global.self = global;
-const env = process.argv[4] && process.argv[4] === "--exit"
-    ? process.argv[5]
-    : process.argv[3] && process.argv[3] === "--exit"
-        ? process.argv[4]
-        : process.argv[3];
+const env = process.argv[3] && process.argv[3] === "--exit" ? process.argv[4] : process.argv[3];
 import { expect } from "chai";
 let FlexSearch = await import(env ? "../dist/" + env + ".js" : "../src/bundle.js");
 if(FlexSearch.default) FlexSearch = FlexSearch.default;
diff --git a/test/encoder.js b/test/encoder.js
index 24a6a78..01af9ef 100644
--- a/test/encoder.js
+++ b/test/encoder.js
@@ -1,9 +1,5 @@
 global.self = global;
-const env = process.argv[4] && process.argv[4] === "--exit"
-    ? process.argv[5]
-    : process.argv[3] && process.argv[3] === "--exit"
-        ? process.argv[4]
-        : process.argv[3];
+const env = process.argv[3] && process.argv[3] === "--exit" ? process.argv[4] : process.argv[3];
 import { expect } from "chai";
 let FlexSearch = await import(env ? "../dist/" + env + ".js" : "../src/bundle.js");
 if(FlexSearch.default) FlexSearch = FlexSearch.default;
diff --git a/test/highlight.js b/test/highlight.js
index 3b69b43..69cc0a8 100644
--- a/test/highlight.js
+++ b/test/highlight.js
@@ -1,9 +1,5 @@
 global.self = global;
-const env = process.argv[4] && process.argv[4] === "--exit"
-    ? process.argv[5]
-    : process.argv[3] && process.argv[3] === "--exit"
-        ? process.argv[4]
-        : process.argv[3];
+const env = process.argv[3] && process.argv[3] === "--exit" ? process.argv[4] : process.argv[3];
 import { expect } from "chai";
 let FlexSearch = await import(env ? "../dist/" + env + ".js" : "../src/bundle.js");
 if(FlexSearch.default) FlexSearch = FlexSearch.default;
diff --git a/test/issues.js b/test/issues.js
index 528054e..7ad9c7d 100644
--- a/test/issues.js
+++ b/test/issues.js
@@ -1,9 +1,5 @@
 global.self = global;
-const env = process.argv[4] && process.argv[4] === "--exit"
-    ? process.argv[5]
-    : process.argv[3] && process.argv[3] === "--exit"
-        ? process.argv[4]
-        : process.argv[3];
+const env = process.argv[3] && process.argv[3] === "--exit" ? process.argv[4] : process.argv[3];
 import { expect } from "chai";
 let FlexSearch = await import(env ? "../dist/" + env + ".js" : "../src/bundle.js");
 if(FlexSearch.default) FlexSearch = FlexSearch.default;
diff --git a/test/keystore.js b/test/keystore.js
index ee40134..f31b3dc 100644
--- a/test/keystore.js
+++ b/test/keystore.js
@@ -1,9 +1,5 @@
 global.self = global;
-const env = process.argv[4] && process.argv[4] === "--exit"
-    ? process.argv[5]
-    : process.argv[3] && process.argv[3] === "--exit"
-        ? process.argv[4]
-        : process.argv[3];
+const env = process.argv[3] && process.argv[3] === "--exit" ? process.argv[4] : process.argv[3];
 import { expect } from "chai";
 let FlexSearch = await import(env ? "../dist/" + env + ".js" : "../src/bundle.js");
 if(FlexSearch.default) FlexSearch = FlexSearch.default;
diff --git a/test/persistent.clickhouse.js b/test/persistent.clickhouse.js
index b432b33..520b9de 100644
--- a/test/persistent.clickhouse.js
+++ b/test/persistent.clickhouse.js
@@ -1,9 +1,5 @@
 global.self = global;
-const env = process.argv[4] && process.argv[4] === "--exit"
-    ? process.argv[5]
-    : process.argv[3] && process.argv[3] === "--exit"
-        ? process.argv[4]
-        : process.argv[3];
+const env = process.argv[3] && process.argv[3] === "--exit" ? process.argv[4] : process.argv[3];
 import { expect } from "chai";
 let FlexSearch = await import(env ? "../dist/" + env + ".js" : "../src/bundle.js");
 if(FlexSearch.default) FlexSearch = FlexSearch.default;
diff --git a/test/persistent.js b/test/persistent.js
index b792b92..19720a6 100644
--- a/test/persistent.js
+++ b/test/persistent.js
@@ -1,9 +1,5 @@
 global.self = global;
-const env = process.argv[4] && process.argv[4] === "--exit"
-    ? process.argv[5]
-    : process.argv[3] && process.argv[3] === "--exit"
-        ? process.argv[4]
-        : process.argv[3];
+const env = process.argv[3] && process.argv[3] === "--exit" ? process.argv[4] : process.argv[3];
 import { expect } from "chai";
 let FlexSearch = await import(env ? "../dist/" + env + ".js" : "../src/bundle.js");
 if(FlexSearch.default) FlexSearch = FlexSearch.default;
diff --git a/test/persistent.mongo.js b/test/persistent.mongo.js
index f7f7a35..bbe72d5 100644
--- a/test/persistent.mongo.js
+++ b/test/persistent.mongo.js
@@ -1,9 +1,5 @@
 global.self = global;
-const env = process.argv[4] && process.argv[4] === "--exit"
-    ? process.argv[5]
-    : process.argv[3] && process.argv[3] === "--exit"
-        ? process.argv[4]
-        : process.argv[3];
+const env = process.argv[3] && process.argv[3] === "--exit" ? process.argv[4] : process.argv[3];
 import { expect } from "chai";
 let FlexSearch = await import(env ? "../dist/" + env + ".js" : "../src/bundle.js");
 if(FlexSearch.default) FlexSearch = FlexSearch.default;
diff --git a/test/persistent.postgres.js b/test/persistent.postgres.js
index 321441e..80d8b66 100644
--- a/test/persistent.postgres.js
+++ b/test/persistent.postgres.js
@@ -1,9 +1,5 @@
 global.self = global;
-const env = process.argv[4] && process.argv[4] === "--exit"
-    ? process.argv[5]
-    : process.argv[3] && process.argv[3] === "--exit"
-        ? process.argv[4]
-        : process.argv[3];
+const env = process.argv[3] && process.argv[3] === "--exit" ? process.argv[4] : process.argv[3];
 import { expect } from "chai";
 let FlexSearch = await import(env ? "../dist/" + env + ".js" : "../src/bundle.js");
 if(FlexSearch.default) FlexSearch = FlexSearch.default;
diff --git a/test/persistent.redis.js b/test/persistent.redis.js
index 14fe540..f636089 100644
--- a/test/persistent.redis.js
+++ b/test/persistent.redis.js
@@ -1,9 +1,5 @@
 global.self = global;
-const env = process.argv[4] && process.argv[4] === "--exit"
-    ? process.argv[5]
-    : process.argv[3] && process.argv[3] === "--exit"
-        ? process.argv[4]
-        : process.argv[3];
+const env = process.argv[3] && process.argv[3] === "--exit" ? process.argv[4] : process.argv[3];
 import { expect } from "chai";
 let FlexSearch = await import(env ? "../dist/" + env + ".js" : "../src/bundle.js");
 if(FlexSearch.default) FlexSearch = FlexSearch.default;
diff --git a/test/persistent.sqlite.js b/test/persistent.sqlite.js
index be01738..fc3705f 100644
--- a/test/persistent.sqlite.js
+++ b/test/persistent.sqlite.js
@@ -1,9 +1,5 @@
 global.self = global;
-const env = process.argv[4] && process.argv[4] === "--exit"
-    ? process.argv[5]
-    : process.argv[3] && process.argv[3] === "--exit"
-        ? process.argv[4]
-        : process.argv[3];
+const env = process.argv[3] && process.argv[3] === "--exit" ? process.argv[4] : process.argv[3];
 import { expect } from "chai";
 let FlexSearch = await import(env ? "../dist/" + env + ".js" : "../src/bundle.js");
 if(FlexSearch.default) FlexSearch = FlexSearch.default;
diff --git a/test/resolver.js b/test/resolver.js
index b29680b..7b93360 100644
--- a/test/resolver.js
+++ b/test/resolver.js
@@ -1,9 +1,5 @@
 global.self = global;
-const env = process.argv[4] && process.argv[4] === "--exit"
-    ? process.argv[5]
-    : process.argv[3] && process.argv[3] === "--exit"
-        ? process.argv[4]
-        : process.argv[3];
+const env = process.argv[3] && process.argv[3] === "--exit" ? process.argv[4] : process.argv[3];
 import { expect } from "chai";
 let FlexSearch = await import(env ? "../dist/" + env + ".js" : "../src/bundle.js");
 if(FlexSearch.default) FlexSearch = FlexSearch.default;
diff --git a/test/scoring.js b/test/scoring.js
index a0f2d87..ad3c8ff 100644
--- a/test/scoring.js
+++ b/test/scoring.js
@@ -1,9 +1,5 @@
 global.self = global;
-const env = process.argv[4] && process.argv[4] === "--exit"
-    ? process.argv[5]
-    : process.argv[3] && process.argv[3] === "--exit"
-        ? process.argv[4]
-        : process.argv[3];
+const env = process.argv[3] && process.argv[3] === "--exit" ? process.argv[4] : process.argv[3];
 import { expect } from "chai";
 let FlexSearch = await import(env ? "../dist/" + env + ".js" : "../src/bundle.js");
 if(FlexSearch.default) FlexSearch = FlexSearch.default;
diff --git a/test/serialize.js b/test/serialize.js
index f0ee2ae..7d19f1f 100644
--- a/test/serialize.js
+++ b/test/serialize.js
@@ -1,9 +1,5 @@
 global.self = global;
-const env = process.argv[4] && process.argv[4] === "--exit"
-    ? process.argv[5]
-    : process.argv[3] && process.argv[3] === "--exit"
-        ? process.argv[4]
-        : process.argv[3];
+const env = process.argv[3] && process.argv[3] === "--exit" ? process.argv[4] : process.argv[3];
 import { expect } from "chai";
 let FlexSearch = await import(env ? "../dist/" + env + ".js" : "../src/bundle.js");
 if(FlexSearch.default) FlexSearch = FlexSearch.default;
diff --git a/test/tokenize.js b/test/tokenize.js
index 6a61da9..6c184e2 100644
--- a/test/tokenize.js
+++ b/test/tokenize.js
@@ -1,9 +1,5 @@
 global.self = global;
-const env = process.argv[4] && process.argv[4] === "--exit"
-    ? process.argv[5]
-    : process.argv[3] && process.argv[3] === "--exit"
-        ? process.argv[4]
-        : process.argv[3];
+const env = process.argv[3] && process.argv[3] === "--exit" ? process.argv[4] : process.argv[3];
 import { expect } from "chai";
 let FlexSearch = await import(env ? "../dist/" + env + ".js" : "../src/bundle.js");
 if(FlexSearch.default) FlexSearch = FlexSearch.default;
diff --git a/test/worker.js b/test/worker.js
index ccefd29..fefb22e 100644
--- a/test/worker.js
+++ b/test/worker.js
@@ -1,9 +1,5 @@
 global.self = global;
-const env = process.argv[4] && process.argv[4] === "--exit"
-    ? process.argv[5]
-    : process.argv[3] && process.argv[3] === "--exit"
-        ? process.argv[4]
-        : process.argv[3];
+const env = process.argv[3] && process.argv[3] === "--exit" ? process.argv[4] : process.argv[3];
 import { expect } from "chai";
 let FlexSearch = await import(env ? "../dist/" + env + ".js" : "../src/bundle.js");
 if(FlexSearch.default) FlexSearch = FlexSearch.default;