diff --git a/tools/test/topos/default.json b/tools/test/topos/default.json
index c144606..d668f6a 100644
--- a/tools/test/topos/default.json
+++ b/tools/test/topos/default.json
@@ -28,30 +28,30 @@
   },
 
   "hosts": {
-    "00:00:00:00:00:01/-1": { "basic": { "location": "of:0000000000000001/1", "ips": [ "10.0.0.1" ],  "name": "CMBR", "latitude": 43.355715, "longitude":  -69.528243 }},
-    "00:00:00:00:00:02/-1": { "basic": { "location": "of:0000000000000002/1", "ips": [ "10.0.0.2" ],  "name": "CHCG", "latitude": 43.632679, "longitude":  -88.772526 }},
-    "00:00:00:00:00:03/-1": { "basic": { "location": "of:0000000000000003/1", "ips": [ "10.0.0.3" ],  "name": "CLEV", "latitude": 42.756945, "longitude":  -79.831317 }},
-    "00:00:00:00:00:04/-1": { "basic": { "location": "of:0000000000000004/1", "ips": [ "10.0.0.4" ],  "name": "RLGH", "latitude": 36.972249, "longitude":  -76.667163 }},
-    "00:00:00:00:00:05/-1": { "basic": { "location": "of:0000000000000005/1", "ips": [ "10.0.0.5" ],  "name": "ATLN", "latitude": 35.427493, "longitude":  -83.885831 }},
-    "00:00:00:00:00:06/-1": { "basic": { "location": "of:0000000000000006/1", "ips": [ "10.0.0.6" ],  "name": "PHLA", "latitude": 39.208113, "longitude":  -73.421341 }},
-    "00:00:00:00:00:07/-1": { "basic": { "location": "of:0000000000000007/1", "ips": [ "10.0.0.7" ],  "name": "WASH", "latitude": 40.133860, "longitude":  -79.238299 }},
-    "00:00:00:00:00:08/-1": { "basic": { "location": "of:0000000000000008/1", "ips": [ "10.0.0.8" ],  "name": "NSVL", "latitude": 37.407589, "longitude":  -84.415068 }},
-    "00:00:00:00:00:09/-1": { "basic": { "location": "of:0000000000000009/1", "ips": [ "10.0.0.9" ],  "name": "STLS", "latitude": 40.066810, "longitude":  -90.932405 }},
-    "00:00:00:00:00:0a/-1": { "basic": { "location": "of:000000000000000a/1", "ips": [ "10.0.0.10" ], "name": "NWOR", "latitude": 31.470982, "longitude":  -88.779353 }},
-    "00:00:00:00:00:0b/-1": { "basic": { "location": "of:000000000000000b/1", "ips": [ "10.0.0.11" ], "name": "HSTN", "latitude": 31.136858, "longitude":  -94.351656 }},
-    "00:00:00:00:00:0c/-1": { "basic": { "location": "of:000000000000000c/1", "ips": [ "10.0.0.12" ], "name": "SNAN", "latitude": 28.040975, "longitude":  -99.169527 }},
-    "00:00:00:00:00:0d/-1": { "basic": { "location": "of:000000000000000d/1", "ips": [ "10.0.0.13" ], "name": "DLLS", "latitude": 31.899825, "longitude":  -99.287263 }},
-    "00:00:00:00:00:0e/-1": { "basic": { "location": "of:000000000000000e/1", "ips": [ "10.0.0.14" ], "name": "ORLD", "latitude": 26.670509, "longitude":  -81.291920 }},
-    "00:00:00:00:00:0f/-1": { "basic": { "location": "of:000000000000000f/1", "ips": [ "10.0.0.15" ], "name": "DNVR", "latitude": 40.888148, "longitude": -103.459878 }},
-    "00:00:00:00:00:10/-1": { "basic": { "location": "of:0000000000000010/1", "ips": [ "10.0.0.16" ], "name": "KSCY", "latitude": 40.545088, "longitude":  -93.734002 }},
-    "00:00:00:00:00:11/-1": { "basic": { "location": "of:0000000000000011/1", "ips": [ "10.0.0.17" ], "name": "SNFN", "latitude": 39.081743, "longitude": -124.330172 }},
-    "00:00:00:00:00:12/-1": { "basic": { "location": "of:0000000000000012/1", "ips": [ "10.0.0.18" ], "name": "SCRM", "latitude": 40.107468, "longitude": -120.424689 }},
-    "00:00:00:00:00:13/-1": { "basic": { "location": "of:0000000000000013/1", "ips": [ "10.0.0.19" ], "name": "PTLD", "latitude": 44.383051, "longitude": -124.767594 }},
-    "00:00:00:00:00:14/-1": { "basic": { "location": "of:0000000000000014/1", "ips": [ "10.0.0.20" ], "name": "STTL", "latitude": 48.832627, "longitude": -120.298441 }},
-    "00:00:00:00:00:15/-1": { "basic": { "location": "of:0000000000000015/1", "ips": [ "10.0.0.21" ], "name": "SLKC", "latitude": 42.301734, "longitude": -111.217297 }},
-    "00:00:00:00:00:16/-1": { "basic": { "location": "of:0000000000000016/1", "ips": [ "10.0.0.22" ], "name": "LA03", "latitude": 33.224634, "longitude": -121.532943 }},
-    "00:00:00:00:00:17/-1": { "basic": { "location": "of:0000000000000017/1", "ips": [ "10.0.0.23" ], "name": "SNDG", "latitude": 31.834607, "longitude": -118.847982 }},
-    "00:00:00:00:00:18/-1": { "basic": { "location": "of:0000000000000018/1", "ips": [ "10.0.0.24" ], "name": "PHNX", "latitude": 34.662290, "longitude": -110.946662 }},
-    "00:00:00:00:00:19/-1": { "basic": { "location": "of:0000000000000019/1", "ips": [ "10.0.0.25" ], "name": "NY54", "latitude": 42.395459, "longitude":  -75.293563 }}
+    "00:00:00:00:00:01/-1": { "basic": { "locations": ["of:0000000000000001/1"], "ips": [ "10.0.0.1" ],  "name": "CMBR", "latitude": 43.355715, "longitude":  -69.528243 }},
+    "00:00:00:00:00:02/-1": { "basic": { "locations": ["of:0000000000000002/1"], "ips": [ "10.0.0.2" ],  "name": "CHCG", "latitude": 43.632679, "longitude":  -88.772526 }},
+    "00:00:00:00:00:03/-1": { "basic": { "locations": ["of:0000000000000003/1"], "ips": [ "10.0.0.3" ],  "name": "CLEV", "latitude": 42.756945, "longitude":  -79.831317 }},
+    "00:00:00:00:00:04/-1": { "basic": { "locations": ["of:0000000000000004/1"], "ips": [ "10.0.0.4" ],  "name": "RLGH", "latitude": 36.972249, "longitude":  -76.667163 }},
+    "00:00:00:00:00:05/-1": { "basic": { "locations": ["of:0000000000000005/1"], "ips": [ "10.0.0.5" ],  "name": "ATLN", "latitude": 35.427493, "longitude":  -83.885831 }},
+    "00:00:00:00:00:06/-1": { "basic": { "locations": ["of:0000000000000006/1"], "ips": [ "10.0.0.6" ],  "name": "PHLA", "latitude": 39.208113, "longitude":  -73.421341 }},
+    "00:00:00:00:00:07/-1": { "basic": { "locations": ["of:0000000000000007/1"], "ips": [ "10.0.0.7" ],  "name": "WASH", "latitude": 40.133860, "longitude":  -79.238299 }},
+    "00:00:00:00:00:08/-1": { "basic": { "locations": ["of:0000000000000008/1"], "ips": [ "10.0.0.8" ],  "name": "NSVL", "latitude": 37.407589, "longitude":  -84.415068 }},
+    "00:00:00:00:00:09/-1": { "basic": { "locations": ["of:0000000000000009/1"], "ips": [ "10.0.0.9" ],  "name": "STLS", "latitude": 40.066810, "longitude":  -90.932405 }},
+    "00:00:00:00:00:0a/-1": { "basic": { "locations": ["of:000000000000000a/1"], "ips": [ "10.0.0.10" ], "name": "NWOR", "latitude": 31.470982, "longitude":  -88.779353 }},
+    "00:00:00:00:00:0b/-1": { "basic": { "locations": ["of:000000000000000b/1"], "ips": [ "10.0.0.11" ], "name": "HSTN", "latitude": 31.136858, "longitude":  -94.351656 }},
+    "00:00:00:00:00:0c/-1": { "basic": { "locations": ["of:000000000000000c/1"], "ips": [ "10.0.0.12" ], "name": "SNAN", "latitude": 28.040975, "longitude":  -99.169527 }},
+    "00:00:00:00:00:0d/-1": { "basic": { "locations": ["of:000000000000000d/1"], "ips": [ "10.0.0.13" ], "name": "DLLS", "latitude": 31.899825, "longitude":  -99.287263 }},
+    "00:00:00:00:00:0e/-1": { "basic": { "locations": ["of:000000000000000e/1"], "ips": [ "10.0.0.14" ], "name": "ORLD", "latitude": 26.670509, "longitude":  -81.291920 }},
+    "00:00:00:00:00:0f/-1": { "basic": { "locations": ["of:000000000000000f/1"], "ips": [ "10.0.0.15" ], "name": "DNVR", "latitude": 40.888148, "longitude": -103.459878 }},
+    "00:00:00:00:00:10/-1": { "basic": { "locations": ["of:0000000000000010/1"], "ips": [ "10.0.0.16" ], "name": "KSCY", "latitude": 40.545088, "longitude":  -93.734002 }},
+    "00:00:00:00:00:11/-1": { "basic": { "locations": ["of:0000000000000011/1"], "ips": [ "10.0.0.17" ], "name": "SNFN", "latitude": 39.081743, "longitude": -124.330172 }},
+    "00:00:00:00:00:12/-1": { "basic": { "locations": ["of:0000000000000012/1"], "ips": [ "10.0.0.18" ], "name": "SCRM", "latitude": 40.107468, "longitude": -120.424689 }},
+    "00:00:00:00:00:13/-1": { "basic": { "locations": ["of:0000000000000013/1"], "ips": [ "10.0.0.19" ], "name": "PTLD", "latitude": 44.383051, "longitude": -124.767594 }},
+    "00:00:00:00:00:14/-1": { "basic": { "locations": ["of:0000000000000014/1"], "ips": [ "10.0.0.20" ], "name": "STTL", "latitude": 48.832627, "longitude": -120.298441 }},
+    "00:00:00:00:00:15/-1": { "basic": { "locations": ["of:0000000000000015/1"], "ips": [ "10.0.0.21" ], "name": "SLKC", "latitude": 42.301734, "longitude": -111.217297 }},
+    "00:00:00:00:00:16/-1": { "basic": { "locations": ["of:0000000000000016/1"], "ips": [ "10.0.0.22" ], "name": "LA03", "latitude": 33.224634, "longitude": -121.532943 }},
+    "00:00:00:00:00:17/-1": { "basic": { "locations": ["of:0000000000000017/1"], "ips": [ "10.0.0.23" ], "name": "SNDG", "latitude": 31.834607, "longitude": -118.847982 }},
+    "00:00:00:00:00:18/-1": { "basic": { "locations": ["of:0000000000000018/1"], "ips": [ "10.0.0.24" ], "name": "PHNX", "latitude": 34.662290, "longitude": -110.946662 }},
+    "00:00:00:00:00:19/-1": { "basic": { "locations": ["of:0000000000000019/1"], "ips": [ "10.0.0.25" ], "name": "NY54", "latitude": 42.395459, "longitude":  -75.293563 }}
   }
 }