Merge "Support >2 and JSON-formatted options in parser tests."