Merge "Code style cleanups to parserTest.inc and NewParserTest.php."