Finishing the Router Updates

The tests for the router have been completed. Very minor tweaks, but
mainly just adding the new tests.