[Waterstrong]: Update XXXParser and XXXParserTest