use mocha for tests
Merge branch 'mocha'