add tests and support for relocating router