Changed testing blocks from lambdas to procs to make zable tests pass. All but 2 tests in workflow_test green