Merge pull request #2158 from akoeplinger/fix-winforms-tests