Cut after route/5 call and fix tests
Fix middleware call