refs #4996 fixed more tests