fixup! Merge 'win-tests-fixes' into HEAD