Reapply changes to transport layer...
Fix root context for tests

-  Add the user lines controller