Added more Router tests