More router unit tests, preserves route order