Sorry for the delay. We generally expect tests to pass with each commit. As it stands, applying only the first patch would cause test failures. You could simply swap the order of the patches to avoid that.
Alternatively, you could add `todo_wine`s in the first commit and remove them in the second. That approach is often better for bug fixes to show the exact problem being fixed, but in this case, swapping the commit order is probably the cleaner solution.