legacy testsuite cleanup