fix router name and make some tests less fragile