Added gateway tests