Test Cases and Suites updated

Test Cases and Suites updated
Merge branch 'zz_local'