Test case cleanup
Merge pull request #2069 from aparajit-pratap/testCaseCleanup

Test case cleanup