Updated route tests
Updated routes
Converted to named routes