More unit tests
Merge pull request #170 from bserdar/fix_167

More unit tests