Cross-lang testcase update
Merge pull request #2094 from junmendoza/testcaseupdate

Cross-lang testcase update