fix tests
Merge pull request #245 from matiu/bug/tests

fix tests