Issue #43: fixed broken tests.