(#17901) Fix failing tests