refs #2174 fix more tests