Fix the tests, too

Seriously.  There's not much codebase left we haven't touched.