Added basic tests setup
Merge branch 'add-tests'

* add-tests:
  Added basic tests setup