Fix tests
Merge pull request #2 from dszeto/master

Fix tests