WIP - tests and cleanup.

- Some Client RouteController tests.