Merge "Split resource_setup for image tests"