Refactor multi-route specs

This makes the relationship between the setup and the spec explicit,
clarifying which bit of setup is actually being tested.