CFY-642 fix some tests
Merge branch 'feature/CFY-642-workflow-framework' into feature/CFY-645-store-wf-execution-in-storage