Improve app router, add some tests
Fix useless import