Add mocha
Merge branch 'addTesting' into develop