[WFCORE-173] Move validation to added step
Merge pull request #248 from bstansberry/WFCORE-173

[WFCORE-173] Move validation to added step