Sync master and 22.0 Run 3 CI tests, but without output comparison. The aim is to keep tests in sync as much as possible to make sweeps easier.
/cc @elmsheus @nstyles @pberta @jmaurer