Updated a parser test
Merge origin/master