Fix and upgrade Mocha