Further work on routing tests refactoring