Routing table refactored, to complete churn testing