tests on windows fixes
Merge branch 'master' into console-events