Parsers changed
Merge conflicts resolved
General parser test modified
Merge conflict fixed