Issue #253 - fix broken tests