Fixed unit tests
Merge pull request #3 from yannickl88/master

Fixed unit tests