More test fixes for windows