Fix failing tests after 352c1498a

refs #1247