fixup testsuite merge