Merge "Remove @group from ParserTestRunner"