Fix up the unit tests that I broke earlier
redux
2021-10-11, Gary Kramlich