misc fixes on testsuite