more explicit variable names and use fixture instead of new instance of router
Authored by: thibautd 2012-09-05
Parent: [r20859]
Child: [r20861]