Fix up testsuite