updates to test cases
Merge "updates to test cases"