New infrastructure is now running Windows 7 and Windows 10. Let's clean up the tests to get them green.