Workflow bug fix and test tweaks