Fixing some test cases