test: fix more test defects