Added all of the new tests and updated myrouter file