mocha implementation
tests
test added
Merge branch 'develop'