Merge "Adds an orchestration API test for resource types"