Merge "Split resource_setup for network tests"