Merge pull request #1301 from TheBlueMatt/2022-02-router-no-test