resolved various unit-test failures in Windows