Fixing CQL tests