Testsuite: benign test fixes