Re: test.winehq refactoring