Merge "Split resource_setup for identity tests"