add routing tests, refactoring
refactoring tests, correct routing code
refactoring tests, correct routing code
correct tests