Fix wrong route issues
Improving tests