fix a few test cases