updated the test case
Merge branch 'master' into travis-config

* master:
  updated the test case
changed language to scala