Merge "Remove setup_credentials from orchestration tests"