Refs #10554.  Fixed for unit tests and doc test.