Change static routes to named
Use named routes
More compact tests