Minor MSWin32 test cleanups