More test changes to make tests run on Win