Make the testsuite work.