* Handle tcp read timeouts properly * Add changes file * Fix bad mini refactor after nailing the test * Update based on review * Update comment