mocha improvements