updated gateway tests