Made the new feature work.  Refs #8472.
Expanded unit test for new feature. Refs #8472.