Merge "Split resource_setup for baremetal tests"