(Hopefully) Fix remaining test failures.

Another try.