Fix tests
Merge pull request #355 from amagdas/fix-routing

Fix tests