fix Cql expression assembly and test