diff --git a/inventory_provider/router_interfaces.py b/inventory_provider/router_interfaces.py
index 07ce61d6241b526243ec7438e24d5409575c44ae..f4cd737d3e82d6e22b911a773f0e05630a53a7c8 100644
--- a/inventory_provider/router_interfaces.py
+++ b/inventory_provider/router_interfaces.py
@@ -52,9 +52,9 @@ def get_router_details(router, params, q):
     command_output = commands_proc_queue.get()
     assert len(command_output) == len(commands)
 
-    for c, o in zip(commands, command_output):
-        with open("/tmp/%s-%s.output" % (router["hostname"], c["key"]), "w") as f:
-            f.write(o)
+    # for c, o in zip(commands, command_output):
+    #     with open("/tmp/%s-%s.output" % (router["hostname"], c["key"]), "w") as f:
+    #         f.write(o)
 
     result = {}
     for c, o in zip(commands, command_output):
diff --git a/test/data/mx1.ams.nl.geant.net-None.output b/test/data/mx1.ams.nl.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx1.ams.nl.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx1.ams.nl.geant.net-bgpv4.output b/test/data/mx1.ams.nl.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..fb87b4a94d993554bf594f1857704aff447214b4
--- /dev/null
+++ b/test/data/mx1.ams.nl.geant.net-bgpv4.output
@@ -0,0 +1,105 @@
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.133 description "Limelight "
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.20 description Microsoft
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.21 description Microsoft
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.215 description "Leaseweb "
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.231 description OVH
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.245 description OVH
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.168 description Akamai
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.208 description Akamai
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.215 description Leaseweb
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.150 description "Hurricane Electric"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.211.47 description IPTRANSIT
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.115 description Facebook
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.164 description "Facebook (2)"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.192 description Telenor
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.210.100 description Amazon
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.210.217 description "Amazon (2)"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.108 description BT
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.236 description COLT
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.52 description "COLT (2)"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.34 description TalkTalk
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.251 description "Free SAS"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.123 description "VODAFONE (2)"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.123 description VODAFONE
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.210.232 description BLACKBOARD
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.53 description Neotelekoms
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.210.13 description Lattelekom
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.224 description ECATEL
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.125 description MegaFon
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.234 description "SIG Telecom"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.210.155 description "Telindus Luxembourg"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.176 description Wikimedia
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.88 description OpenDNS
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.198 description "Nerim SAS"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.210.210 description "Init7 peering#1"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.210 description "Init7 peering#2"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.111 description "ISC F-root #1"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.140 description "ISC F-root #2"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.211.140 description CloudFlare
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.211.27 description Twitch_Interactive__Justin.tv_
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.210.197 description Twitch_Interactive__Justin.tv_
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.211.10 description Feral_Hosting
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.210.43 description Voxility
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.228 description NFOrce_Entertainment_BV
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.210.175 description NFOrce_Entertainment_BV
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.55 description Hetzner_Online_AG
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.211.45 description Liquid_Telecommunications
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.160 description DENIC_eG,_AS31529
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.211.160 description Apple_Inc
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.211.183 description Apple_Inc
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.92 description Netnod
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.56 description Netnod
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.124 description Incapsula
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.51 description RDSnet
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.162 description EdgeCast_Networks,_Inc.
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.151 description EdgeCast_Networks,_Inc.
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.210.82 description SoftLayer_Technologies,_Inc._an_IBM_Company
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.217 description PT_Comunicacoes_S.A.
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.211.23 description Valve_Corporation
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.164 description Dailymotion
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.46 description Bezeq_International
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.113 description Code_42_Software,_Inc.
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.210.174 description "Blue_Jeans_Network,_Inc. AS18541"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.212.14 description "Dropbox AS19679"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.212.93 description "ONLINE AS12876"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.63 description "M247_Ltd AS9009"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.212.62 description "Spotify AS8403"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.94 description "Highwinds_Network_Group,_Inc AS12989"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.70 description "Highwinds_Network_Group,_Inc AS12989"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.212.183 description "FASTLY AS54113"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.212.184 description "FASTLY AS54113"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.211.209 description Limelight
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.216 description "RETN AS9002"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.153 description "VIMPELCOM AS3216"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.211.217 description "ATOM86 AS8455"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.60 description "Post_Group_Luxembourg AS6661"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.232 description "VeriSign AS7342"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.130 description "Twitter,_Inc. AS13414"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.210.46 description "Twitter,_Inc. AS13414"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.210.41 description "DSTORAGE AS198792"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.187 description "Internap AS29791"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.213.152 description "ONLINE AS12876"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.128 description "Core-Backbone_GmbH AS33891"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.211.212 description "Automattic AS2635"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.210.250 description "Netflix AS2906"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.211.250 description "Netflix AS2906"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.250 description "Packet_Clearing_House AS42"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.250 description "Packet_Clearing_House AS3856"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.45 description "USC_/_UFMG_PEERING_Research_Testbed AS47065"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.110 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.163 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.136 description "Canadian_Internet_Registration_Authority_-_.CA_Registry AS55195"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.191 description "CDNetworks_Inc. AS36408"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.210.106 description "CDNetworks_Inc. AS36408"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.212.38 description "Choopa,_LLC AS20473"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.211.200 description "Yandex_LLC AS13238"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.210.150 description "G-Core_Labs_S.A. AS199524"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.132 description "RIPE_NCC AS197000"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.69 description "RIPE_NCC AS12654"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.213.234 description "IP_Transit,_Inc. AS46786"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.82 description "Claranet AS8426"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.209.228 description "Claranet AS8426"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.212.146 description "ViewQwest AS18106"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.122 description "Zayo_Group AS6461"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.213.122 description "Highwinds_Network_Group,_Inc AS33438"
+set routing-instances IAS protocols bgp group GEANT-IX-AMS-IX neighbor 80.249.208.39 description "OARC,_Inc. AS112"
diff --git a/test/data/mx1.ams.nl.geant.net-bgpv6.output b/test/data/mx1.ams.nl.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..304d9405c121f90a8970ead25b0b87d189fbfd35
--- /dev/null
+++ b/test/data/mx1.ams.nl.geant.net-bgpv6.output
@@ -0,0 +1,95 @@
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:6265:2 description "Leaseweb "
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:6276:1 description OVH
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:6276:2 description OVH
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:8075:1 description Microsoft
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:8075:2 description Microsoft
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a502:940:2 description Akamai
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a502:940:1 description Akamai
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a502:2822:1 description Limelight
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:6265:1 description Leaseweb
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:6939:1 description "Hurricane Electric"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:8708:1 description RDSnet
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a504:6786:1 description IPTRANSIT
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a503:2934:1 description Facebook
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a503:2934:2 description "Facebook (2)"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:8220:1 description COLT
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:8220:2 description "COLT (2)"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:3285:1 description TalkTalk
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:2322:1 description "Free SAS"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:3209:2 description "VODAFONE (2)"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:3209:1 description VODAFONE
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:8218:2 description Neotelekoms
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:2578:1 description Lattelekom
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a502:9073:1 description ECATEL
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a503:1133:1 description MegaFon
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a502:932:1 description "SIG Telecom"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a505:6665:1 description "Telindus Luxembourg"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:4907:1 description Wikimedia
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a503:6692:1 description OpenDNS
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:3030:1 description "Init7 peering#1"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:3030:2 description "Init7 peering#2"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a503:132:1 description "ISC F-root #1"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a503:132:2 description "ISC F-root #2"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:3335:1 description CloudFlare
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1:0:a500:20:52:1 description Feral_Hosting
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a504:3350:2 description NFOrce_Entertainment_BV
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a504:3350:1 description NFOrce_Entertainment_BV
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a502:4940:1 description Hetzner_Online_AG
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a503:0844:1 description Liquid_Telecommunications
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a503:1529:1 description DENIC_eG,_AS31529
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:0714:1 description Apple_Inc
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:0714:2 description Apple_Inc
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:8674:1 description Netnod
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:8674:2 description Netnod
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:9551:1 description Incapsula
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:5133:1 description EdgeCast_Networks,_Inc.
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:5133:2 description EdgeCast_Networks,_Inc.
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a503:6351:1 description SoftLayer_Technologies,_Inc._an_IBM_Company
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:8657:1 description PT_Comunicacoes_S.A.
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a503:2590:1 description Valve_Corporation
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:8551:1 description Bezeq_International
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a506:2715:1 description Code_42_Software,_Inc.
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:3193:1 description "Nerim SAS"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:5400:1 description BT
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:2119:1 description Telenor
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:9679:1 description "Dropbox AS19679"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:2876:2 description "ONLINE AS12876"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:9009:1 description "M247_Ltd AS9009"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:8403:1 description "Spotify AS8403"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:2989:1 description "Highwinds_Network_Group,_Inc AS12989"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:2989:2 description "Highwinds_Network_Group,_Inc AS12989"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a502:2822:2 description Limelight
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:9002:1 description "RETN AS9002"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:3216:1 description "VIMPELCOM AS3216"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:8455:1 description "ATOM86 AS8455"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:6661:1 description "Post_Group_Luxembourg AS6661"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a505:4113:1 description "FASTLY AS54113"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a505:4113:2 description "FASTLY AS54113"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:7342:1 description "VeriSign AS7342"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:3414:1 description "Twitter,_Inc. AS13414"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:3414:2 description "Twitter,_Inc. AS13414"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a519:8792:1 description "DSTORAGE AS198792"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a502:9791:1 description "Internap AS29791"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a503:3891:1 description "Core-Backbone_GmbH AS33891"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:2635:1 description "Automattic AS2635"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:2906:1 description "Netflix AS2906"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:2906:2 description "Netflix AS2906"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a504:1690:1 description "Dailymotion AS41690"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:42:1 description "Packet_Clearing_House AS42"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:3856:1 description "Packet_Clearing_House AS3856"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a504:7065:1 description "USC_/_UFMG_PEERING_Research_Testbed AS47065"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:310:1 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:310:2 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a505:5195:1 description "Canadian_Internet_Registration_Authority_-_.CA_Registry AS55195"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a502:473:1 description "Choopa,_LLC AS20473"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:3238:1 description "Yandex_LLC AS13238"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1:0:a500:19:9524:1 description "G-Core_Labs_S.A. AS199524"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1:0:a500:19:7000:1 description "RIPE_NCC AS197000"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:2654:1 description "RIPE_NCC AS12654"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a504:6786:2 description "IP_Transit,_Inc. AS46786"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:8426:1 description "Claranet AS8426"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:8426:2 description "Claranet AS8426"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a501:8106:1 description "ViewQwest AS18106"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:6461:1 description "Zayo_Group AS6461"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a503:3438:1 description "Highwinds_Network_Group,_Inc AS33438"
+set routing-instances IAS protocols bgp group GEANT-IXv6-AMS-IX neighbor 2001:7f8:1::a500:112:1 description "OARC,_Inc. AS112"
diff --git a/test/data/mx1.ath2.gr.geant.net-None.output b/test/data/mx1.ath2.gr.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx1.ath2.gr.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx1.ath2.gr.geant.net-bgpv4.output b/test/data/mx1.ath2.gr.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx1.ath2.gr.geant.net-bgpv6.output b/test/data/mx1.ath2.gr.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx1.buc.ro.geant.net-None.output b/test/data/mx1.buc.ro.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx1.buc.ro.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx1.buc.ro.geant.net-bgpv4.output b/test/data/mx1.buc.ro.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx1.buc.ro.geant.net-bgpv6.output b/test/data/mx1.buc.ro.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx1.bud.hu.geant.net-None.output b/test/data/mx1.bud.hu.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx1.bud.hu.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx1.bud.hu.geant.net-bgpv4.output b/test/data/mx1.bud.hu.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx1.bud.hu.geant.net-bgpv6.output b/test/data/mx1.bud.hu.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx1.dub.ie.geant.net-None.output b/test/data/mx1.dub.ie.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx1.dub.ie.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx1.dub.ie.geant.net-bgpv4.output b/test/data/mx1.dub.ie.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..16f684ee59f546a6f1897c48a8d9b0505a39270e
--- /dev/null
+++ b/test/data/mx1.dub.ie.geant.net-bgpv4.output
@@ -0,0 +1,19 @@
+set routing-instances IAS protocols bgp group GEANT-IX-INEX neighbor 185.6.36.126 description "Peering with INEX collector"
+set routing-instances IAS protocols bgp group GEANT-IX-INEX neighbor 185.6.36.55 description Akamai_Technologies
+set routing-instances IAS protocols bgp group GEANT-IX-INEX neighbor 185.6.36.75 description Limelight_Networks
+set routing-instances IAS protocols bgp group GEANT-IX-INEX neighbor 185.6.36.28 description Microsoft
+set routing-instances IAS protocols bgp group GEANT-IX-INEX neighbor 185.6.36.76 description CloudFlare
+set routing-instances IAS protocols bgp group GEANT-IX-INEX neighbor 185.6.36.86 description Colt_Technology_Services
+set routing-instances IAS protocols bgp group GEANT-IX-INEX neighbor 185.6.36.69 description Hurricane_Electric
+set routing-instances IAS protocols bgp group GEANT-IX-INEX neighbor 185.6.36.50 description "Amazon AS16509"
+set routing-instances IAS protocols bgp group GEANT-IX-INEX neighbor 185.6.36.116 description BT_AS5400
+set routing-instances IAS protocols bgp group GEANT-IX-INEX neighbor 185.6.36.40 description "VeriSign AS26415"
+set routing-instances IAS protocols bgp group GEANT-IX-INEX neighbor 185.6.36.130 description "Facebook AS32934"
+set routing-instances IAS protocols bgp group GEANT-IX-INEX neighbor 185.6.36.85 description "Netflix AS2906"
+set routing-instances IAS protocols bgp group GEANT-IX-INEX neighbor 185.6.36.122 description "Apple_Inc AS714"
+set routing-instances IAS protocols bgp group GEANT-IX-INEX neighbor 185.6.36.123 description "Apple_Inc AS714"
+set routing-instances IAS protocols bgp group GEANT-IX-INEX neighbor 185.6.36.60 description "Packet_Clearing_House AS42"
+set routing-instances IAS protocols bgp group GEANT-IX-INEX neighbor 185.6.36.61 description "Packet_Clearing_House AS3856"
+set routing-instances IAS protocols bgp group GEANT-IX-INEX neighbor 185.6.36.77 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IX-INEX neighbor 185.6.36.135 description "OpenDNS,_Inc. AS36692"
+set routing-instances IAS protocols bgp group GEANT-IX-INEX neighbor 185.6.36.6 description "OARC,_Inc. AS112"
diff --git a/test/data/mx1.dub.ie.geant.net-bgpv6.output b/test/data/mx1.dub.ie.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..505ae1149f844baea44d878af8e4afe76e2fb69b
--- /dev/null
+++ b/test/data/mx1.dub.ie.geant.net-bgpv6.output
@@ -0,0 +1,19 @@
+set routing-instances IAS protocols bgp group GEANT-IXv6-INEX neighbor 2001:7f8:18::f:0:1 description "Peering with INEX collector"
+set routing-instances IAS protocols bgp group GEANT-IXv6-INEX neighbor 2001:7f8:18::55 description Akamai_Technologies
+set routing-instances IAS protocols bgp group GEANT-IXv6-INEX neighbor 2001:7f8:18::75 description Limelight_Networks
+set routing-instances IAS protocols bgp group GEANT-IXv6-INEX neighbor 2001:7f8:18::28 description Microsoft
+set routing-instances IAS protocols bgp group GEANT-IXv6-INEX neighbor 2001:7f8:18::76 description CloudFlare
+set routing-instances IAS protocols bgp group GEANT-IXv6-INEX neighbor 2001:7f8:18::86 description Colt_Technology_Services
+set routing-instances IAS protocols bgp group GEANT-IXv6-INEX neighbor 2001:7f8:18::69 description Hurricane_Electric
+set routing-instances IAS protocols bgp group GEANT-IXv6-INEX neighbor 2001:7f8:18::50 description "Amazon AS16509"
+set routing-instances IAS protocols bgp group GEANT-IXv6-INEX neighbor 2001:7f8:18::116 description BT_AS5400
+set routing-instances IAS protocols bgp group GEANT-IXv6-INEX neighbor 2001:7f8:18::40 description "VeriSign AS26415"
+set routing-instances IAS protocols bgp group GEANT-IXv6-INEX neighbor 2001:7f8:18::130 description "Facebook AS32934"
+set routing-instances IAS protocols bgp group GEANT-IXv6-INEX neighbor 2001:7f8:18::85 description "Netflix AS2906"
+set routing-instances IAS protocols bgp group GEANT-IXv6-INEX neighbor 2001:7f8:18::122 description "Apple_Inc AS714"
+set routing-instances IAS protocols bgp group GEANT-IXv6-INEX neighbor 2001:7f8:18::123 description "Apple_Inc AS714"
+set routing-instances IAS protocols bgp group GEANT-IXv6-INEX neighbor 2001:7f8:18::60 description "Packet_Clearing_House AS42"
+set routing-instances IAS protocols bgp group GEANT-IXv6-INEX neighbor 2001:7f8:18::61 description "Packet_Clearing_House AS3856"
+set routing-instances IAS protocols bgp group GEANT-IXv6-INEX neighbor 2001:7f8:18::77 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IXv6-INEX neighbor 2001:7f8:18::135 description "OpenDNS,_Inc. AS36692"
+set routing-instances IAS protocols bgp group GEANT-IXv6-INEX neighbor 2001:7f8:18::6 description "OARC,_Inc. AS112"
diff --git a/test/data/mx1.dub2.ie.geant.net-None.output b/test/data/mx1.dub2.ie.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx1.dub2.ie.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx1.dub2.ie.geant.net-bgpv4.output b/test/data/mx1.dub2.ie.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx1.dub2.ie.geant.net-bgpv6.output b/test/data/mx1.dub2.ie.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx1.fra.de.geant.net-None.output b/test/data/mx1.fra.de.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx1.fra.de.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx1.fra.de.geant.net-bgpv4.output b/test/data/mx1.fra.de.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..01d21a866d6c716e7c55b9e71c9c54b185dfa736
--- /dev/null
+++ b/test/data/mx1.fra.de.geant.net-bgpv4.output
@@ -0,0 +1,106 @@
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.221 description "Limelight "
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.52 description Microsoft
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.193.246 description "Leaseweb "
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.209 description OVH
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.28 description Akamai
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.172 description "Hurricane Electric"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.87 description RDSnet
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.81 description "Public Peeering with IPTRANSIT"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.40 description Facebook
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.195.40 description "Facebook (2)"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.121 description Telenor
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.152 description Amazon
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.195.152 description "Amazon (2)"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.193.84 description BT
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.61 description COLT
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.193.61 description "COLT (2)"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.104 description TalkTalk
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.223 description "Free SAS"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.193.117 description "VODAFONE (2)"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.117 description VODAFONE
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.156 description "SUPERONLINE / TELLCOM"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.165 description Lattelekom
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.193.13 description Neotelekoms
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.236 description MegaFon
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.209 description "Telindus Luxembourg"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.218 description OpenDNS
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.67 description "Init7 peering#1"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.193.67 description "Init7 peering#2"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.193.39 description "Nerim SAS"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.195.57 description "ISC F-root #1"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.57 description "ISC F-root #2"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.202 description "The BOX - cloud provider"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.180 description CloudFlare
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.193.81 description Twitch_Interactive__Justin.tv_
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.181 description Twitch_Interactive__Justin.tv_
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.195.144 description Voxility
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.193.154 description NFOrce_Entertainment_BV
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.164 description Hetzner_Online_AG
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.193.164 description Hetzner_Online_AG
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.193.228 description Liquid_Telecommunications
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.176 description DENIC_eG,_AS31529
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.193.223 description Apple_Inc
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.193.202 description Apple_Inc
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.193.160 description Netnod
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.160 description Netnod
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.193.87 description Incapsula
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.195.37 description EdgeCast_Networks,_Inc.
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.37 description EdgeCast_Networks,_Inc.
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.167 description SoftLayer_Technologies,_Inc._an_IBM_Company
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.38 description PT_Comunicacoes_S.A.
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.193.63 description Valve_Corporation
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.43 description Dailymotion
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.191 description Bezeq_International
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.193.191 description Bezeq_International
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.151 description CloudSigma-AG
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.193.209 description OVH
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.44 description SIG_Telecom
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.171 description Apple_Inc
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.161 description Apple_Inc
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.60 description NFOrce_Entertainment_BV
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.193.221 description "Limelight "
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.138 description "Dropbox AS19679"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.165 description "M247_Ltd AS9009"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.91 description "Spotify AS8403"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.224 description "Highwinds_Network_Group,_Inc AS12989"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.193.224 description "Highwinds_Network_Group,_Inc AS12989"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.74 description "Highwinds_Network_Group,_Inc AS12989"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.205 description "Highwinds_Network_Group,_Inc AS12989"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.239 description "Host_Europe_GmbH AS20773"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.195.168 description Akamai
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.99 description "ZATTOO AS8302"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.195.54 description "FASTLY AS54113"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.195.55 description "FASTLY AS54113"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.73 description "RETN AS9002"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.243 description "VIMPELCOM AS3216"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.195.11 description Microsoft
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.204 description "Post_Group_Luxembourg AS6661"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.245 description "VeriSign AS7342"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.10 description "Twitter,_Inc. AS13414"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.21 description "Twitter,_Inc. AS13414"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.195.60 description "alibaba AS45102"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.187 description "Core-Backbone_GmbH AS33891"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.195.147 description "Core-Backbone_GmbH AS33891"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.193.69 description "Automattic AS2635"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.182 description "Netflix AS2906"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.202 description "Netflix AS2906"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.42 description "Packet_Clearing_House AS42"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.195.42 description "Packet_Clearing_House AS3856"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.115 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.193.115 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.195.189 description "Neotel AS34772"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.56 description "Canadian_Internet_Registration_Authority_-_.CA_Registry AS55195"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.65 description "CDNetworks_Inc. AS36408"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.4 description "CDNetworks_Inc. AS36408"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.251 description "Yandex_LLC AS13238"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.193.252 description "G-Core_Labs_S.A. AS199524"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.152 description "RIPE_NCC AS12654"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.5 description "Tencent AS132203"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.195.120 description "Tencent AS132203"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.86 description "Claranet AS8426"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.193.86 description "Claranet AS8426"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.195.207 description "ViewQwest AS18106"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.192.168 description Akamai
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.194.26 description "Zayo_Group AS6461"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.195.145 description "Highwinds_Network_Group,_Inc AS33438"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX neighbor 80.81.193.40 description "Highwinds_Network_Group,_Inc AS33438"
diff --git a/test/data/mx1.fra.de.geant.net-bgpv6.output b/test/data/mx1.fra.de.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..5af945dafa14394588c485eb87c40a8ec98ede75
--- /dev/null
+++ b/test/data/mx1.fra.de.geant.net-bgpv6.output
@@ -0,0 +1,94 @@
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::3f89:0:2 description Leaseweb
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::1f8b:0:1 description Microsoft
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::1b1b:0:1 description "Hurricane Electric"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::2204:0:1 description RDSnet
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::b6c2:0:1 description IPTRANSIT
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::80a6:0:1 description Facebook
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::80a6:0:2 description "Facebook (2)"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::847:0:1 description Telenor
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::201c:0:1 description COLT
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::201c:0:2 description "COLT (2)"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::33e5:0:1 description TalkTalk
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::3022:0:1 description "Free SAS"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::c89:0:3 description VODAFONE
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::c89:0:4 description "VODAFONE (2)"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::88a8:0:1 description "SUPERONLINE / TELLCOM"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::201a:0:2 description Neotelecoms
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::3122:0:1 description Lattelekom
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::799d:0:1 description MegaFon
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::dd59:0:1 description "Telindus Luxembourg"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::8f54:0:1 description OpenDNS
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::32e6:0:2 description "Init7 peering#1"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::32e6:0:1 description "Init7 peering#2"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::3389:0:1 description "Nerim SAS"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::813a:0:2 description "ISC F-root #2"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::813a:0:1 description "ISC F-root #1"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::3417:0:1 description CloudFlare
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::a956:0:1 description NFOrce_Entertainment_BV
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::616c:0:1 description Hetzner_Online_AG
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::616c:0:2 description Hetzner_Online_AG
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::787c:0:1 description Liquid_Telecommunications
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::7b29:0:1 description DENIC_eG,_AS31529
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::2ca:0:1 description Apple_Inc
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::2ca:0:2 description Apple_Inc
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::21e2:0:2 description Netnod
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::21e2:0:1 description Netnod
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::4c5f:0:1 description Incapsula
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::3b1d:0:1 description EdgeCast_Networks,_Inc.
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::3b1d:0:2 description EdgeCast_Networks,_Inc.
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::8dff:0:1 description SoftLayer_Technologies,_Inc._an_IBM_Company
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::21d1:0:1 description PT_Comunicacoes_S.A.
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::7f4e:0:1 description Valve_Corporation
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::2167:0:2 description Bezeq_International
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::2167:0:1 description Bezeq_International
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::1518:0:1 description BT
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::3f94:0:1 description OVH
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::3f94:0:2 description OVH
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::51c4:0:1 description SIG_Telecom
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::2ca:0:3 description Apple_Inc
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::2ca:0:4 description Apple_Inc
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::a956:0:2 description NFOrce_Entertainment_BV
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::5926:0:2 description Limelight
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::5926:0:1 description Limelight
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::51cc:1:168 description Akamai
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::4cdf:0:1 description "Dropbox AS19679"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::2331:0:1 description "M247_Ltd AS9009"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::20d3:0:1 description "Spotify AS8403"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::32bd:0:1 description "Highwinds_Network_Group,_Inc AS12989"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::32bd:0:2 description "Highwinds_Network_Group,_Inc AS12989"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::32bd:0:3 description "Highwinds_Network_Group,_Inc AS12989"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::32bd:0:4 description "Highwinds_Network_Group,_Inc AS12989"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::5125:f1:1 description "Host_Europe_GmbH AS20773"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::51cc:0:28 description Akamai
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::206e:0:1 description "ZATTOO AS8302"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::232a:0:1 description "RETN AS9002"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::c90:0:1 description "VIMPELCOM AS3216"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::1f8b:0:2 description Microsoft
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::1a05:0:1 description "Post_Group_Luxembourg AS6661"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::d361:0:1 description "FASTLY AS54113"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::d361:0:2 description "FASTLY AS54113"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::1cae:0:1 description "VeriSign AS7342"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::3466:0:1 description "Twitter,_Inc. AS13414"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::3466:0:2 description "Twitter,_Inc. AS13414"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::8463:0:1 description "Core-Backbone_GmbH AS33891"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::8463:0:2 description "Core-Backbone_GmbH AS33891"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::a4b:0:1 description "Automattic AS2635"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::b5a:0:1 description "Netflix AS2906"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::b5a:0:2 description "Netflix AS2906"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::a2da:0:1 description "Dailymotion AS41690"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::2a:0:1 description "Packet_Clearing_House AS42"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::f10:0:1 description "Packet_Clearing_House AS3856"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::2846:0:1 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::2846:0:2 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::87d4:0:1 description "Neotel AS34772"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::d79b:0:1 description "Canadian_Internet_Registration_Authority_-_.CA_Registry AS55195"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::33b6:0:1 description "Yandex_LLC AS13238"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::3:b64:0:2 description "G-Core_Labs_S.A. AS199524"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::316e:0:1 description "RIPE_NCC AS12654"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::20ea:0:1 description "Claranet AS8426"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::20ea:0:2 description "Claranet AS8426"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::46ba:0:1 description "ViewQwest AS18106"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::51cc:0:168 description Akamai
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::193d:0:1 description "Zayo_Group AS6461"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::829e:0:1 description "Highwinds_Network_Group,_Inc AS33438"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX neighbor 2001:7f8::829e:0:2 description "Highwinds_Network_Group,_Inc AS33438"
diff --git a/test/data/mx1.gen.ch.geant.net-None.output b/test/data/mx1.gen.ch.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx1.gen.ch.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx1.gen.ch.geant.net-bgpv4.output b/test/data/mx1.gen.ch.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..ebd6614c4fa88b863fc54f29fbe9757c16097a8d
--- /dev/null
+++ b/test/data/mx1.gen.ch.geant.net-bgpv4.output
@@ -0,0 +1,7 @@
+set routing-instances IAS protocols bgp group GEANT-IX-CIXP neighbor 192.65.185.165 description COLT
+set routing-instances IAS protocols bgp group GEANT-IX-CIXP neighbor 192.65.185.142 description SIG_Telecom
+set routing-instances IAS protocols bgp group GEANT-IX-CIXP neighbor 192.65.185.236 description Netnod
+set routing-instances IAS protocols bgp group GEANT-IX-CIXP neighbor 192.65.185.235 description Netnod
+set routing-instances IAS protocols bgp group GEANT-IX-CIXP neighbor 192.65.185.193 description Init7
+set routing-instances IAS protocols bgp group GEANT-IX-CIXP neighbor 192.65.185.40 description "RIPE_NCC AS12654"
+set routing-instances IAS protocols bgp group GEANT-IX-CIXP neighbor 192.65.185.137 description "Swisscom_Switzerland_Ltd AS3303"
diff --git a/test/data/mx1.gen.ch.geant.net-bgpv6.output b/test/data/mx1.gen.ch.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..62d8a843be60ca6d1f982a68e603abe7251edd82
--- /dev/null
+++ b/test/data/mx1.gen.ch.geant.net-bgpv6.output
@@ -0,0 +1,7 @@
+set routing-instances IAS protocols bgp group GEANT-IXv6-CIXP neighbor 2001:7f8:1c:24a::201c:1 description COLT
+set routing-instances IAS protocols bgp group GEANT-IXv6-CIXP neighbor 2001:7f8:1c:24a::51c4:1 description SIG_Telecom
+set routing-instances IAS protocols bgp group GEANT-IXv6-CIXP neighbor 2001:7f8:1c:24a::21e2:1 description Netnod
+set routing-instances IAS protocols bgp group GEANT-IXv6-CIXP neighbor 2001:7f8:1c:24a::21e2:2 description Netnod
+set routing-instances IAS protocols bgp group GEANT-IXv6-CIXP neighbor 2001:7f8:1c:24a::32e6:1 description Init7
+set routing-instances IAS protocols bgp group GEANT-IXv6-CIXP neighbor 2001:7f8:1c:24a::316e:1 description "RIPE_NCC AS12654"
+set routing-instances IAS protocols bgp group GEANT-IXv6-CIXP neighbor 2001:7f8:1c:24a::ce7:1 description "Swisscom_Switzerland_Ltd AS3303"
diff --git a/test/data/mx1.ham.de.geant.net-None.output b/test/data/mx1.ham.de.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx1.ham.de.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx1.ham.de.geant.net-bgpv4.output b/test/data/mx1.ham.de.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx1.ham.de.geant.net-bgpv6.output b/test/data/mx1.ham.de.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx1.kau.lt.geant.net-None.output b/test/data/mx1.kau.lt.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx1.kau.lt.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx1.kau.lt.geant.net-bgpv4.output b/test/data/mx1.kau.lt.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx1.kau.lt.geant.net-bgpv6.output b/test/data/mx1.kau.lt.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx1.lis.pt.geant.net-None.output b/test/data/mx1.lis.pt.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx1.lis.pt.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx1.lis.pt.geant.net-bgpv4.output b/test/data/mx1.lis.pt.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx1.lis.pt.geant.net-bgpv6.output b/test/data/mx1.lis.pt.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx1.lon.uk.geant.net-None.output b/test/data/mx1.lon.uk.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx1.lon.uk.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx1.lon.uk.geant.net-bgpv4.output b/test/data/mx1.lon.uk.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..c607a41b44e47fc6a69dc21e65797173cba380d3
--- /dev/null
+++ b/test/data/mx1.lon.uk.geant.net-bgpv4.output
@@ -0,0 +1,79 @@
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.254 description "Peering with LINX Juniper LAN collector"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.226.147 description Apple_Inc
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.226.146 description Apple_Inc
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.226.145 description Apple_Inc
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.226.148 description Apple_Inc
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.183 description SoftLayer_Technologies,_Inc._an_IBM_Company
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.175 description Amazon.com
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.220 description OVH
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.174 description Twitch_Interactive__Justin.tv_
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.25 description Twitch_Interactive__Justin.tv_
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.140 description Microsoft
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.62 description EdgeCast_Networks,_Inc.
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.106 description IP_Transit,_Inc.
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.227 description MegaFon
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.226.81 description Akamai_Technologies
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.168 description Akamai_Technologies
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.122 description Limelight_Networks
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.133 description Limelight_Networks
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.116 description Rackspace
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.49 description Colt_Technology_Services
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.21 description Hurricane_Electric
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.179 description CloudFlare
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.69 description Facebook
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.121 description Facebook
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.152 description Netnod
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.151 description Netnod
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.56 description Leaseweb_Network
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.226.130 description Valve_Corporation
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.46 description RCS__RDS
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.175 description Init7
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.226.121 description NFOrce_Entertainment_BV
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.226.154 description NFOrce_Entertainment_BV
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.107 description Telenor
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.216 description Nerim
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.108 description BT_AS5400
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.17 description Dailymotion
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.17 description TalkTalk
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.136 description TalkTalk
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.91 description MEO_-_SERVICOS_DE_COMUNICACOES_E_MULTIMEDIA_S.A.
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.226.136 description SIA_Lattelecom
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.226.47 description Incapsula
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.68 description Liquid_Telecommunications
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.70 description OpenDNS,_Inc.
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.44 description Bezeq_International
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.126 description Bezeq_International
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.226.172 description "Dropbox AS19679"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.231 description "M247_Ltd AS9009"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.226.171 description "Spotify AS8403"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.144 description "Bytemark_Hosting AS35425"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.227 description "Highwinds_Network_Group,_Inc AS12989"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.173 description "Host_Europe_GmbH AS20773"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.193 description "RETN AS9002"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.63 description "Post_Group_Luxembourg AS6661"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.46 description "VeriSign AS7342"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.142 description "Twitter,_Inc. AS13414"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.226.61 description "Twitter,_Inc. AS13414"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.238 description "Core-Backbone_GmbH AS33891"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.226.127 description "Automattic AS2635"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.16 description "Netflix AS2906"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.251 description "Netflix AS2906"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.238 description "Packet_Clearing_House AS42"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.239 description "Packet_Clearing_House AS3856"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.91 description "Fastly,_Inc. AS54113"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.227.114 description "Fastly,_Inc. AS54113"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.226.116 description "Internap AS29791"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.115 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.129 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.226.79 description "Canadian_Internet_Registration_Authority_-_.CA_Registry AS55195"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.127 description "CDNetworks_Inc. AS36408"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.226.176 description "Choopa,_LLC AS20473"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.226.69 description "Yandex_LLC AS13238"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.226.180 description "Voxility AS3223"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.160 description "RIPE_NCC AS197000"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.241 description "RIPE_NCC AS12654"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.66 description "Claranet AS8426"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.226.82 description "ViewQwest AS18106"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.224.76 description "Zayo_Group AS6461"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.225.79 description "alibaba AS45102"
+set routing-instances IAS protocols bgp group GEANT-IX-LINX neighbor 195.66.227.152 description "alibaba AS45102"
diff --git a/test/data/mx1.lon.uk.geant.net-bgpv6.output b/test/data/mx1.lon.uk.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..83a9e2b634df3c172a3491a6246373b97273e806
--- /dev/null
+++ b/test/data/mx1.lon.uk.geant.net-bgpv6.output
@@ -0,0 +1,74 @@
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4:0::1553:1 description "Peering with LINX Juniper LAN collector"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::2ca:1 description Apple_Inc
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::2ca:3 description Apple_Inc
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::2ca:2 description Apple_Inc
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::2ca:4 description Apple_Inc
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::8dff:1 description SoftLayer_Technologies,_Inc._an_IBM_Company
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::3f94:1 description OVH
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::1f8b:1 description Microsoft
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::3b1d:1 description EdgeCast_Networks,_Inc.
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::b6c2:1 description IP_Transit,_Inc.
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4:0::799d:1 description MegaFon
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::51cc:2 description Akamai_Technologies
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::51cc:1 description Akamai_Technologies
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::5926:3 description Limelight_Networks
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::5926:1 description Limelight_Networks
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::2fa8:1 description Rackspace
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::201c:1 description Colt_Technology_Services
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4:0::1b1b:1 description Hurricane_Electric
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::3417:1 description CloudFlare
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::80a6:1 description Facebook
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::80a6:2 description Facebook
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::21e2:2 description Netnod
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::21e2:1 description Netnod
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::3f89:1 description Leaseweb_Network
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::3f89:2 description Leaseweb_Network
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::7f4e:1 description Valve_Corporation
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::2204:1 description RCS__RDS
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::32e6:1 description Init7
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::a956:1 description NFOrce_Entertainment_BV
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::a956:2 description NFOrce_Entertainment_BV
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::847:1 description Telenor
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::3389:1 description Nerim
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::1518:1 description BT_AS5400
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::33e5:2 description TalkTalk
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::33e5:1 description TalkTalk
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4:0::21d1:1 description MEO_-_SERVICOS_DE_COMUNICACOES_E_MULTIMEDIA_S.A.
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::3122:1 description SIA_Lattelecom
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4:0::4c5f:1 description Incapsula
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::787c:1 description Liquid_Telecommunications
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::8f54:1 description OpenDNS,_Inc.
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::2167:2 description Bezeq_International
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::2167:1 description Bezeq_International
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4:0::4cdf:1 description "Dropbox AS19679"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::2331:1 description "M247_Ltd AS9009"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::20d3:1 description "Spotify AS8403"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::8a61:1 description "Bytemark_Hosting AS35425"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::32bd:1 description "Highwinds_Network_Group,_Inc AS12989"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::5125:1 description "Host_Europe_GmbH AS20773"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::232a:1 description "RETN AS9002"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::1a05:1 description "Post_Group_Luxembourg AS6661"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::1cae:1 description "VeriSign AS7342"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::3466:1 description "Twitter,_Inc. AS13414"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::3466:2 description "Twitter,_Inc. AS13414"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::8463:1 description "Core-Backbone_GmbH AS33891"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::a4b:1 description "Automattic AS2635"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::b5a:4 description "Netflix AS2906"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::b5a:3 description "Netflix AS2906"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::a2da:1 description "Dailymotion AS41690"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::2a:1 description "Packet_Clearing_House AS42"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::f10:1 description "Packet_Clearing_House AS3856"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::d361:1 description "Fastly,_Inc. AS54113"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::d361:2 description "Fastly,_Inc. AS54113"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::745f:1 description "Internap AS29791"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::2846:2 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::2846:1 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::d79b:1 description "Canadian_Internet_Registration_Authority_-_.CA_Registry AS55195"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::4ff9:1 description "Choopa,_LLC AS20473"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::33b6:1 description "Yandex_LLC AS13238"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::c97:1 description "Voxility AS3223"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::3:188:1 description "RIPE_NCC AS197000"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::316e:0 description "RIPE_NCC AS12654"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::20ea:1 description "Claranet AS8426"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::46ba:1 description "ViewQwest AS18106"
+set routing-instances IAS protocols bgp group GEANT-IXv6-LINX neighbor 2001:7f8:4::193d:1 description "Zayo_Group AS6461"
diff --git a/test/data/mx1.lon2.uk.geant.net-None.output b/test/data/mx1.lon2.uk.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx1.lon2.uk.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx1.lon2.uk.geant.net-bgpv4.output b/test/data/mx1.lon2.uk.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx1.lon2.uk.geant.net-bgpv6.output b/test/data/mx1.lon2.uk.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx1.mad.es.geant.net-None.output b/test/data/mx1.mad.es.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx1.mad.es.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx1.mad.es.geant.net-bgpv4.output b/test/data/mx1.mad.es.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..100c58b2ee08824dd89c70ad31dbdfdb85a045d3
--- /dev/null
+++ b/test/data/mx1.mad.es.geant.net-bgpv4.output
@@ -0,0 +1,20 @@
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MAD neighbor 185.1.68.109 description "Limelight_Networks AS22822"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MAD neighbor 185.1.68.64 description "Akamai_Technologies AS20940"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MAD neighbor 185.1.68.95 description "Amazon.com AS16509"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MAD neighbor 185.1.68.22 description "Automattic AS2635"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MAD neighbor 185.1.68.12 description "Cloudflare AS13335"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MAD neighbor 185.1.68.73 description "Fastly,_Inc. AS54113"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MAD neighbor 185.1.68.74 description "Fastly,_Inc. AS54113"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MAD neighbor 185.1.68.47 description "Hurricane_Electric AS6939"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MAD neighbor 185.1.68.49 description "Init7_Switzerland_Ltd AS13030"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MAD neighbor 185.1.68.16 description "Microsoft_Corporation AS8075"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MAD neighbor 185.1.68.26 description "Netflix AS2906"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MAD neighbor 185.1.68.111 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MAD neighbor 185.1.68.117 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MAD neighbor 185.1.68.65 description "OVH AS16276"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MAD neighbor 185.1.68.72 description "Twitter,_Inc. AS13414"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MAD neighbor 185.1.68.85 description "Valve_Corporation AS32590"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MAD neighbor 185.1.68.86 description "Valve_Corporation AS32590"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MAD neighbor 185.1.68.121 description "M247_Ltd AS9009"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MAD neighbor 185.1.68.28 description "Claranet AS8426"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MAD neighbor 185.1.68.133 description "Core-Backbone_GmbH AS33891"
diff --git a/test/data/mx1.mad.es.geant.net-bgpv6.output b/test/data/mx1.mad.es.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..fef7daa180d28ccab6cd711a2a50737f2551c387
--- /dev/null
+++ b/test/data/mx1.mad.es.geant.net-bgpv6.output
@@ -0,0 +1,20 @@
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MAD neighbor 2001:7f8:a0::5926:0:2 description "Limelight_Networks AS22822"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MAD neighbor 2001:7f8:a0::51cc:0:1 description "Akamai_Technologies AS20940"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MAD neighbor 2001:7f8:a0::407d:0:1 description "Amazon.com AS16509"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MAD neighbor 2001:7f8:a0::a4b:0:1 description "Automattic AS2635"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MAD neighbor 2001:7f8:a0::3417:0:1 description "Cloudflare AS13335"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MAD neighbor 2001:7f8:a0::d361:0:1 description "Fastly,_Inc. AS54113"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MAD neighbor 2001:7f8:a0::d361:0:2 description "Fastly,_Inc. AS54113"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MAD neighbor 2001:7f8:a0::1b1b:0:1 description "Hurricane_Electric AS6939"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MAD neighbor 2001:7f8:a0::32e6:0:1 description "Init7_Switzerland_Ltd AS13030"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MAD neighbor 2001:7f8:a0::1f8b:0:1 description "Microsoft_Corporation AS8075"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MAD neighbor 2001:7f8:a0::b5a:0:1 description "Netflix AS2906"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MAD neighbor 2001:7f8:a0::2846:0:1 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MAD neighbor 2001:7f8:a0::2846:0:2 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MAD neighbor 2001:7f8:a0::3f94:0:1 description "OVH AS16276"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MAD neighbor 2001:7f8:a0::3466:0:1 description "Twitter,_Inc. AS13414"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MAD neighbor 2001:7f8:a0::7f4e:0:1 description "Valve_Corporation AS32590"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MAD neighbor 2001:7f8:a0::7f4e:0:2 description "Valve_Corporation AS32590"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MAD neighbor 2001:7f8:a0::2331:0:1 description "M247_Ltd AS9009"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MAD neighbor 2001:7f8:a0::20ea:0:1 description "Claranet AS8426"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MAD neighbor 2001:7f8:a0::8463:0:1 description "Core-Backbone_GmbH AS33891"
diff --git a/test/data/mx1.mar.fr.geant.net-None.output b/test/data/mx1.mar.fr.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx1.mar.fr.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx1.mar.fr.geant.net-bgpv4.output b/test/data/mx1.mar.fr.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..257fba30d7c27ae97e48d73a3d0f441a7f7b5570
--- /dev/null
+++ b/test/data/mx1.mar.fr.geant.net-bgpv4.output
@@ -0,0 +1,6 @@
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MRS neighbor 185.1.47.2 description "Hurricane_Electric AS6939"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MRS neighbor 185.1.47.252 description "DE-CIX_Management_GmbH AS20717"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MRS neighbor 185.1.47.253 description "DE-CIX_Management_GmbH AS20717"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MRS neighbor 185.1.47.38 description "Liquid_Telecommunications AS30844"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MRS neighbor 185.1.47.55 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IX-DE-CIX-MRS neighbor 185.1.47.54 description "Oath,_Inc. AS10310"
diff --git a/test/data/mx1.mar.fr.geant.net-bgpv6.output b/test/data/mx1.mar.fr.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..7787b86c107199761a414efd59d951dc31b685bb
--- /dev/null
+++ b/test/data/mx1.mar.fr.geant.net-bgpv6.output
@@ -0,0 +1,6 @@
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MRS neighbor 2001:7f8:36::1b1b:0:1 description "Hurricane_Electric AS6939"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MRS neighbor 2001:7f8:36::50ed:fc:1 description "DE-CIX_Management_GmbH AS20717"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MRS neighbor 2001:7f8:36::50ed:fd:1 description "DE-CIX_Management_GmbH AS20717"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MRS neighbor 2001:7f8:36::787c:0:1 description "Liquid_Telecommunications AS30844"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MRS neighbor 2001:7f8:36::2846:0:2 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IXv6-DE-CIX-MRS neighbor 2001:7f8:36::2846:0:1 description "Oath,_Inc. AS10310"
diff --git a/test/data/mx1.mil2.it.geant.net-None.output b/test/data/mx1.mil2.it.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx1.mil2.it.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx1.mil2.it.geant.net-bgpv4.output b/test/data/mx1.mil2.it.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..af82b671791b3cb5bd04973e392401079dba045a
--- /dev/null
+++ b/test/data/mx1.mil2.it.geant.net-bgpv4.output
@@ -0,0 +1,32 @@
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.1 description "MIX Milan Internet Exchange"
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.166 description Akamai_Technologies
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.112 description Microsoft
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.61 description Limelight_Networks
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.143 description Limelight_Networks
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.153 description EdgeCast_Networks,_Inc.
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.117 description Amazon.com
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.125 description Hurricane_Electric
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.67 description OVH
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.167 description CloudFlare
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.131 description Facebook
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.156 description Facebook
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.47 description SoftLayer_Technologies,_Inc._an_IBM_Company
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.68 description Colt_Technology_Services
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.48 description VODAFONE
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.67.57 description Netnod
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.57 description Netnod
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.254 description "MIX Milan Internet Exchange Route Server 1"
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.253 description "MIX Milan Internet Exchange Route Server 2"
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.119 description BT
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.116 description "RETN AS9002"
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.212 description Microsoft
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.20 description "VeriSign AS26415"
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.67.10 description "Dropbox AS19679"
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.186 description "Netflix AS2906"
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.187 description "Netflix AS2906"
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.67.20 description "Automattic AS2635"
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.136 description "CDNetworks_Inc. AS36408"
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.66.6 description "RIPE_NCC AS12654"
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.67.28 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.67.29 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IX-MIX-IT neighbor 217.29.67.41 description "OpenDNS,_Inc. AS36692"
diff --git a/test/data/mx1.mil2.it.geant.net-bgpv6.output b/test/data/mx1.mil2.it.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..b3310226df71ec7b04c5d0ceca5456d70eb58e42
--- /dev/null
+++ b/test/data/mx1.mil2.it.geant.net-bgpv6.output
@@ -0,0 +1,30 @@
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d1:6004:1 description "MIX Milan Internet Exchange"
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d2:940:166 description Akamai_Technologies
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d0:8075:112 description Microsoft
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d2:2822:61 description Limelight_Networks
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d2:2822:143 description Limelight_Networks
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d1:5133:153 description EdgeCast_Networks,_Inc.
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d0:6939:125 description Hurricane_Electric
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d1:6276:67 description OVH
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d1:3335:167 description CloudFlare
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d3:2934:131 description Facebook
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d3:2934:156 description Facebook
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d3:6351:47 description SoftLayer_Technologies,_Inc._an_IBM_Company
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d0:8220:68 description Colt_Technology_Services
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d0:3209:48 description VODAFONE
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d0:8674:357 description Netnod
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d0:8674:57 description Netnod
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d1:6004:254 description "MIX Milan Internet Exchange Route Server 1"
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d1:6004:253 description "MIX Milan Internet Exchange Route Server 2"
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d0:5400:119 description BT
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d0:9002:116 description "RETN AS9002"
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d0:8075:212 description Microsoft
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d2:6415:20 description "VeriSign AS26415"
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d1:9679:10 description "Dropbox AS19679"
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d0:2906:186 description "Netflix AS2906"
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d0:2906:187 description "Netflix AS2906"
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d0:2635:20 description "Automattic AS2635"
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d1:2654:6 description "RIPE_NCC AS12654"
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d1:310:28 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d1:310:29 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IXv6-MIX-IT neighbor 2001:7f8:b:100:1d1:a5d3:6692:41 description "OpenDNS,_Inc. AS36692"
diff --git a/test/data/mx1.par.fr.geant.net-None.output b/test/data/mx1.par.fr.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx1.par.fr.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx1.par.fr.geant.net-bgpv4.output b/test/data/mx1.par.fr.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx1.par.fr.geant.net-bgpv6.output b/test/data/mx1.par.fr.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx1.poz.pl.geant.net-None.output b/test/data/mx1.poz.pl.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx1.poz.pl.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx1.poz.pl.geant.net-bgpv4.output b/test/data/mx1.poz.pl.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx1.poz.pl.geant.net-bgpv6.output b/test/data/mx1.poz.pl.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx1.pra.cz.geant.net-None.output b/test/data/mx1.pra.cz.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx1.pra.cz.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx1.pra.cz.geant.net-bgpv4.output b/test/data/mx1.pra.cz.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..f9552fa287e6f8ebf110a3ff0a9d38d477c95008
--- /dev/null
+++ b/test/data/mx1.pra.cz.geant.net-bgpv4.output
@@ -0,0 +1,20 @@
+set routing-instances IAS protocols bgp group GEANT-IX-NIX.CZ neighbor 91.210.16.238 description "Peering with NIX.CZ AS112"
+set routing-instances IAS protocols bgp group GEANT-IX-NIX.CZ neighbor 91.210.16.245 description "Peering with NIX.CZ"
+set routing-instances IAS protocols bgp group GEANT-IX-NIX.CZ neighbor 91.210.16.246 description "Peering with NIX.CZ"
+set routing-instances IAS protocols bgp group GEANT-IX-NIX.CZ neighbor 91.210.16.221 description Akamai
+set routing-instances IAS protocols bgp group GEANT-IX-NIX.CZ neighbor 91.210.16.120 description Amazon
+set routing-instances IAS protocols bgp group GEANT-IX-NIX.CZ neighbor 91.210.16.40 description BT
+set routing-instances IAS protocols bgp group GEANT-IX-NIX.CZ neighbor 91.210.16.171 description Cloudflare
+set routing-instances IAS protocols bgp group GEANT-IX-NIX.CZ neighbor 91.210.16.201 description Hurricane_Electric
+set routing-instances IAS protocols bgp group GEANT-IX-NIX.CZ neighbor 91.210.16.68 description TWITCH
+set routing-instances IAS protocols bgp group GEANT-IX-NIX.CZ neighbor 91.210.16.67 description TWITCH
+set routing-instances IAS protocols bgp group GEANT-IX-NIX.CZ neighbor 91.210.16.115 description MICROSOFT
+set routing-instances IAS protocols bgp group GEANT-IX-NIX.CZ neighbor 91.210.16.155 description OPENDNS
+set routing-instances IAS protocols bgp group GEANT-IX-NIX.CZ neighbor 91.210.16.227 description NEOTELEKOMS
+set routing-instances IAS protocols bgp group GEANT-IX-NIX.CZ neighbor 91.210.16.181 description ISC_F-ROOT
+set routing-instances IAS protocols bgp group GEANT-IX-NIX.CZ neighbor 91.210.16.182 description ISC_F-ROOT
+set routing-instances IAS protocols bgp group GEANT-IX-NIX.CZ neighbor 91.210.16.63 description "VeriSign AS26415"
+set routing-instances IAS protocols bgp group GEANT-IX-NIX.CZ neighbor 91.210.16.147 description "Core-Backbone_GmbH AS33891"
+set routing-instances IAS protocols bgp group GEANT-IX-NIX.CZ neighbor 91.210.16.113 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IX-NIX.CZ neighbor 91.210.16.114 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IX-NIX.CZ neighbor 91.210.16.223 description "G-Core_Labs_S.A. AS199524"
diff --git a/test/data/mx1.pra.cz.geant.net-bgpv6.output b/test/data/mx1.pra.cz.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..bd27accc0aa73e224d014cff5837d93f9e9f4f99
--- /dev/null
+++ b/test/data/mx1.pra.cz.geant.net-bgpv6.output
@@ -0,0 +1,20 @@
+set routing-instances IAS protocols bgp group GEANT-IXv6-NIX.CZ neighbor 2001:7f8:14::238 description "Peering with NIX.CZ AS112"
+set routing-instances IAS protocols bgp group GEANT-IXv6-NIX.CZ neighbor 2001:7f8:14::2 description "Peering with NIX.CZ"
+set routing-instances IAS protocols bgp group GEANT-IXv6-NIX.CZ neighbor 2001:7f8:14::4 description "Peering with NIX.CZ"
+set routing-instances IAS protocols bgp group GEANT-IXv6-NIX.CZ neighbor 2001:7f8:14::2f:1 description Akamai
+set routing-instances IAS protocols bgp group GEANT-IXv6-NIX.CZ neighbor 2001:7f8:14::67:1 description Amazon
+set routing-instances IAS protocols bgp group GEANT-IXv6-NIX.CZ neighbor 2001:7f8:14::4b:1 description BT
+set routing-instances IAS protocols bgp group GEANT-IXv6-NIX.CZ neighbor 2001:7f8:14::81:1 description Cloudflare
+set routing-instances IAS protocols bgp group GEANT-IXv6-NIX.CZ neighbor 2001:7f8:14::6e:1 description Hurricane_Electric
+set routing-instances IAS protocols bgp group GEANT-IXv6-NIX.CZ neighbor 2001:7f8:14::6b:1 description MICROSOFT
+set routing-instances IAS protocols bgp group GEANT-IXv6-NIX.CZ neighbor 2001:7f8:14::17:1 description OPENDNS
+set routing-instances IAS protocols bgp group GEANT-IXv6-NIX.CZ neighbor 2001:7f8:14::6f:1 description NEOTELEKOMS
+set routing-instances IAS protocols bgp group GEANT-IXv6-NIX.CZ neighbor 2001:7f8:14::f:1 description ISC_F-ROOT
+set routing-instances IAS protocols bgp group GEANT-IXv6-NIX.CZ neighbor 2001:7f8:14::f:2 description ISC_F-ROOT
+set routing-instances IAS protocols bgp group GEANT-IXv6-NIX.CZ neighbor 2001:7f8:14::65:1 description "VeriSign AS26415"
+set routing-instances IAS protocols bgp group GEANT-IXv6-NIX.CZ neighbor 2001:7f8:14::7e:1 description TWITCH
+set routing-instances IAS protocols bgp group GEANT-IXv6-NIX.CZ neighbor 2001:7f8:14::7e:2 description TWITCH
+set routing-instances IAS protocols bgp group GEANT-IXv6-NIX.CZ neighbor 2001:7f8:14::60:1 description "Core-Backbone_GmbH AS33891"
+set routing-instances IAS protocols bgp group GEANT-IXv6-NIX.CZ neighbor 2001:7f8:14::6a:1 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IXv6-NIX.CZ neighbor 2001:7f8:14::6a:2 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IXv6-NIX.CZ neighbor 2001:7f8:14::97:1 description "G-Core_Labs_S.A. AS199524"
diff --git a/test/data/mx1.sof.bg.geant.net-None.output b/test/data/mx1.sof.bg.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx1.sof.bg.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx1.sof.bg.geant.net-bgpv4.output b/test/data/mx1.sof.bg.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx1.sof.bg.geant.net-bgpv6.output b/test/data/mx1.sof.bg.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx1.tal.ee.geant.net-None.output b/test/data/mx1.tal.ee.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx1.tal.ee.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx1.tal.ee.geant.net-bgpv4.output b/test/data/mx1.tal.ee.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx1.tal.ee.geant.net-bgpv6.output b/test/data/mx1.tal.ee.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx1.vie.at.geant.net-None.output b/test/data/mx1.vie.at.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx1.vie.at.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx1.vie.at.geant.net-bgpv4.output b/test/data/mx1.vie.at.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..2f607f06b9eb026077da924803888d6bd2299b09
--- /dev/null
+++ b/test/data/mx1.vie.at.geant.net-bgpv4.output
@@ -0,0 +1,33 @@
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.165 description Microsoft
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.151 description OVH
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.168 description Akamai
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.179 description "Limelight "
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.185 description "Hurricane Electric"
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.26 description "T-Systems for Helix Nebula"
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.55 description COLT
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.102 description VODAFONE
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.45 description NeoTelecoms
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.99 description Init7
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.195 description CloudFlare
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.198 description Hetzner_Online_AG
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.156 description DENIC_eG,_AS31529
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.118 description Netnod
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.201 description Valve_Corporation
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.252 description "-- Peering with VIX --"
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.251 description "-- Peering with VIX RS1--"
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.167 description Akamai
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.219 description "M247_Ltd AS9009"
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.150 description "RETN AS9002"
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.222 description Voxility
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.230 description "Twitch AS46489"
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.34 description "Twitch AS46489"
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.154 description "Core-Backbone_GmbH AS33891"
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.221 description "Automattic AS2635"
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.9 description "Netflix AS2906"
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.203 description "Netflix AS2906"
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.33 description "Packet_Clearing_House AS42"
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.126 description "Packet_Clearing_House AS3856"
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.42 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.242 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.216 description "Neotel AS34772"
+set routing-instances IAS protocols bgp group GEANT-IX-VIX neighbor 193.203.0.123 description "RIPE_NCC AS12654"
diff --git a/test/data/mx1.vie.at.geant.net-bgpv6.output b/test/data/mx1.vie.at.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..ae92f2afcc0b92e4444c8bee186612620fce802b
--- /dev/null
+++ b/test/data/mx1.vie.at.geant.net-bgpv6.output
@@ -0,0 +1,31 @@
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:2:1:1:6276 description OVH
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:2:1:2:940 description AKAMAI
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:2:1:0:6939 description "Hurricane Electric"
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:1:1:0:8220 description COLT
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:2:1:0:3209 description VODAFONE
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:2:1:0:8218 description NeoTelecoms
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:2:1:1:3030 description Init7
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30::2:1:1:3335 description CloudFlare
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:2:1:2:4940 description Hetzner_Online_AG
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:1:1:3:1529 description DENIC_eG,_AS31529
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:1:1:0:8674 description Netnod
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:2:1:3:2590 description Valve_Corporation
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:1:1:0:1121 description "--Peering IPV6 with VIX --"
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:2:1:0:1121 description "--Peering IPV6 with VIX --"
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:2:2:2:940 description AKAMAI
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:2:1:0:9009 description "M247_Ltd AS9009"
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:2:1:0:8075 description Microsoft
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:2:1:2:2822 description Limelight
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:2:1:0:9002 description "RETN AS9002"
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:2:1:4:6489 description "Twitch AS46489"
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:2:2:4:6489 description Twitch_AS46489
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:2:1:3:3891 description "Core-Backbone_GmbH AS33891"
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:2:1:0:2635 description "Automattic AS2635"
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:1:1:0:2906 description "Netflix AS2906"
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:2:1:0:2906 description "Netflix AS2906"
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:1:1:0:42 description "Packet_Clearing_House AS42"
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:1:1:0:3856 description "Packet_Clearing_House AS3856"
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:2:1:1:310 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:2:2:1:310 description "Oath,_Inc. AS10310"
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:2:1:3:4772 description "Neotel AS34772"
+set routing-instances IAS protocols bgp group GEANT-IXv6-VIX neighbor 2001:7f8:30:0:1:1:1:2654 description "RIPE_NCC AS12654"
diff --git a/test/data/mx2.ath.gr.geant.net-None.output b/test/data/mx2.ath.gr.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx2.ath.gr.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx2.ath.gr.geant.net-bgpv4.output b/test/data/mx2.ath.gr.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx2.ath.gr.geant.net-bgpv6.output b/test/data/mx2.ath.gr.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx2.bra.sk.geant.net-None.output b/test/data/mx2.bra.sk.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx2.bra.sk.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx2.bra.sk.geant.net-bgpv4.output b/test/data/mx2.bra.sk.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx2.bra.sk.geant.net-bgpv6.output b/test/data/mx2.bra.sk.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx2.bru.be.geant.net-None.output b/test/data/mx2.bru.be.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx2.bru.be.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx2.bru.be.geant.net-bgpv4.output b/test/data/mx2.bru.be.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx2.bru.be.geant.net-bgpv6.output b/test/data/mx2.bru.be.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx2.kau.lt.geant.net-None.output b/test/data/mx2.kau.lt.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx2.kau.lt.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx2.kau.lt.geant.net-bgpv4.output b/test/data/mx2.kau.lt.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx2.kau.lt.geant.net-bgpv6.output b/test/data/mx2.kau.lt.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx2.lis.pt.geant.net-None.output b/test/data/mx2.lis.pt.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx2.lis.pt.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx2.lis.pt.geant.net-bgpv4.output b/test/data/mx2.lis.pt.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx2.lis.pt.geant.net-bgpv6.output b/test/data/mx2.lis.pt.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx2.lju.si.geant.net-None.output b/test/data/mx2.lju.si.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx2.lju.si.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx2.lju.si.geant.net-bgpv4.output b/test/data/mx2.lju.si.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx2.lju.si.geant.net-bgpv6.output b/test/data/mx2.lju.si.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx2.rig.lv.geant.net-None.output b/test/data/mx2.rig.lv.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx2.rig.lv.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx2.rig.lv.geant.net-bgpv4.output b/test/data/mx2.rig.lv.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx2.rig.lv.geant.net-bgpv6.output b/test/data/mx2.rig.lv.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx2.tal.ee.geant.net-None.output b/test/data/mx2.tal.ee.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx2.tal.ee.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx2.tal.ee.geant.net-bgpv4.output b/test/data/mx2.tal.ee.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx2.tal.ee.geant.net-bgpv6.output b/test/data/mx2.tal.ee.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx2.zag.hr.geant.net-None.output b/test/data/mx2.zag.hr.geant.net-None.output
deleted file mode 100644
index ee7870241206d7038f11fada612a42e683a767ac..0000000000000000000000000000000000000000
--- a/test/data/mx2.zag.hr.geant.net-None.output
+++ /dev/null
@@ -1 +0,0 @@
-Screen length set to 0
diff --git a/test/data/mx2.zag.hr.geant.net-bgpv4.output b/test/data/mx2.zag.hr.geant.net-bgpv4.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/mx2.zag.hr.geant.net-bgpv6.output b/test/data/mx2.zag.hr.geant.net-bgpv6.output
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/test/data/update_test_data.py b/test/data/update_test_data.py
new file mode 100644
index 0000000000000000000000000000000000000000..f599ae3b0a43af9f813f509207d8ea235f08f181
--- /dev/null
+++ b/test/data/update_test_data.py
@@ -0,0 +1,107 @@
+import logging
+import os
+import multiprocessing
+
+from inventory_provider import juniper
+
+OUTPUT_DIR = os.path.dirname(__file__)
+SSH_DIR = os.path.join(
+    os.path.dirname(__file__),
+    "..",
+    "..",
+    "inventory_provider",
+    "ssh")
+
+SSH_PARAMS = {
+    "private-key": os.path.join(SSH_DIR, "monitor_dsa"),
+    "known-hosts": os.path.join(SSH_DIR, "monitor_known_hosts")
+}
+
+SHELL_COMMANDS = []
+for c in juniper.shell_commands():
+    SHELL_COMMANDS.append({"key": c["key"], "command": c["command"]})
+
+SHELL_COMMANDS.append({
+    "key": "bgpv4",
+    "command": r'show configuration routing-instances IAS protocols bgp | display set | match neighbor | match description | match "GEANT-IX | GEANT-IX-"'
+})
+
+SHELL_COMMANDS.append({
+    "key": "bgpv6",
+    "command": r'show configuration routing-instances IAS protocols bgp | display set | match neighbor | match description | match "GEANT-IXv6 | GEANT-IXv6-"'
+})
+
+
+ROUTER_HOSTNAMES = [
+    'mx2.ath.gr.geant.net',
+    'mx1.tal.ee.geant.net',
+    'mx2.tal.ee.geant.net',
+    'mx2.rig.lv.geant.net',
+    'mx1.kau.lt.geant.net',
+    'mx2.kau.lt.geant.net',
+    'mx2.zag.hr.geant.net',
+    'mx2.lju.si.geant.net',
+    'mx1.bud.hu.geant.net',
+    'mx1.pra.cz.geant.net',
+    'mx2.bra.sk.geant.net',
+    'mx1.lon.uk.geant.net',
+    'mx1.vie.at.geant.net',
+    'mx2.bru.be.geant.net',
+    'mx1.poz.pl.geant.net',
+    'mx1.ams.nl.geant.net',
+    'mx1.fra.de.geant.net',
+    'mx1.par.fr.geant.net',
+    'mx1.gen.ch.geant.net',
+    'mx1.mil2.it.geant.net',
+    'mx1.lis.pt.geant.net',
+    'mx2.lis.pt.geant.net',
+    'mx1.mad.es.geant.net',
+    'mx1.sof.bg.geant.net',
+    'mx1.buc.ro.geant.net',
+    'mx1.ham.de.geant.net',
+    'mx1.dub.ie.geant.net',
+    'mx1.dub2.ie.geant.net',
+    'mx1.mar.fr.geant.net',
+    'mx1.lon2.uk.geant.net',
+    'mx1.ath2.gr.geant.net',
+]
+
+
+def ssh_exec_commands(hostname, ssh_params, commands, q):
+    logging.debug("[ENTER>>] ssh_exec_comands: %r" % hostname)
+    q.put(list(juniper.ssh_exec_commands(hostname, ssh_params, commands)))
+    logging.debug("[EXIT>>] ssh_exec_comands: %r" % hostname)
+
+
+def main():
+        processes = []
+        for hostname in ROUTER_HOSTNAMES:
+            q = multiprocessing.Queue()
+            p = multiprocessing.Process(
+                target=ssh_exec_commands,
+                args=(
+                    hostname,
+                    SSH_PARAMS,
+                    [c["command"] for c in SHELL_COMMANDS],
+                    q))
+            p.start()
+            processes.append({"hostname": hostname, "process": p, "queue": q})
+
+        for p in processes:
+            logging.debug("waiting for shell results from %r" % p["hostname"])
+            for c, o in zip(SHELL_COMMANDS, p["queue"].get()):
+                if not c["key"]:
+                    continue
+                filename = os.path.join(
+                    OUTPUT_DIR,
+                    "%s-%s.output" % (p["hostname"], c["key"]))
+                with open(filename, "w") as f:
+                    f.write(o)
+
+            p["process"].join()
+            logging.debug("saved shell results from %r" % p["hostname"])
+
+
+if __name__ == "__main__":
+    logging.basicConfig(level=logging.DEBUG)
+    main()
\ No newline at end of file