Improve Route spec
WIP