Fixed tests, added 'in-route mapping'