Updates for better Windows GUI testing reliability on EC2

Windows is now basically as (un)reliable as Linux.