Updated README for mocha tests.
Fixed some async issues with mocha tests.
Merge branch 'master' into milestones/2.0.0