setup tests
added workin tests
Merge branch 'feature/adding_tests' into develop

* feature/adding_tests:
  added workin tests
  setup tests