Fixes some unittests
Merge pull request #67 from adam111316/feature/FixSomeUnitTests

Fixes some unittests