Improve router testability.
Replaced "custom" and crappy event handling in Container with Nodes