Fixing tests
- #241