Tests pass again. refs #408