Fix unit tests
Merge pull request #103 from mcanevet/fix/unit_tests

Fix unit tests