Finsished the test coverage and cleaned up comments for the router.