testsuite fixes