Fixing test cases.