Refactored router tests to make them more consistent.
Consistency.