fix more testcases