#10983: fix several bugs in the _tunnel implementation that seem to have missed while porting between branches.  A unittest is needed!