Improve unit test.  Refs #6676.