More work on tests, routing, subrouters