Move GatewayTest to correct folder.