Fix Gatewaytest