Add route highlighting
Fix test