Updated with better unit tests.

Refs #5591