refs #5054 fix some tests