I was able to squash the two commits into one. Now the merge request has the two commits as you suggested. The first commit contains the test changes from your patch, and the second commit contains my code changes and the removal of the @todo_wine@ from the tests that are passing.