updates for Windows conformance testing