Close #22756: Improve the test output for some assertEqual tests.

These tests were undebuggable as written, and there's no testing fallacy
involved in using the method we're testing to test the output of that method,
so switch to that.