Added a few test cases to cover more codes