Fixing CQL Filtering tests