Modifications for reconnect logic and tests