fixing a unit test now that the function does not throw exception refs #6485
Merge remote-tracking branch 'origin/master'