Updated to latest generator and mocha