Windows tests refactoring