Fix test failures for CASSANDRA-5175