Added Gateway tests