Ninja: adjusted cqlsh tests for CASSANDRA-7857