testsuite fixes.