NUCCASSANDRA-21 updated cql tests