Improved coverage of Parser