Fix router name to routeMatch
Update existing tests.
Remove dead functionality in UserController