refactor edge routes and tests for new design