[fix] Weight routes
Refactoring
Add test route + refactoring