Windows failed tests fixed

And fix to diagnosis that created a test problem