Merge pull request #2029 from madewokherd/winformstests