Further fixes for Win32 tests