Route aliases; simplify templates
Improve test coverage