Cleaning up use of mocha.