DEV - Add mocha to package.json dependency and rewrite some tests