Add tests for Router-related classes