Rework the test script so that it can test Windows clients.