Fix CQLTester cleanup