refs #6362 Trying to fix/disable the failing tests