Remove subrouters
Test fixes