Windows redux

Windows test fixes.