Updated Router tests