added the new router and more tests