added more Router tests and corrections