refs #1649
TODO - more tests