testsuite: more test fixes