Fix unit test failures
Merge pull request #12 from bodepd/fix_unit_test_failures

Fix unit test failures