Fix tests
Merge pull request #24 from santigimeno/fix_tests

Fix tests