Upgrade batch testing (better Windows support).