Rerouting now works with complete, merged itineraries. Scenario test is improved, using more realistic setup.