Fixed failing tests for #22207