Test case fixes
test case fixes