refs #4357 fix more tests