fix unit tests
Merge pull request #964 from boegel/fix_unit_tests

fix unit tests