Addressed some windows-specific unit tests failures