Refs #5149 - WIP tests