Add unittests
Merge branch 'unittests'

* unittests:
  Add unittests