Thanks for the patch!
We need the tests to pass after each commit, so the tests introduced in patch 1/2 should be marked todo_wine where appropriate, and then those todo_wine annotations should be removed in patch 2/2.
I also have made a couple of inline suggestions, in order to keep our comments concise and grammatical.