Merge "Clean-up to global overrides in NewParserTest"