Fix remaining test failures on Windows

I'm doing this blind BTW, since working via rdesktop in that infernal
Windows console is a pain.