Improve windows testing