mocha tests
update todo
Merge branch 'mocha-tests'