Merge "Fix router tests expecting wrong error code"