Windows symlink test fixes

This should fix the Windows 3.x test failure we've been seeing recently, and another related failure I found when trying to reproduce it on my Windows VM.