Fix the test suite post-refactoring.