Fix testbed recovery after bad merge with TCP handshake stuff