Fix test failures for CASSANDRA-5175
Fix test failures for CASSANDRA-5175