Fix failing unit tests
Merge pull request #8 from fechu/master

Fix failing unit tests