Merge "Split resource_setup for orchestration tests"