Add tests to Router