Fix cli test on windows

Merged username-removed-506044 requested to merge (removed):windows-test into master