clean junk code in TestSuite