Merge "Increase permitted runtime for testParserTest"