Merge "Disable test broken on windows"