merging in the testsuite