fix unit tests
Merge pull request #344 from greg0ire/fix_unit_tests

fix unit tests
Fixed unit tests