Clean up router tests

Doesn't fix the multiple times called test yet, unfortunately.