Refactoring routing tests accorindng to the changes in API