Improved logic in RouteNotFoundStrategy and created a testcase