Fix cql tests