Fixed the unit test for a more general case.  Refs #6862.
Merge branch 'feature/6862_add_unit_test' into develop