Fix tests
Merge pull request #7 from orsenthil/orsenthil/fix_tests

Fix tests