Fixing the testsuite