Fix tests

Update tests that were broken in recent changes.

Confirmed locally that make check now succeeds. Planning to add CI to run make check, but will make that a separate MR.

Fixes #40026 (closed)