Fix testsuite errors.