Merge "Add test for ParseException" into tm-dev