Fix broken test suite.

Note to self: don't push code when distracted.