Issue #42
- fixed broken tests