refs #9428. Extend functional and performance tests.