Refs #6540. Adding some tests.