Fixed more test cases