Finish tunnel overload handling, add test.