Fixed some test cases.