refs #4996 fixing more tests