more work converting router tests from DOH to Intern