Fix tests
Merge pull request #1 from deniak/master

Fix tests