Fixed some issues.  Refs #7739.
Expanded unit test for the new feature.  Refs #7739.