Merge pull request #1373 from thejameskyle/mocha-this

Mocha this
Update mocha and use setup global beforeEach/afterEach