I've pushed modified version of your patches to https://gitlab.winehq.org/piotr/wine/-/commits/env. If it looks good for you, please push the changes to this MR. It contains some changes to first commit. I have changed it so `test__environ` is not called multiple times. I think that the tests are easier to follow this way. There are also some white-space changes.