refactor tests
add mocha test task to gulp
Merge branch 'develop'

* develop:
  add mocha test task to gulp
  refactor tests