Downgrade mocha required version to latest 0.x
Merge branch 'master' into fix_tests
Make tests pass.