General cleanup in testsuite.