Fix Test Windows
Merge branch 'TestWindows'