Fixed two more test cases