Refactor router for readability (#1796)

* refactor router tests to table driven (this way it is easier to debug test cases with breakpoints)
* refactor router variables to be more readable

Author: aldas