Fix routing test, improve test coverage

A couple important network / routing code paths exposed by Coveralls
Merge pull request #49 from tedsteiner/test

Fix routing test, improve test coverage