TestBase cleanup