Updated unit test and usage example. re #10091