Fix failing gateway tests