Merge "Split resource_setup for scenario tests"