Fixing test cases