Fixes parser tests
Merge pull request #1178 from lukecampbell/fixes

Fixes parser tests