more tests rewritten to mocha