Added workaround for frequent failure of test cleanup on Windows.