Corrected more test cases.