Fix for server failure scenario test. Make reconnects non-blocking. Update heartbeating to timeout when waiting for a response.