Fixing for more test cases