Fix tests
Merge pull request #215 from kgribov/testsFix

Fix tests