fix tests and minor cs fix

after the move to model in the routing bundle the tests where failing