fixed 2 more test cases