Migrated more bootstrapper tests. Filled some gaps in routing tests.
Removed dead code in routing.