Fix routing test, improve test coverage

A couple important network / routing code paths exposed by Coveralls