cql_tests fixes