remove obsolete tests and add missing router replacement

@rkneufeld , @timewald I removed the tests that became obsolete after #219 and also added the router replacement (it seems to be it's still relevant), though I couldn't figure out to add tests for the fix.

Does it make sense to you?