Merge "Improve test coverage for ApiParse"