fixes on the testsuite