Follow-up to PR #25523 to cleanup all relevant tests.
Attach a file by drag & drop or click to upload
