Fix the testsuite