Reapplied skip logic for test on Windows, which appears to have been lost during a merge.