now data is already retrieved in the routing. fixed failing tests.