@witty-crayon-22786 I looked at it. It seems to me that there is more integration testing that you could do, like trying to invoke a single test method from the command line. There's also some comments around retrying tests (I guess the @Flaky annotation is what that comment is referring to?) that I don't think we've tested before and this code does change some of that. I'm not to worried about breakage though.