Issue #2322145: Fixing broken tests