Issue #426 - fixed broken tests