Fixes for Windows test