Fix some testsuite cleaning; part of #7941