Fixed more test cases.