Fixed windows-specific unit test failures