Fixes in Test Cases