cleanup for test cases
Merge branch 'master' into test_cases
Merge pull request #2058 from Randy-Ma/test_cases

Cleanup for test cases