Port more connection recovery tests from March Hare

References #205.
Merge with upstream