Add more unit tests.  Refs #4749.