Replace #22356 with #22349 for these tests because #22356 has been fixed but now these tests fail because of #22349.