Add wine to the staged packages so we won't ignore testresults in test.
Whitespace. Remove unused mock function.