Fix reconnect (lazy) / tests