Testsuite: small test cleanups