Added some more router scaffolding, basic unit tests