Fix test failure caused by Ambassador fix 9da4070