Updated tests for new workflow