diff --git a/test/data/eip-service.json b/test/data/eip-service.json
index 8060b0e8527d1ec94ce8abd85834bfb5a6bff940..e17dbc3aef1be0b09b41003f04722e65e2d9673d 100644
--- a/test/data/eip-service.json
+++ b/test/data/eip-service.json
@@ -1 +1,215 @@
-{"gateways": [{"capabilities": {"adblock": false, "filter_dns": false, "limited": false, "transport": [{"ports": ["53", "80", "1194"], "protocols": ["tcp", "udp"], "type": "openvpn"}, {"options": {"cert": "kladfkaluadjflkjlkj", "iatMode": "0"}, "ports": ["443"], "protocols": ["tcp"], "type": "obfs4"}]}, "host": "gateway1.float.org", "ip_address": "192.168.1.1", "location": "Seattle"}], "locations": {"Seattle": {"country_code": "US", "hemisphere": "N", "name": "Seattle", "timezone": "-7"}}, "openvpn_configuration": {"auth": "SHA512", "cipher": "AES-256-GCM", "data-ciphers": "AES-256-GCM", "dev": "tun", "float": "", "keepalive": "10 30", "key-direction": "1", "nobind": true, "persist-key": true, "rcvbuf": "0", "sndbuf": "0", "tls-cipher": "TLS-ECDHE-ECDSA-WITH-AES-256-GCM-SHA384", "tls-version-min": "1.2", "verb": "3"}, "serial": 3, "version": 3}
+{
+    "gateways": [
+      {
+        "bucket": "",
+        "capabilities": {
+          "adblock": false,
+          "filter_dns": false,
+          "limited": false,
+          "transport": [
+            {
+              "options": {
+                "cert": "abcasdf",
+                "iatMode": "0"
+              },
+              "ports": [
+                "4431"
+              ],
+              "protocols": [
+                "kcp"
+              ],
+              "type": "obfs4"
+            },
+            {
+              "options": {
+                "cert": "abcasdf",
+                "iatMode": "0",
+                "max_hop_port": "65535",
+                "min_hop_port": "49152",
+                "port_count": "100",
+                "port_seed": "1"
+              },
+              "protocols": [
+                "tcp"
+              ],
+              "type": "obfs4-hop"
+            },
+            {
+              "options": {
+                "cert": "abcasdf",
+                "iatMode": "0",
+                "max_hop_port": "65535",
+                "min_hop_port": "49152",
+                "port_count": "100",
+                "port_seed": "2"
+              },
+              "protocols": [
+                "kcp"
+              ],
+              "type": "obfs4-hop"
+            },
+            {
+              "options": {
+                "cert": "abcasdf",
+                "iatMode": "0",
+                "max_hop_port": "65535",
+                "min_hop_port": "49152",
+                "port_count": "100",
+                "port_seed": "3"
+              },
+              "ports": [
+                "4431"
+              ],
+              "protocols": [
+                "quic"
+              ],
+              "type": "obfs4-hop"
+            },
+            {
+              "ports": [
+                "53",
+                "80",
+                "1194"
+              ],
+              "protocols": [
+                "tcp",
+                "udp"
+              ],
+              "type": "openvpn"
+            }
+          ]
+        },
+        "host": "gw2.ft1.example.org",
+        "ip_address": "37.218.241.24",
+        "location": "North Brabant"
+      },
+      {
+        "bucket": "",
+        "capabilities": {
+          "adblock": false,
+          "filter_dns": false,
+          "limited": false,
+          "transport": [
+            {
+              "options": {
+                "cert": "abcasdf",
+                "iatMode": "0"
+              },
+              "ports": [
+                "443"
+              ],
+              "protocols": [
+                "tcp"
+              ],
+              "type": "obfs4"
+            },
+            {
+              "options": {
+                "cert": "abcasdf",
+                "iatMode": "0"
+              },
+              "ports": [
+                "4432"
+              ],
+              "protocols": [
+                "quic"
+              ],
+              "type": "obfs4"
+            },
+            {
+              "options": {
+                "cert": "abcasdf",
+                "iatMode": "0",
+                "max_hop_port": "65535",
+                "min_hop_port": "49152",
+                "port_count": "100",
+                "port_seed": "1"
+              },
+              "protocols": [
+                "tcp"
+              ],
+              "type": "obfs4-hop"
+            },
+            {
+              "options": {
+                "cert": "abcasdf",
+                "iatMode": "0",
+                "max_hop_port": "65535",
+                "min_hop_port": "49152",
+                "port_count": "100",
+                "port_seed": "2"
+              },
+              "protocols": [
+                "kcp"
+              ],
+              "type": "obfs4-hop"
+            },
+            {
+              "options": {
+                "cert": "abcasdf",
+                "iatMode": "0",
+                "max_hop_port": "65535",
+                "min_hop_port": "49152",
+                "port_count": "100",
+                "port_seed": "3"
+              },
+              "ports": [
+                "4432"
+              ],
+              "protocols": [
+                "quic"
+              ],
+              "type": "obfs4-hop"
+            },
+            {
+              "ports": [
+                "53",
+                "80",
+                "1194"
+              ],
+              "protocols": [
+                "tcp",
+                "udp"
+              ],
+              "type": "openvpn"
+            }
+          ]
+        },
+        "host": "gwft1.ft1.example.org",
+        "ip_address": "37.218.230.200",
+        "location": "Florida"
+      }
+    ],
+    "locations": {
+      "Florida": {
+        "country_code": "US",
+        "hemisphere": "N",
+        "name": "United States",
+        "timezone": "-6"
+      },
+      "North Brabant": {
+        "country_code": "NL",
+        "hemisphere": "N",
+        "name": "Netherlands",
+        "timezone": "+2"
+      }
+    },
+    "openvpn_configuration": {
+      "auth": "SHA512",
+      "cipher": "AES-256-GCM",
+      "data-ciphers": "AES-256-GCM",
+      "dev": "tun",
+      "float": "",
+      "keepalive": "10 30",
+      "key-direction": "1",
+      "nobind": true,
+      "persist-key": true,
+      "rcvbuf": "0",
+      "sndbuf": "0",
+      "tls-cipher": "TLS-ECDHE-ECDSA-WITH-AES-256-GCM-SHA384",
+      "tls-version-min": "1.2",
+      "verb": "3"
+    },
+    "serial": 3,
+    "version": 3
+  }
\ No newline at end of file
diff --git a/test/data/provider.json b/test/data/provider.json
index 3571b393719e1476f94a2f6f982a96084cf607bd..c9c01ad7d36511493f31d165dcd9320a4ddf6a72 100644
--- a/test/data/provider.json
+++ b/test/data/provider.json
@@ -1,14 +1,14 @@
 {
-    "api_uri":"https://api.demo.bitmask.net:4430",
+    "api_uri":"https://api.demo.example.org:4430",
     "api_version":"3",
     "ask_for_donations":true,
     "ca_cert_fingerprint":"SHA256: 40ed9d9c13872c1fcba25abdcf26a7b1bdeded433d74fbe1ccb58fbaaab58e23",
-    "ca_cert_uri":"https://demo.bitmask.net/ca.crt",
+    "ca_cert_uri":"https://demo.example.org/ca.crt",
     "default_language":"en",
     "description":{
        "en":"non-prod testing provider"
     },
-    "domain":"demo.bitmask.net",
+    "domain":"demo.example.org",
     "donate_url":"https://leap.se/donate",
     "donate_period":"7",
     "info_url":"https://leap.se",
@@ -27,4 +27,4 @@
        "openvpn"
     ],
     "tos_url":""
- }
\ No newline at end of file
+ }