Upgrade the gateway scenario tests