Corrected some more test cases.