windows test fixes
Merge remote-tracking branch 'origin/v0_05'