Tokeniztation tests
Routing tests and fixes