Issue #21587: Fixed failing tests