Fix few test cases