Fix test, simplify

refs #3710