last fixes of router + tests