added dependency on mocha
Merge branch 'tests' into develop