Fix test for change in CASSANDRA-6357