Tests updated to sync with workflow changes