Fixed few test cases.