cql_test now passes