Refactor Win Test