I've pushed a new version of the patch. I have changed the test to run in main process and restore stream when done. I haven't verified if the broken check is good enough but the tests are passing on all testbot machines (I think it can be addressed later if there's ucrtbase varsion not covered by this check). Please let me know if it looks good for you.