Language test case cleanup
Merge pull request #2123 from aparajit-pratap/testCaseCleanup

Language test case cleanup