more compositional (slightly)
more tests
Merge pull request #9 from CapillarySoftware/Router

Router more tests