Fix CleanupTest

patch by marcuse, reviewed by jbellis for CASSANDRA-6679