Fixed test problems on Windows.
Merge branch 'hotfix-1.0.1'