router tests now run successfully in repeated execution, fixes #16969