Fixed Router Exceptions and Tests