Fixed other test cases.