Timeout on hung connect

Use factored-out runtime

Change dependencies