fix tests
Merge pull request #333 from matiu/bug/fix-tests

fix tests