Feature #13 mocha integration

For review