fix tests
Merge pull request #234 from maraoz/fix/broken/tests

Fixes broken tests