Merge "Revert "Add a test for ParseException""