diff --git a/test/data/mx1.ams.nl.geant.net-0.output b/test/data/mx1.ams.nl.geant.net-None.output
similarity index 100%
rename from test/data/mx1.ams.nl.geant.net-0.output
rename to test/data/mx1.ams.nl.geant.net-None.output
diff --git a/test/data/mx1.ams.nl.geant.net-1.output b/test/data/mx1.ams.nl.geant.net-bgp.output
similarity index 100%
rename from test/data/mx1.ams.nl.geant.net-1.output
rename to test/data/mx1.ams.nl.geant.net-bgp.output
diff --git a/test/data/mx1.ams.nl.geant.net-3.output b/test/data/mx1.ams.nl.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx1.ams.nl.geant.net-3.output
rename to test/data/mx1.ams.nl.geant.net-interfaces.output
diff --git a/test/data/mx1.ams.nl.geant.net-2.output b/test/data/mx1.ams.nl.geant.net-vrr.output
similarity index 100%
rename from test/data/mx1.ams.nl.geant.net-2.output
rename to test/data/mx1.ams.nl.geant.net-vrr.output
diff --git a/test/data/mx1.ath2.gr.geant.net-0.output b/test/data/mx1.ath2.gr.geant.net-None.output
similarity index 100%
rename from test/data/mx1.ath2.gr.geant.net-0.output
rename to test/data/mx1.ath2.gr.geant.net-None.output
diff --git a/test/data/mx1.ath2.gr.geant.net-1.output b/test/data/mx1.ath2.gr.geant.net-bgp.output
similarity index 100%
rename from test/data/mx1.ath2.gr.geant.net-1.output
rename to test/data/mx1.ath2.gr.geant.net-bgp.output
diff --git a/test/data/mx1.ath2.gr.geant.net-3.output b/test/data/mx1.ath2.gr.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx1.ath2.gr.geant.net-3.output
rename to test/data/mx1.ath2.gr.geant.net-interfaces.output
diff --git a/test/data/mx1.ath2.gr.geant.net-2.output b/test/data/mx1.ath2.gr.geant.net-vrr.output
similarity index 100%
rename from test/data/mx1.ath2.gr.geant.net-2.output
rename to test/data/mx1.ath2.gr.geant.net-vrr.output
diff --git a/test/data/mx1.buc.ro.geant.net-0.output b/test/data/mx1.buc.ro.geant.net-None.output
similarity index 100%
rename from test/data/mx1.buc.ro.geant.net-0.output
rename to test/data/mx1.buc.ro.geant.net-None.output
diff --git a/test/data/mx1.buc.ro.geant.net-1.output b/test/data/mx1.buc.ro.geant.net-bgp.output
similarity index 100%
rename from test/data/mx1.buc.ro.geant.net-1.output
rename to test/data/mx1.buc.ro.geant.net-bgp.output
diff --git a/test/data/mx1.buc.ro.geant.net-3.output b/test/data/mx1.buc.ro.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx1.buc.ro.geant.net-3.output
rename to test/data/mx1.buc.ro.geant.net-interfaces.output
diff --git a/test/data/mx1.buc.ro.geant.net-2.output b/test/data/mx1.buc.ro.geant.net-vrr.output
similarity index 100%
rename from test/data/mx1.buc.ro.geant.net-2.output
rename to test/data/mx1.buc.ro.geant.net-vrr.output
diff --git a/test/data/mx1.bud.hu.geant.net-0.output b/test/data/mx1.bud.hu.geant.net-None.output
similarity index 100%
rename from test/data/mx1.bud.hu.geant.net-0.output
rename to test/data/mx1.bud.hu.geant.net-None.output
diff --git a/test/data/mx1.bud.hu.geant.net-1.output b/test/data/mx1.bud.hu.geant.net-bgp.output
similarity index 100%
rename from test/data/mx1.bud.hu.geant.net-1.output
rename to test/data/mx1.bud.hu.geant.net-bgp.output
diff --git a/test/data/mx1.bud.hu.geant.net-3.output b/test/data/mx1.bud.hu.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx1.bud.hu.geant.net-3.output
rename to test/data/mx1.bud.hu.geant.net-interfaces.output
diff --git a/test/data/mx1.bud.hu.geant.net-2.output b/test/data/mx1.bud.hu.geant.net-vrr.output
similarity index 100%
rename from test/data/mx1.bud.hu.geant.net-2.output
rename to test/data/mx1.bud.hu.geant.net-vrr.output
diff --git a/test/data/mx1.dub.ie.geant.net-0.output b/test/data/mx1.dub.ie.geant.net-None.output
similarity index 100%
rename from test/data/mx1.dub.ie.geant.net-0.output
rename to test/data/mx1.dub.ie.geant.net-None.output
diff --git a/test/data/mx1.dub.ie.geant.net-1.output b/test/data/mx1.dub.ie.geant.net-bgp.output
similarity index 100%
rename from test/data/mx1.dub.ie.geant.net-1.output
rename to test/data/mx1.dub.ie.geant.net-bgp.output
diff --git a/test/data/mx1.dub.ie.geant.net-3.output b/test/data/mx1.dub.ie.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx1.dub.ie.geant.net-3.output
rename to test/data/mx1.dub.ie.geant.net-interfaces.output
diff --git a/test/data/mx1.dub.ie.geant.net-2.output b/test/data/mx1.dub.ie.geant.net-vrr.output
similarity index 100%
rename from test/data/mx1.dub.ie.geant.net-2.output
rename to test/data/mx1.dub.ie.geant.net-vrr.output
diff --git a/test/data/mx1.dub2.ie.geant.net-0.output b/test/data/mx1.dub2.ie.geant.net-None.output
similarity index 100%
rename from test/data/mx1.dub2.ie.geant.net-0.output
rename to test/data/mx1.dub2.ie.geant.net-None.output
diff --git a/test/data/mx1.dub2.ie.geant.net-1.output b/test/data/mx1.dub2.ie.geant.net-bgp.output
similarity index 100%
rename from test/data/mx1.dub2.ie.geant.net-1.output
rename to test/data/mx1.dub2.ie.geant.net-bgp.output
diff --git a/test/data/mx1.dub2.ie.geant.net-3.output b/test/data/mx1.dub2.ie.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx1.dub2.ie.geant.net-3.output
rename to test/data/mx1.dub2.ie.geant.net-interfaces.output
diff --git a/test/data/mx1.dub2.ie.geant.net-2.output b/test/data/mx1.dub2.ie.geant.net-vrr.output
similarity index 100%
rename from test/data/mx1.dub2.ie.geant.net-2.output
rename to test/data/mx1.dub2.ie.geant.net-vrr.output
diff --git a/test/data/mx1.fra.de.geant.net-0.output b/test/data/mx1.fra.de.geant.net-None.output
similarity index 100%
rename from test/data/mx1.fra.de.geant.net-0.output
rename to test/data/mx1.fra.de.geant.net-None.output
diff --git a/test/data/mx1.fra.de.geant.net-1.output b/test/data/mx1.fra.de.geant.net-bgp.output
similarity index 100%
rename from test/data/mx1.fra.de.geant.net-1.output
rename to test/data/mx1.fra.de.geant.net-bgp.output
diff --git a/test/data/mx1.fra.de.geant.net-3.output b/test/data/mx1.fra.de.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx1.fra.de.geant.net-3.output
rename to test/data/mx1.fra.de.geant.net-interfaces.output
diff --git a/test/data/mx1.fra.de.geant.net-2.output b/test/data/mx1.fra.de.geant.net-vrr.output
similarity index 100%
rename from test/data/mx1.fra.de.geant.net-2.output
rename to test/data/mx1.fra.de.geant.net-vrr.output
diff --git a/test/data/mx1.gen.ch.geant.net-0.output b/test/data/mx1.gen.ch.geant.net-None.output
similarity index 100%
rename from test/data/mx1.gen.ch.geant.net-0.output
rename to test/data/mx1.gen.ch.geant.net-None.output
diff --git a/test/data/mx1.gen.ch.geant.net-1.output b/test/data/mx1.gen.ch.geant.net-bgp.output
similarity index 100%
rename from test/data/mx1.gen.ch.geant.net-1.output
rename to test/data/mx1.gen.ch.geant.net-bgp.output
diff --git a/test/data/mx1.gen.ch.geant.net-3.output b/test/data/mx1.gen.ch.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx1.gen.ch.geant.net-3.output
rename to test/data/mx1.gen.ch.geant.net-interfaces.output
diff --git a/test/data/mx1.gen.ch.geant.net-2.output b/test/data/mx1.gen.ch.geant.net-vrr.output
similarity index 100%
rename from test/data/mx1.gen.ch.geant.net-2.output
rename to test/data/mx1.gen.ch.geant.net-vrr.output
diff --git a/test/data/mx1.ham.de.geant.net-0.output b/test/data/mx1.ham.de.geant.net-None.output
similarity index 100%
rename from test/data/mx1.ham.de.geant.net-0.output
rename to test/data/mx1.ham.de.geant.net-None.output
diff --git a/test/data/mx1.ham.de.geant.net-1.output b/test/data/mx1.ham.de.geant.net-bgp.output
similarity index 100%
rename from test/data/mx1.ham.de.geant.net-1.output
rename to test/data/mx1.ham.de.geant.net-bgp.output
diff --git a/test/data/mx1.ham.de.geant.net-3.output b/test/data/mx1.ham.de.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx1.ham.de.geant.net-3.output
rename to test/data/mx1.ham.de.geant.net-interfaces.output
diff --git a/test/data/mx1.ham.de.geant.net-2.output b/test/data/mx1.ham.de.geant.net-vrr.output
similarity index 100%
rename from test/data/mx1.ham.de.geant.net-2.output
rename to test/data/mx1.ham.de.geant.net-vrr.output
diff --git a/test/data/mx1.kau.lt.geant.net-0.output b/test/data/mx1.kau.lt.geant.net-None.output
similarity index 100%
rename from test/data/mx1.kau.lt.geant.net-0.output
rename to test/data/mx1.kau.lt.geant.net-None.output
diff --git a/test/data/mx1.kau.lt.geant.net-1.output b/test/data/mx1.kau.lt.geant.net-bgp.output
similarity index 100%
rename from test/data/mx1.kau.lt.geant.net-1.output
rename to test/data/mx1.kau.lt.geant.net-bgp.output
diff --git a/test/data/mx1.kau.lt.geant.net-3.output b/test/data/mx1.kau.lt.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx1.kau.lt.geant.net-3.output
rename to test/data/mx1.kau.lt.geant.net-interfaces.output
diff --git a/test/data/mx1.kau.lt.geant.net-2.output b/test/data/mx1.kau.lt.geant.net-vrr.output
similarity index 100%
rename from test/data/mx1.kau.lt.geant.net-2.output
rename to test/data/mx1.kau.lt.geant.net-vrr.output
diff --git a/test/data/mx1.lis.pt.geant.net-0.output b/test/data/mx1.lis.pt.geant.net-None.output
similarity index 100%
rename from test/data/mx1.lis.pt.geant.net-0.output
rename to test/data/mx1.lis.pt.geant.net-None.output
diff --git a/test/data/mx1.lis.pt.geant.net-1.output b/test/data/mx1.lis.pt.geant.net-bgp.output
similarity index 100%
rename from test/data/mx1.lis.pt.geant.net-1.output
rename to test/data/mx1.lis.pt.geant.net-bgp.output
diff --git a/test/data/mx1.lis.pt.geant.net-3.output b/test/data/mx1.lis.pt.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx1.lis.pt.geant.net-3.output
rename to test/data/mx1.lis.pt.geant.net-interfaces.output
diff --git a/test/data/mx1.lis.pt.geant.net-2.output b/test/data/mx1.lis.pt.geant.net-vrr.output
similarity index 100%
rename from test/data/mx1.lis.pt.geant.net-2.output
rename to test/data/mx1.lis.pt.geant.net-vrr.output
diff --git a/test/data/mx1.lon.uk.geant.net-0.output b/test/data/mx1.lon.uk.geant.net-None.output
similarity index 100%
rename from test/data/mx1.lon.uk.geant.net-0.output
rename to test/data/mx1.lon.uk.geant.net-None.output
diff --git a/test/data/mx1.lon.uk.geant.net-1.output b/test/data/mx1.lon.uk.geant.net-bgp.output
similarity index 100%
rename from test/data/mx1.lon.uk.geant.net-1.output
rename to test/data/mx1.lon.uk.geant.net-bgp.output
diff --git a/test/data/mx1.lon.uk.geant.net-3.output b/test/data/mx1.lon.uk.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx1.lon.uk.geant.net-3.output
rename to test/data/mx1.lon.uk.geant.net-interfaces.output
diff --git a/test/data/mx1.lon.uk.geant.net-2.output b/test/data/mx1.lon.uk.geant.net-vrr.output
similarity index 100%
rename from test/data/mx1.lon.uk.geant.net-2.output
rename to test/data/mx1.lon.uk.geant.net-vrr.output
diff --git a/test/data/mx1.lon2.uk.geant.net-0.output b/test/data/mx1.lon2.uk.geant.net-None.output
similarity index 100%
rename from test/data/mx1.lon2.uk.geant.net-0.output
rename to test/data/mx1.lon2.uk.geant.net-None.output
diff --git a/test/data/mx1.lon2.uk.geant.net-1.output b/test/data/mx1.lon2.uk.geant.net-bgp.output
similarity index 100%
rename from test/data/mx1.lon2.uk.geant.net-1.output
rename to test/data/mx1.lon2.uk.geant.net-bgp.output
diff --git a/test/data/mx1.lon2.uk.geant.net-3.output b/test/data/mx1.lon2.uk.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx1.lon2.uk.geant.net-3.output
rename to test/data/mx1.lon2.uk.geant.net-interfaces.output
diff --git a/test/data/mx1.lon2.uk.geant.net-2.output b/test/data/mx1.lon2.uk.geant.net-vrr.output
similarity index 100%
rename from test/data/mx1.lon2.uk.geant.net-2.output
rename to test/data/mx1.lon2.uk.geant.net-vrr.output
diff --git a/test/data/mx1.mad.es.geant.net-0.output b/test/data/mx1.mad.es.geant.net-None.output
similarity index 100%
rename from test/data/mx1.mad.es.geant.net-0.output
rename to test/data/mx1.mad.es.geant.net-None.output
diff --git a/test/data/mx1.mad.es.geant.net-1.output b/test/data/mx1.mad.es.geant.net-bgp.output
similarity index 100%
rename from test/data/mx1.mad.es.geant.net-1.output
rename to test/data/mx1.mad.es.geant.net-bgp.output
diff --git a/test/data/mx1.mad.es.geant.net-3.output b/test/data/mx1.mad.es.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx1.mad.es.geant.net-3.output
rename to test/data/mx1.mad.es.geant.net-interfaces.output
diff --git a/test/data/mx1.mad.es.geant.net-2.output b/test/data/mx1.mad.es.geant.net-vrr.output
similarity index 100%
rename from test/data/mx1.mad.es.geant.net-2.output
rename to test/data/mx1.mad.es.geant.net-vrr.output
diff --git a/test/data/mx1.mar.fr.geant.net-0.output b/test/data/mx1.mar.fr.geant.net-None.output
similarity index 100%
rename from test/data/mx1.mar.fr.geant.net-0.output
rename to test/data/mx1.mar.fr.geant.net-None.output
diff --git a/test/data/mx1.mar.fr.geant.net-1.output b/test/data/mx1.mar.fr.geant.net-bgp.output
similarity index 100%
rename from test/data/mx1.mar.fr.geant.net-1.output
rename to test/data/mx1.mar.fr.geant.net-bgp.output
diff --git a/test/data/mx1.mar.fr.geant.net-3.output b/test/data/mx1.mar.fr.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx1.mar.fr.geant.net-3.output
rename to test/data/mx1.mar.fr.geant.net-interfaces.output
diff --git a/test/data/mx1.mar.fr.geant.net-2.output b/test/data/mx1.mar.fr.geant.net-vrr.output
similarity index 100%
rename from test/data/mx1.mar.fr.geant.net-2.output
rename to test/data/mx1.mar.fr.geant.net-vrr.output
diff --git a/test/data/mx1.mil2.it.geant.net-0.output b/test/data/mx1.mil2.it.geant.net-None.output
similarity index 100%
rename from test/data/mx1.mil2.it.geant.net-0.output
rename to test/data/mx1.mil2.it.geant.net-None.output
diff --git a/test/data/mx1.mil2.it.geant.net-1.output b/test/data/mx1.mil2.it.geant.net-bgp.output
similarity index 100%
rename from test/data/mx1.mil2.it.geant.net-1.output
rename to test/data/mx1.mil2.it.geant.net-bgp.output
diff --git a/test/data/mx1.mil2.it.geant.net-3.output b/test/data/mx1.mil2.it.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx1.mil2.it.geant.net-3.output
rename to test/data/mx1.mil2.it.geant.net-interfaces.output
diff --git a/test/data/mx1.mil2.it.geant.net-2.output b/test/data/mx1.mil2.it.geant.net-vrr.output
similarity index 100%
rename from test/data/mx1.mil2.it.geant.net-2.output
rename to test/data/mx1.mil2.it.geant.net-vrr.output
diff --git a/test/data/mx1.par.fr.geant.net-0.output b/test/data/mx1.par.fr.geant.net-None.output
similarity index 100%
rename from test/data/mx1.par.fr.geant.net-0.output
rename to test/data/mx1.par.fr.geant.net-None.output
diff --git a/test/data/mx1.par.fr.geant.net-1.output b/test/data/mx1.par.fr.geant.net-bgp.output
similarity index 100%
rename from test/data/mx1.par.fr.geant.net-1.output
rename to test/data/mx1.par.fr.geant.net-bgp.output
diff --git a/test/data/mx1.par.fr.geant.net-3.output b/test/data/mx1.par.fr.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx1.par.fr.geant.net-3.output
rename to test/data/mx1.par.fr.geant.net-interfaces.output
diff --git a/test/data/mx1.par.fr.geant.net-2.output b/test/data/mx1.par.fr.geant.net-vrr.output
similarity index 100%
rename from test/data/mx1.par.fr.geant.net-2.output
rename to test/data/mx1.par.fr.geant.net-vrr.output
diff --git a/test/data/mx1.poz.pl.geant.net-0.output b/test/data/mx1.poz.pl.geant.net-None.output
similarity index 100%
rename from test/data/mx1.poz.pl.geant.net-0.output
rename to test/data/mx1.poz.pl.geant.net-None.output
diff --git a/test/data/mx1.poz.pl.geant.net-1.output b/test/data/mx1.poz.pl.geant.net-bgp.output
similarity index 100%
rename from test/data/mx1.poz.pl.geant.net-1.output
rename to test/data/mx1.poz.pl.geant.net-bgp.output
diff --git a/test/data/mx1.poz.pl.geant.net-3.output b/test/data/mx1.poz.pl.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx1.poz.pl.geant.net-3.output
rename to test/data/mx1.poz.pl.geant.net-interfaces.output
diff --git a/test/data/mx1.poz.pl.geant.net-2.output b/test/data/mx1.poz.pl.geant.net-vrr.output
similarity index 100%
rename from test/data/mx1.poz.pl.geant.net-2.output
rename to test/data/mx1.poz.pl.geant.net-vrr.output
diff --git a/test/data/mx1.pra.cz.geant.net-0.output b/test/data/mx1.pra.cz.geant.net-None.output
similarity index 100%
rename from test/data/mx1.pra.cz.geant.net-0.output
rename to test/data/mx1.pra.cz.geant.net-None.output
diff --git a/test/data/mx1.pra.cz.geant.net-1.output b/test/data/mx1.pra.cz.geant.net-bgp.output
similarity index 100%
rename from test/data/mx1.pra.cz.geant.net-1.output
rename to test/data/mx1.pra.cz.geant.net-bgp.output
diff --git a/test/data/mx1.pra.cz.geant.net-3.output b/test/data/mx1.pra.cz.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx1.pra.cz.geant.net-3.output
rename to test/data/mx1.pra.cz.geant.net-interfaces.output
diff --git a/test/data/mx1.pra.cz.geant.net-2.output b/test/data/mx1.pra.cz.geant.net-vrr.output
similarity index 100%
rename from test/data/mx1.pra.cz.geant.net-2.output
rename to test/data/mx1.pra.cz.geant.net-vrr.output
diff --git a/test/data/mx1.sof.bg.geant.net-0.output b/test/data/mx1.sof.bg.geant.net-None.output
similarity index 100%
rename from test/data/mx1.sof.bg.geant.net-0.output
rename to test/data/mx1.sof.bg.geant.net-None.output
diff --git a/test/data/mx1.sof.bg.geant.net-1.output b/test/data/mx1.sof.bg.geant.net-bgp.output
similarity index 100%
rename from test/data/mx1.sof.bg.geant.net-1.output
rename to test/data/mx1.sof.bg.geant.net-bgp.output
diff --git a/test/data/mx1.sof.bg.geant.net-3.output b/test/data/mx1.sof.bg.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx1.sof.bg.geant.net-3.output
rename to test/data/mx1.sof.bg.geant.net-interfaces.output
diff --git a/test/data/mx1.sof.bg.geant.net-2.output b/test/data/mx1.sof.bg.geant.net-vrr.output
similarity index 100%
rename from test/data/mx1.sof.bg.geant.net-2.output
rename to test/data/mx1.sof.bg.geant.net-vrr.output
diff --git a/test/data/mx1.tal.ee.geant.net-0.output b/test/data/mx1.tal.ee.geant.net-None.output
similarity index 100%
rename from test/data/mx1.tal.ee.geant.net-0.output
rename to test/data/mx1.tal.ee.geant.net-None.output
diff --git a/test/data/mx1.tal.ee.geant.net-1.output b/test/data/mx1.tal.ee.geant.net-bgp.output
similarity index 100%
rename from test/data/mx1.tal.ee.geant.net-1.output
rename to test/data/mx1.tal.ee.geant.net-bgp.output
diff --git a/test/data/mx1.tal.ee.geant.net-3.output b/test/data/mx1.tal.ee.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx1.tal.ee.geant.net-3.output
rename to test/data/mx1.tal.ee.geant.net-interfaces.output
diff --git a/test/data/mx1.tal.ee.geant.net-2.output b/test/data/mx1.tal.ee.geant.net-vrr.output
similarity index 100%
rename from test/data/mx1.tal.ee.geant.net-2.output
rename to test/data/mx1.tal.ee.geant.net-vrr.output
diff --git a/test/data/mx1.vie.at.geant.net-0.output b/test/data/mx1.vie.at.geant.net-None.output
similarity index 100%
rename from test/data/mx1.vie.at.geant.net-0.output
rename to test/data/mx1.vie.at.geant.net-None.output
diff --git a/test/data/mx1.vie.at.geant.net-1.output b/test/data/mx1.vie.at.geant.net-bgp.output
similarity index 100%
rename from test/data/mx1.vie.at.geant.net-1.output
rename to test/data/mx1.vie.at.geant.net-bgp.output
diff --git a/test/data/mx1.vie.at.geant.net-3.output b/test/data/mx1.vie.at.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx1.vie.at.geant.net-3.output
rename to test/data/mx1.vie.at.geant.net-interfaces.output
diff --git a/test/data/mx1.vie.at.geant.net-2.output b/test/data/mx1.vie.at.geant.net-vrr.output
similarity index 100%
rename from test/data/mx1.vie.at.geant.net-2.output
rename to test/data/mx1.vie.at.geant.net-vrr.output
diff --git a/test/data/mx2.ath.gr.geant.net-0.output b/test/data/mx2.ath.gr.geant.net-None.output
similarity index 100%
rename from test/data/mx2.ath.gr.geant.net-0.output
rename to test/data/mx2.ath.gr.geant.net-None.output
diff --git a/test/data/mx2.ath.gr.geant.net-1.output b/test/data/mx2.ath.gr.geant.net-bgp.output
similarity index 100%
rename from test/data/mx2.ath.gr.geant.net-1.output
rename to test/data/mx2.ath.gr.geant.net-bgp.output
diff --git a/test/data/mx2.ath.gr.geant.net-3.output b/test/data/mx2.ath.gr.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx2.ath.gr.geant.net-3.output
rename to test/data/mx2.ath.gr.geant.net-interfaces.output
diff --git a/test/data/mx2.ath.gr.geant.net-2.output b/test/data/mx2.ath.gr.geant.net-vrr.output
similarity index 100%
rename from test/data/mx2.ath.gr.geant.net-2.output
rename to test/data/mx2.ath.gr.geant.net-vrr.output
diff --git a/test/data/mx2.bra.sk.geant.net-0.output b/test/data/mx2.bra.sk.geant.net-None.output
similarity index 100%
rename from test/data/mx2.bra.sk.geant.net-0.output
rename to test/data/mx2.bra.sk.geant.net-None.output
diff --git a/test/data/mx2.bra.sk.geant.net-1.output b/test/data/mx2.bra.sk.geant.net-bgp.output
similarity index 100%
rename from test/data/mx2.bra.sk.geant.net-1.output
rename to test/data/mx2.bra.sk.geant.net-bgp.output
diff --git a/test/data/mx2.bra.sk.geant.net-3.output b/test/data/mx2.bra.sk.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx2.bra.sk.geant.net-3.output
rename to test/data/mx2.bra.sk.geant.net-interfaces.output
diff --git a/test/data/mx2.bra.sk.geant.net-2.output b/test/data/mx2.bra.sk.geant.net-vrr.output
similarity index 100%
rename from test/data/mx2.bra.sk.geant.net-2.output
rename to test/data/mx2.bra.sk.geant.net-vrr.output
diff --git a/test/data/mx2.bru.be.geant.net-0.output b/test/data/mx2.bru.be.geant.net-None.output
similarity index 100%
rename from test/data/mx2.bru.be.geant.net-0.output
rename to test/data/mx2.bru.be.geant.net-None.output
diff --git a/test/data/mx2.bru.be.geant.net-1.output b/test/data/mx2.bru.be.geant.net-bgp.output
similarity index 100%
rename from test/data/mx2.bru.be.geant.net-1.output
rename to test/data/mx2.bru.be.geant.net-bgp.output
diff --git a/test/data/mx2.bru.be.geant.net-3.output b/test/data/mx2.bru.be.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx2.bru.be.geant.net-3.output
rename to test/data/mx2.bru.be.geant.net-interfaces.output
diff --git a/test/data/mx2.bru.be.geant.net-2.output b/test/data/mx2.bru.be.geant.net-vrr.output
similarity index 100%
rename from test/data/mx2.bru.be.geant.net-2.output
rename to test/data/mx2.bru.be.geant.net-vrr.output
diff --git a/test/data/mx2.kau.lt.geant.net-0.output b/test/data/mx2.kau.lt.geant.net-None.output
similarity index 100%
rename from test/data/mx2.kau.lt.geant.net-0.output
rename to test/data/mx2.kau.lt.geant.net-None.output
diff --git a/test/data/mx2.kau.lt.geant.net-1.output b/test/data/mx2.kau.lt.geant.net-bgp.output
similarity index 100%
rename from test/data/mx2.kau.lt.geant.net-1.output
rename to test/data/mx2.kau.lt.geant.net-bgp.output
diff --git a/test/data/mx2.kau.lt.geant.net-3.output b/test/data/mx2.kau.lt.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx2.kau.lt.geant.net-3.output
rename to test/data/mx2.kau.lt.geant.net-interfaces.output
diff --git a/test/data/mx2.kau.lt.geant.net-2.output b/test/data/mx2.kau.lt.geant.net-vrr.output
similarity index 100%
rename from test/data/mx2.kau.lt.geant.net-2.output
rename to test/data/mx2.kau.lt.geant.net-vrr.output
diff --git a/test/data/mx2.lis.pt.geant.net-0.output b/test/data/mx2.lis.pt.geant.net-None.output
similarity index 100%
rename from test/data/mx2.lis.pt.geant.net-0.output
rename to test/data/mx2.lis.pt.geant.net-None.output
diff --git a/test/data/mx2.lis.pt.geant.net-1.output b/test/data/mx2.lis.pt.geant.net-bgp.output
similarity index 100%
rename from test/data/mx2.lis.pt.geant.net-1.output
rename to test/data/mx2.lis.pt.geant.net-bgp.output
diff --git a/test/data/mx2.lis.pt.geant.net-3.output b/test/data/mx2.lis.pt.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx2.lis.pt.geant.net-3.output
rename to test/data/mx2.lis.pt.geant.net-interfaces.output
diff --git a/test/data/mx2.lis.pt.geant.net-2.output b/test/data/mx2.lis.pt.geant.net-vrr.output
similarity index 100%
rename from test/data/mx2.lis.pt.geant.net-2.output
rename to test/data/mx2.lis.pt.geant.net-vrr.output
diff --git a/test/data/mx2.lju.si.geant.net-0.output b/test/data/mx2.lju.si.geant.net-None.output
similarity index 100%
rename from test/data/mx2.lju.si.geant.net-0.output
rename to test/data/mx2.lju.si.geant.net-None.output
diff --git a/test/data/mx2.lju.si.geant.net-1.output b/test/data/mx2.lju.si.geant.net-bgp.output
similarity index 100%
rename from test/data/mx2.lju.si.geant.net-1.output
rename to test/data/mx2.lju.si.geant.net-bgp.output
diff --git a/test/data/mx2.lju.si.geant.net-3.output b/test/data/mx2.lju.si.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx2.lju.si.geant.net-3.output
rename to test/data/mx2.lju.si.geant.net-interfaces.output
diff --git a/test/data/mx2.lju.si.geant.net-2.output b/test/data/mx2.lju.si.geant.net-vrr.output
similarity index 100%
rename from test/data/mx2.lju.si.geant.net-2.output
rename to test/data/mx2.lju.si.geant.net-vrr.output
diff --git a/test/data/mx2.rig.lv.geant.net-0.output b/test/data/mx2.rig.lv.geant.net-None.output
similarity index 100%
rename from test/data/mx2.rig.lv.geant.net-0.output
rename to test/data/mx2.rig.lv.geant.net-None.output
diff --git a/test/data/mx2.rig.lv.geant.net-1.output b/test/data/mx2.rig.lv.geant.net-bgp.output
similarity index 100%
rename from test/data/mx2.rig.lv.geant.net-1.output
rename to test/data/mx2.rig.lv.geant.net-bgp.output
diff --git a/test/data/mx2.rig.lv.geant.net-3.output b/test/data/mx2.rig.lv.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx2.rig.lv.geant.net-3.output
rename to test/data/mx2.rig.lv.geant.net-interfaces.output
diff --git a/test/data/mx2.rig.lv.geant.net-2.output b/test/data/mx2.rig.lv.geant.net-vrr.output
similarity index 100%
rename from test/data/mx2.rig.lv.geant.net-2.output
rename to test/data/mx2.rig.lv.geant.net-vrr.output
diff --git a/test/data/mx2.tal.ee.geant.net-0.output b/test/data/mx2.tal.ee.geant.net-None.output
similarity index 100%
rename from test/data/mx2.tal.ee.geant.net-0.output
rename to test/data/mx2.tal.ee.geant.net-None.output
diff --git a/test/data/mx2.tal.ee.geant.net-1.output b/test/data/mx2.tal.ee.geant.net-bgp.output
similarity index 100%
rename from test/data/mx2.tal.ee.geant.net-1.output
rename to test/data/mx2.tal.ee.geant.net-bgp.output
diff --git a/test/data/mx2.tal.ee.geant.net-3.output b/test/data/mx2.tal.ee.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx2.tal.ee.geant.net-3.output
rename to test/data/mx2.tal.ee.geant.net-interfaces.output
diff --git a/test/data/mx2.tal.ee.geant.net-2.output b/test/data/mx2.tal.ee.geant.net-vrr.output
similarity index 100%
rename from test/data/mx2.tal.ee.geant.net-2.output
rename to test/data/mx2.tal.ee.geant.net-vrr.output
diff --git a/test/data/mx2.zag.hr.geant.net-0.output b/test/data/mx2.zag.hr.geant.net-None.output
similarity index 100%
rename from test/data/mx2.zag.hr.geant.net-0.output
rename to test/data/mx2.zag.hr.geant.net-None.output
diff --git a/test/data/mx2.zag.hr.geant.net-1.output b/test/data/mx2.zag.hr.geant.net-bgp.output
similarity index 100%
rename from test/data/mx2.zag.hr.geant.net-1.output
rename to test/data/mx2.zag.hr.geant.net-bgp.output
diff --git a/test/data/mx2.zag.hr.geant.net-3.output b/test/data/mx2.zag.hr.geant.net-interfaces.output
similarity index 100%
rename from test/data/mx2.zag.hr.geant.net-3.output
rename to test/data/mx2.zag.hr.geant.net-interfaces.output
diff --git a/test/data/mx2.zag.hr.geant.net-2.output b/test/data/mx2.zag.hr.geant.net-vrr.output
similarity index 100%
rename from test/data/mx2.zag.hr.geant.net-2.output
rename to test/data/mx2.zag.hr.geant.net-vrr.output