refs #9194. Tests added.

Not a complete test suite yet.