Workflow unit test fixes