refs #1649
TODO - demo + fix tests