Remove routing and reverse from coverage
Refactor test and fix coverage