Fix the test suite and test config.