Simplify tests and switch back to mocha