Fix up testsuite some more