Testsuite fixes.