add more tests and test skeletons
added some more unit tests
Merge branch 'develop'

* develop:
  added some more unit tests
  add more tests and test skeletons