changes to get Windows UnitTests to pass, now all tests pass windows