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