Just fix the tests.

(Applying a real repairer will follow in the next pull request.)