Revise existing 2 tests so they run with mocha and with
make test.