Comment remaining tests.
Add Router unit tests.