Merge "Split resource_setup for compute volumes tests"