Fixed two test cases