Improve route warding
Change API on handler argument
Update test server
Update readme