This should be the last Windows test fix