Decyjphr/merge 520

[decyjphr]

Basically applied the changes in #520 by manually fixing the conflicts and removing:

<<<<<<< HEAD
    "test:unit": "jest --roots=lib --roots=test/unit",
    "test:unit:ci": "npm run test:unit --reporters=default --reporters=github-actions",
    "test:me": "jest ",
    "test:unit:watch": "npm run test:unit -- --watch",
    "test:integration": "jest --roots=lib --roots=test/integration",
=======