Improve the route regex
Improve URL generation
Test additional command cases