fix more test cases