[#6007] fix more test failures
7 files changed