Fix for the 2 remaining tests failures on windows