pulling together a couple different sollutions to the flakey tests

- #2592 so we get better info in the case of an error contecting
- #2601 as that I believe actually solves it
- #2610 as that helps offset the added time