Merge "Split resource_setup for compute tests"