Merge "orchestration API refactor test_list_resources"