additional tests
merging unittests into master