updates to router, with tests
cleaned up Router tests