- Simplify route
 - Update test route