Fixed tests on windows
Merge pull request #5720 from GrahamCampbell/4.2-windows

[4.2] Fixed Tests On Windows
Merge branch '4.2'