Fix failing tests on windows.
Merge pull request #1073 from akbargumbira/develop

Fix failing tests on windows.