More Win32 unittest fixes