Testable routing 188

Fixes #188