Unbreak the test suite.

Mutrec tests are still failing, though.