Slightly modified routes.
Update functional tests and unit tests