Revert "Revert "Windows Test""

This reverts commit 9d967980c3b15f09d429f3771f88fd0c4be5da40.