optimise cql serializers and tests