Testsuite: fixup lots of tests