Refactoring of tunnel links/ports, link discovery, forwarding base, and appropriate modifications to unit tests.