Fixing bad routing
Fixing tests