Add tests of CQL to CCL+sortkeys conversion