Fix the router tests.

Needed to change some expectations of the interface that honestly made no
sense. Before this, some tests literally could not pass.