Fixed failing tests
Merge pull request #10 from mvdriel/Fix-failing-tests

Fixed failing tests