Updated tests to match Itcl object oriented style that I'm migrating towards
Migrated router to OO style