fixed cairn parser to pass tests