Merge "Update v3 identity group tests to work w/ pre-prov"