Merge "Split resource_setup for volume tests"