Adjustments in Windows to pass unit tests

re #6175