Fix rest tests failures on Windows platform
Merge pull request #1244 from gaohoward/master

Fix rest tests failures on Windows platform