add order router
refactor test for better readability
WIP