More router extensions and tests