diff --git a/packages/core/__e2e__/token-manager.test.js b/packages/core/__e2e__/token-manager.test.js
index cdd8f5958..54643df24 100644
--- a/packages/core/__e2e__/token-manager.test.js
+++ b/packages/core/__e2e__/token-manager.test.js
@@ -1,6 +1,3 @@
-const fetch = require("node-fetch");
-globalThis.fetch = fetch;
-import UserManager from "../api/user-manager";
 import DB from "../api";
 import StorageInterface from "../__mocks__/storage.mock";
 
diff --git a/packages/core/__e2e__/usermanager.test.skip.js b/packages/core/__e2e__/usermanager.test.skip.js
index 10c2a1f4a..6fdf43573 100644
--- a/packages/core/__e2e__/usermanager.test.skip.js
+++ b/packages/core/__e2e__/usermanager.test.skip.js
@@ -1,5 +1,3 @@
-const fetch = require("node-fetch");
-window.fetch = fetch;
 import UserManager from "../api/user-manager";
 import DB from "../api";
 import StorageInterface from "../__mocks__/storage.mock";
diff --git a/packages/core/collections/tags.js b/packages/core/collections/tags.js
index d366f9ea9..61e5bee7f 100644
--- a/packages/core/collections/tags.js
+++ b/packages/core/collections/tags.js
@@ -114,7 +114,6 @@ export default class Tags extends Collection {
 
   sanitize(tag) {
     if (!tag) return;
-    console.trace("santizing:", tag);
     let sanitized = tag.toLocaleLowerCase();
     sanitized = sanitized.replace(
       /[+!@#$%^&*()+\{\}\]\[:;'"<>?\/\.\s=,]+/g,
diff --git a/packages/core/jest.setup.js b/packages/core/jest.setup.js
index c3e695364..ff15c13e6 100644
--- a/packages/core/jest.setup.js
+++ b/packages/core/jest.setup.js
@@ -1,5 +1,8 @@
 var nodeCrypto = require("crypto");
 var dotenv = require("dotenv");
+const fetch = require("node-fetch");
+globalThis.fetch = fetch;
+require("abortcontroller-polyfill/dist/polyfill-patch-fetch")
 
 dotenv.config();
 
diff --git a/packages/core/package-lock.json b/packages/core/package-lock.json
index 04a7cf530..f528e46a6 100644
--- a/packages/core/package-lock.json
+++ b/packages/core/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "notes-core",
-  "version": "6.15.0",
+  "version": "6.16.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "notes-core",
-      "version": "6.15.0",
+      "version": "6.16.0",
       "dependencies": {
         "@stablelib/blake2s": "^1.0.1",
         "async-mutex": "^0.3.2",
@@ -26,6 +26,7 @@
         "@babel/preset-env": "^7.7.4",
         "@babel/runtime": "^7.7.4",
         "@types/jest": "^25.2.1",
+        "abortcontroller-polyfill": "^1.7.3",
         "analyze-es6-modules": "^0.6.2",
         "babel-jest": "^24.9.0",
         "babel-plugin-syntax-object-rest-spread": "^6.13.0",
@@ -1818,6 +1819,12 @@
       "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==",
       "dev": true
     },
+    "node_modules/abortcontroller-polyfill": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.3.tgz",
+      "integrity": "sha512-zetDJxd89y3X99Kvo4qFx8GKlt6GsvN3UcRZHwU6iFA/0KiOmhkTVhe8oRoTBiTVPZu09x3vCra47+w8Yz1+2Q==",
+      "dev": true
+    },
     "node_modules/acorn": {
       "version": "8.2.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.2.1.tgz",
@@ -9836,6 +9843,12 @@
       "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==",
       "dev": true
     },
+    "abortcontroller-polyfill": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.3.tgz",
+      "integrity": "sha512-zetDJxd89y3X99Kvo4qFx8GKlt6GsvN3UcRZHwU6iFA/0KiOmhkTVhe8oRoTBiTVPZu09x3vCra47+w8Yz1+2Q==",
+      "dev": true
+    },
     "acorn": {
       "version": "8.2.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.2.1.tgz",
diff --git a/packages/core/package.json b/packages/core/package.json
index bb9fe0bfd..4321084b2 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -9,6 +9,7 @@
     "@babel/preset-env": "^7.7.4",
     "@babel/runtime": "^7.7.4",
     "@types/jest": "^25.2.1",
+    "abortcontroller-polyfill": "^1.7.3",
     "analyze-es6-modules": "^0.6.2",
     "babel-jest": "^24.9.0",
     "babel-plugin-syntax-object-rest-spread": "^6.13.0",
@@ -28,8 +29,8 @@
     "base64-arraybuffer": "^1.0.1",
     "dayjs": "^1.10.6",
     "fast-sort": "^2.0.1",
-    "liqe": "^1.13.0",
     "fflate": "^0.7.1",
+    "liqe": "^1.13.0",
     "node-html-parser": "github:thecodrr/node-html-parser",
     "qclone": "^1.0.4",
     "showdown": "github:thecodrr/showdown",