Fix most problems with test suite.