minor merge conflict in test setup
Merge branch 'grob-namedroutes'