Using new routes generator methods.
Fix tests.