Hotfix/upgrade mocha@dev

cherry-pick few commits for `dev` branch

refers to #45