Fix cassandra tests hanging up

Change-Id: Ia181bf3974f3121cf5ce51bfdbbe949a99161b0d
Merge "Fix cassandra tests hanging up"