Parser edits; Test cases 5&6