Fix failing router tests using old API