refs #9906. Ported more tests over and made faster.