testsuite: more unit test fixes