Merge "Roll forward: add a test for ParseException"