Update Router class and tests