Added gateways to AllTests