Windows testing (7/25)

Windows testing