diff --git a/netsim/ansible/templates/lag/arubacx.j2 b/netsim/ansible/templates/lag/arubacx.j2
index 57db5798e..b6c335f53 100644
--- a/netsim/ansible/templates/lag/arubacx.j2
+++ b/netsim/ansible/templates/lag/arubacx.j2
@@ -10,7 +10,7 @@ interface lag {{ intf.lag.mlag.ifindex }}
     description VSX ISL
 
 !
-{%   for ch in ([intf]+interfaces) if ch==intf or ch.lag._parentindex|default(False) == intf.linkindex %}
+{%   for ch in ([intf]+interfaces) if ch==intf or ch.lag._peerlink|default(0) == intf.linkindex %}
 interface {{ ch.ifname }}
     no shutdown
     description {{ ch.name }} (ISL in lag {{intf.lag.mlag.ifindex }})
@@ -54,7 +54,7 @@ interface {{ intf.ifname }}{{ mclag_intf }}{{ mclag_intf_static }}
     no shutdown
 
 !
-{%   for ch in interfaces if ch.lag._parentindex|default(False) == intf.linkindex %}
+{%   for ch in interfaces if ch.lag._parentindex|default(False) == intf.lag.ifindex %}
 !
 interface {{ ch.ifname }}
     description {{ ch.name }} in lag {{ intf.lag.ifindex }}
diff --git a/netsim/modules/lag.py b/netsim/modules/lag.py
index 40a1b0935..686a62bb7 100644
--- a/netsim/modules/lag.py
+++ b/netsim/modules/lag.py
@@ -214,7 +214,7 @@ def analyze_lag(members: list, node_count: typing.Dict[str,int]) -> typing.Tuple
       return (False,False,"")
     elif len(node_count)==3:                               # 1:2 MLAG or weird MLAG triangle
       for node_name,count in node_count.items():
-        if count==len(l.lag.members):
+        if count==len(members):
           return (True,False,node_name)                    # Found the 1-side node
     elif len(node_count)==4:                               # 2:2 dual MLAG
       return (True,True,"")
@@ -458,4 +458,4 @@ def node_post_transform(self, node: Box, topology: Box) -> None:
         category=log.IncorrectAttr,
         module='lag')
 
-    node.pop('_lag_ifindex',None)           # Cleanup
+    node.pop('_lag_ifindex',None)              # Cleanup
diff --git a/tests/topology/expected/bgp-vrf-local-as.yml b/tests/topology/expected/bgp-vrf-local-as.yml
index f1b681b38..02f8b3981 100644
--- a/tests/topology/expected/bgp-vrf-local-as.yml
+++ b/tests/topology/expected/bgp-vrf-local-as.yml
@@ -153,11 +153,11 @@ nodes:
     - bridge_group: 1
       ifindex: 2
       ifname: Ethernet1.1
-      ipv4: 172.16.3.1/24
+      ipv4: 10.1.0.5/30
       name: r1 -> r2
       neighbors:
       - ifname: Ethernet1.1
-        ipv4: 172.16.3.2/24
+        ipv4: 10.1.0.6/30
         node: r2
         vrf: blue
       parent_ifindex: 1
@@ -174,11 +174,11 @@ nodes:
     - bridge_group: 2
       ifindex: 3
       ifname: Ethernet1.2
-      ipv4: 172.16.4.1/24
+      ipv4: 10.1.0.9/30
       name: r1 -> r2
       neighbors:
       - ifname: Ethernet1.2
-        ipv4: 172.16.4.2/24
+        ipv4: 10.1.0.10/30
         node: r2
         vrf: red
       parent_ifindex: 1
@@ -240,7 +240,7 @@ nodes:
           neighbors:
           - as: 65000
             ifindex: 2
-            ipv4: 172.16.3.2
+            ipv4: 10.1.0.6
             name: r2
             type: ebgp
         export:
@@ -260,7 +260,7 @@ nodes:
           neighbors:
           - as: 65000
             ifindex: 3
-            ipv4: 172.16.4.2
+            ipv4: 10.1.0.10
             name: r2
             type: ebgp
         export:
@@ -363,11 +363,11 @@ nodes:
     - bridge_group: 2
       ifindex: 5
       ifname: Ethernet1.1
-      ipv4: 172.16.3.2/24
+      ipv4: 10.1.0.6/30
       name: r2 -> r1
       neighbors:
       - ifname: Ethernet1.1
-        ipv4: 172.16.3.1/24
+        ipv4: 10.1.0.5/30
         node: r1
         vrf: blue
       parent_ifindex: 1
@@ -384,11 +384,11 @@ nodes:
     - bridge_group: 3
       ifindex: 6
       ifname: Ethernet1.2
-      ipv4: 172.16.4.2/24
+      ipv4: 10.1.0.10/30
       name: r2 -> r1
       neighbors:
       - ifname: Ethernet1.2
-        ipv4: 172.16.4.1/24
+        ipv4: 10.1.0.9/30
         node: r1
         vrf: red
       parent_ifindex: 1
@@ -405,11 +405,11 @@ nodes:
     - bridge_group: 2
       ifindex: 7
       ifname: Ethernet2.1
-      ipv4: 172.16.5.2/24
+      ipv4: 10.1.0.13/30
       name: r2 -> r3
       neighbors:
       - ifname: Ethernet1.1
-        ipv4: 172.16.5.3/24
+        ipv4: 10.1.0.14/30
         node: r3
         vrf: blue
       parent_ifindex: 2
@@ -426,11 +426,11 @@ nodes:
     - bridge_group: 3
       ifindex: 8
       ifname: Ethernet2.2
-      ipv4: 172.16.6.2/24
+      ipv4: 10.1.0.17/30
       name: r2 -> r3
       neighbors:
       - ifname: Ethernet1.2
-        ipv4: 172.16.6.3/24
+        ipv4: 10.1.0.18/30
         node: r3
         vrf: red
       parent_ifindex: 2
@@ -505,12 +505,12 @@ nodes:
             type: ebgp
           - as: 65100
             ifindex: 5
-            ipv4: 172.16.3.1
+            ipv4: 10.1.0.5
             name: r1
             type: ebgp
           - as: 65101
             ifindex: 7
-            ipv4: 172.16.5.3
+            ipv4: 10.1.0.14
             name: r3
             type: ebgp
           router_id: 172.32.0.2
@@ -537,12 +537,12 @@ nodes:
             type: ebgp
           - as: 65100
             ifindex: 6
-            ipv4: 172.16.4.1
+            ipv4: 10.1.0.9
             name: r1
             type: ebgp
           - as: 65101
             ifindex: 8
-            ipv4: 172.16.6.3
+            ipv4: 10.1.0.18
             name: r3
             type: ebgp
           router_id: 172.31.0.1
@@ -598,11 +598,11 @@ nodes:
     - bridge_group: 1
       ifindex: 2
       ifname: Ethernet1.1
-      ipv4: 172.16.5.3/24
+      ipv4: 10.1.0.14/30
       name: r3 -> r2
       neighbors:
       - ifname: Ethernet2.1
-        ipv4: 172.16.5.2/24
+        ipv4: 10.1.0.13/30
         node: r2
         vrf: blue
       parent_ifindex: 1
@@ -619,11 +619,11 @@ nodes:
     - bridge_group: 2
       ifindex: 3
       ifname: Ethernet1.2
-      ipv4: 172.16.6.3/24
+      ipv4: 10.1.0.18/30
       name: r3 -> r2
       neighbors:
       - ifname: Ethernet2.2
-        ipv4: 172.16.6.2/24
+        ipv4: 10.1.0.17/30
         node: r2
         vrf: red
       parent_ifindex: 1
@@ -685,7 +685,7 @@ nodes:
           neighbors:
           - as: 65000
             ifindex: 2
-            ipv4: 172.16.5.2
+            ipv4: 10.1.0.13
             name: r2
             type: ebgp
         export:
@@ -705,7 +705,7 @@ nodes:
           neighbors:
           - as: 65000
             ifindex: 3
-            ipv4: 172.16.6.2
+            ipv4: 10.1.0.17
             name: r2
             type: ebgp
         export:
diff --git a/tests/topology/expected/groups-vlan-vrf.yml b/tests/topology/expected/groups-vlan-vrf.yml
index bed9137ae..8df26bda8 100644
--- a/tests/topology/expected/groups-vlan-vrf.yml
+++ b/tests/topology/expected/groups-vlan-vrf.yml
@@ -295,11 +295,11 @@ nodes:
     - bridge_group: 2
       ifindex: 3
       ifname: eth1.1001
-      ipv4: 172.16.4.3/24
+      ipv4: 10.1.0.1/30
       name: s1 -> s2
       neighbors:
       - ifname: eth3.1001
-        ipv4: 172.16.4.4/24
+        ipv4: 10.1.0.2/30
         node: s2
         vrf: red_vrf
       parent_ifindex: 1
@@ -402,11 +402,11 @@ nodes:
           - bridge_group: 2
             ifindex: 3
             ifname: eth1.1001
-            ipv4: 172.16.4.3/24
+            ipv4: 10.1.0.1/30
             name: s1 -> s2
             neighbors:
             - ifname: eth3.1001
-              ipv4: 172.16.4.4/24
+              ipv4: 10.1.0.2/30
               node: s2
               vrf: red_vrf
             ospf:
@@ -527,11 +527,11 @@ nodes:
     - bridge_group: 1
       ifindex: 5
       ifname: eth3.1001
-      ipv4: 172.16.4.4/24
+      ipv4: 10.1.0.2/30
       name: s2 -> s1
       neighbors:
       - ifname: eth1.1001
-        ipv4: 172.16.4.3/24
+        ipv4: 10.1.0.1/30
         node: s1
         vrf: red_vrf
       parent_ifindex: 3
@@ -675,11 +675,11 @@ nodes:
           - bridge_group: 1
             ifindex: 5
             ifname: eth3.1001
-            ipv4: 172.16.4.4/24
+            ipv4: 10.1.0.2/30
             name: s2 -> s1
             neighbors:
             - ifname: eth1.1001
-              ipv4: 172.16.4.3/24
+              ipv4: 10.1.0.1/30
               node: s1
               vrf: red_vrf
             ospf:
diff --git a/tests/topology/expected/lag-l2.yml b/tests/topology/expected/lag-l2.yml
index fdca825a6..60e8ee0a5 100644
--- a/tests/topology/expected/lag-l2.yml
+++ b/tests/topology/expected/lag-l2.yml
@@ -119,12 +119,6 @@ nodes:
       neighbors:
       - ifname: port-channel1
         node: r2
-<<<<<<< HEAD
-      prefix: false
-=======
-        stp:
-          enable: false
->>>>>>> f2eb98413 (Refactored to temporarily rename interface.type to '_type' to bypass validation)
       stp:
         enable: false
       type: lag
@@ -278,12 +272,6 @@ nodes:
       neighbors:
       - ifname: port-channel1
         node: r1
-<<<<<<< HEAD
-      prefix: false
-=======
-        stp:
-          enable: false
->>>>>>> f2eb98413 (Refactored to temporarily rename interface.type to '_type' to bypass validation)
       stp:
         enable: false
       type: lag
diff --git a/tests/topology/expected/libvirt-clab-complex.yml b/tests/topology/expected/libvirt-clab-complex.yml
index d4cd11ceb..5d60a5e90 100644
--- a/tests/topology/expected/libvirt-clab-complex.yml
+++ b/tests/topology/expected/libvirt-clab-complex.yml
@@ -65,11 +65,11 @@ links:
   interfaces:
   - ifindex: 3
     ifname: GigabitEthernet0/3
-    ipv4: 172.16.1.2/24
+    ipv4: 10.1.0.5/30
     node: r2
   - ifindex: 1
     ifname: Ethernet1
-    ipv4: 172.16.1.3/24
+    ipv4: 10.1.0.6/30
     node: r3
   libvirt:
     provider:
@@ -77,20 +77,20 @@ links:
   linkindex: 3
   node_count: 2
   prefix:
-    ipv4: 172.16.1.0/24
+    ipv4: 10.1.0.4/30
   type: lan
 - _linkname: links[4]
   bridge: input_4
   gateway:
-    ipv4: 172.16.2.3/24
+    ipv4: 172.16.1.3/24
   interfaces:
   - ifindex: 2
     ifname: Ethernet2
-    ipv4: 172.16.2.3/24
+    ipv4: 172.16.1.3/24
     node: r3
   - ifindex: 1
     ifname: eth1
-    ipv4: 172.16.2.5/24
+    ipv4: 172.16.1.5/24
     node: h2
   libvirt:
     provider:
@@ -98,25 +98,25 @@ links:
   linkindex: 4
   node_count: 2
   prefix:
-    ipv4: 172.16.2.0/24
+    ipv4: 172.16.1.0/24
   role: stub
   type: lan
 - _linkname: links[5]
   bridge: input_5
   gateway:
-    ipv4: 172.16.3.3/24
+    ipv4: 172.16.2.3/24
   interfaces:
   - ifindex: 2
     ifname: eth2
-    ipv4: 172.16.3.4/24
+    ipv4: 172.16.2.4/24
     node: h1
   - ifindex: 3
     ifname: Ethernet3
-    ipv4: 172.16.3.3/24
+    ipv4: 172.16.2.3/24
     node: r3
   - ifindex: 2
     ifname: eth2
-    ipv4: 172.16.3.5/24
+    ipv4: 172.16.2.5/24
     node: h2
   libvirt:
     provider:
@@ -124,7 +124,7 @@ links:
   linkindex: 5
   node_count: 3
   prefix:
-    ipv4: 172.16.3.0/24
+    ipv4: 172.16.2.0/24
   role: stub
   type: lan
 module:
@@ -169,16 +169,16 @@ nodes:
         ipv4: 172.16.2.3/24
       ifindex: 2
       ifname: eth2
-      ipv4: 172.16.3.4/24
+      ipv4: 172.16.2.4/24
       linkindex: 5
       mtu: 1500
       name: h1 -> [r3,h2]
       neighbors:
       - ifname: Ethernet3
-        ipv4: 172.16.3.3/24
+        ipv4: 172.16.2.3/24
         node: r3
       - ifname: eth2
-        ipv4: 172.16.3.5/24
+        ipv4: 172.16.2.5/24
         node: h2
       role: stub
       type: lan
@@ -230,16 +230,16 @@ nodes:
     interfaces:
     - bridge: input_4
       gateway:
-        ipv4: 172.16.2.3/24
+        ipv4: 172.16.1.3/24
       ifindex: 1
       ifname: eth1
-      ipv4: 172.16.2.5/24
+      ipv4: 172.16.1.5/24
       linkindex: 4
       mtu: 1500
       name: h2 -> r3
       neighbors:
       - ifname: Ethernet2
-        ipv4: 172.16.2.3/24
+        ipv4: 172.16.1.3/24
         node: r3
       role: stub
       type: lan
@@ -248,16 +248,16 @@ nodes:
         ipv4: 172.16.2.3/24
       ifindex: 2
       ifname: eth2
-      ipv4: 172.16.3.5/24
+      ipv4: 172.16.2.5/24
       linkindex: 5
       mtu: 1500
       name: h2 -> [h1,r3]
       neighbors:
       - ifname: eth2
-        ipv4: 172.16.3.4/24
+        ipv4: 172.16.2.4/24
         node: h1
       - ifname: Ethernet3
-        ipv4: 172.16.3.3/24
+        ipv4: 172.16.2.3/24
         node: r3
       role: stub
       type: lan
@@ -391,12 +391,12 @@ nodes:
     - bridge: input_3
       ifindex: 3
       ifname: GigabitEthernet0/3
-      ipv4: 172.16.1.2/24
+      ipv4: 10.1.0.5/30
       linkindex: 3
       name: r2 -> r3
       neighbors:
       - ifname: Ethernet1
-        ipv4: 172.16.1.3/24
+        ipv4: 10.1.0.6/30
         node: r3
       ospf:
         area: 0.0.0.0
@@ -444,12 +444,12 @@ nodes:
         name: et1
       ifindex: 1
       ifname: Ethernet1
-      ipv4: 172.16.1.3/24
+      ipv4: 10.1.0.6/30
       linkindex: 3
       name: r3 -> r2
       neighbors:
       - ifname: GigabitEthernet0/3
-        ipv4: 172.16.1.2/24
+        ipv4: 10.1.0.5/30
         node: r2
       ospf:
         area: 0.0.0.0
@@ -461,12 +461,12 @@ nodes:
         name: et2
       ifindex: 2
       ifname: Ethernet2
-      ipv4: 172.16.2.3/24
+      ipv4: 172.16.1.3/24
       linkindex: 4
       name: r3 -> h2
       neighbors:
       - ifname: eth1
-        ipv4: 172.16.2.5/24
+        ipv4: 172.16.1.5/24
         node: h2
       ospf:
         area: 0.0.0.0
@@ -479,15 +479,15 @@ nodes:
         name: et3
       ifindex: 3
       ifname: Ethernet3
-      ipv4: 172.16.3.3/24
+      ipv4: 172.16.2.3/24
       linkindex: 5
       name: r3 -> [h1,h2]
       neighbors:
       - ifname: eth2
-        ipv4: 172.16.3.4/24
+        ipv4: 172.16.2.4/24
         node: h1
       - ifname: eth2
-        ipv4: 172.16.3.5/24
+        ipv4: 172.16.2.5/24
         node: h2
       ospf:
         area: 0.0.0.0
diff --git a/tests/topology/expected/link-tunnel.yml b/tests/topology/expected/link-tunnel.yml
index ecd0cf469..fcaf2f5c3 100644
--- a/tests/topology/expected/link-tunnel.yml
+++ b/tests/topology/expected/link-tunnel.yml
@@ -27,28 +27,28 @@ links:
   interfaces:
   - ifindex: 20001
     ifname: Tunnel1
-    ipv4: 172.16.1.2/24
+    ipv4: 10.1.0.1/30
     node: r2
   - ifindex: 20001
     ifname: Tunnel1
-    ipv4: 172.16.1.3/24
+    ipv4: 10.1.0.2/30
     node: r3
   linkindex: 2
   node_count: 2
   prefix:
-    ipv4: 172.16.1.0/24
+    ipv4: 10.1.0.0/30
   type: tunnel
 - _linkname: links[3]
   bridge: input_3
   interfaces:
   - ifindex: 20002
     ifname: Tunnel2
-    ipv4: 172.16.2.3/24
+    ipv4: 172.16.1.3/24
     node: r3
   linkindex: 3
   node_count: 1
   prefix:
-    ipv4: 172.16.2.0/24
+    ipv4: 172.16.1.0/24
   role: stub
   type: tunnel
 - _linkname: links[4]
@@ -56,20 +56,20 @@ links:
   interfaces:
   - ifindex: 1
     ifname: Ethernet1
-    ipv4: 172.16.3.1/24
+    ipv4: 172.16.2.1/24
     node: r1
   - ifindex: 1
     ifname: GigabitEthernet0/1
-    ipv4: 172.16.3.2/24
+    ipv4: 172.16.2.2/24
     node: r2
   - ifindex: 1
     ifname: GigabitEthernet0/1
-    ipv4: 172.16.3.3/24
+    ipv4: 172.16.2.3/24
     node: r3
   linkindex: 4
   node_count: 3
   prefix:
-    ipv4: 172.16.3.0/24
+    ipv4: 172.16.2.0/24
   type: lan
 name: input
 nodes:
@@ -97,15 +97,15 @@ nodes:
     - bridge: input_4
       ifindex: 1
       ifname: Ethernet1
-      ipv4: 172.16.3.1/24
+      ipv4: 172.16.2.1/24
       linkindex: 4
       name: r1 -> [r2,r3]
       neighbors:
       - ifname: GigabitEthernet0/1
-        ipv4: 172.16.3.2/24
+        ipv4: 172.16.2.2/24
         node: r2
       - ifname: GigabitEthernet0/1
-        ipv4: 172.16.3.3/24
+        ipv4: 172.16.2.3/24
         node: r3
       type: lan
     loopback:
@@ -143,27 +143,27 @@ nodes:
       virtual_interface: true
     - ifindex: 20001
       ifname: Tunnel1
-      ipv4: 172.16.1.2/24
+      ipv4: 10.1.0.1/30
       linkindex: 2
       name: r2 -> r3
       neighbors:
       - ifname: Tunnel1
-        ipv4: 172.16.1.3/24
+        ipv4: 10.1.0.2/30
         node: r3
       type: tunnel
       virtual_interface: true
     - bridge: input_4
       ifindex: 1
       ifname: GigabitEthernet0/1
-      ipv4: 172.16.3.2/24
+      ipv4: 172.16.2.2/24
       linkindex: 4
       name: r2 -> [r1,r3]
       neighbors:
       - ifname: Ethernet1
-        ipv4: 172.16.3.1/24
+        ipv4: 172.16.2.1/24
         node: r1
       - ifname: GigabitEthernet0/1
-        ipv4: 172.16.3.3/24
+        ipv4: 172.16.2.3/24
         node: r3
       type: lan
     loopback:
@@ -201,18 +201,18 @@ nodes:
       virtual_interface: true
     - ifindex: 20001
       ifname: Tunnel1
-      ipv4: 172.16.1.3/24
+      ipv4: 10.1.0.2/30
       linkindex: 2
       name: r3 -> r2
       neighbors:
       - ifname: Tunnel1
-        ipv4: 172.16.1.2/24
+        ipv4: 10.1.0.1/30
         node: r2
       type: tunnel
       virtual_interface: true
     - ifindex: 20002
       ifname: Tunnel2
-      ipv4: 172.16.2.3/24
+      ipv4: 172.16.1.3/24
       linkindex: 3
       name: r3 -> stub
       neighbors: []
@@ -222,15 +222,15 @@ nodes:
     - bridge: input_4
       ifindex: 1
       ifname: GigabitEthernet0/1
-      ipv4: 172.16.3.3/24
+      ipv4: 172.16.2.3/24
       linkindex: 4
       name: r3 -> [r1,r2]
       neighbors:
       - ifname: Ethernet1
-        ipv4: 172.16.3.1/24
+        ipv4: 172.16.2.1/24
         node: r1
       - ifname: GigabitEthernet0/1
-        ipv4: 172.16.3.2/24
+        ipv4: 172.16.2.2/24
         node: r2
       type: lan
     loopback:
diff --git a/tests/topology/expected/rt-vlan-mode-link-route.yml b/tests/topology/expected/rt-vlan-mode-link-route.yml
index e31518beb..90a03b175 100644
--- a/tests/topology/expected/rt-vlan-mode-link-route.yml
+++ b/tests/topology/expected/rt-vlan-mode-link-route.yml
@@ -406,11 +406,11 @@ nodes:
     - bridge_group: 2
       ifindex: 12
       ifname: eth4.1001
-      ipv4: 172.16.4.4/24
+      ipv4: 10.1.0.6/30
       name: br -> sw
       neighbors:
       - ifname: eth4.1001
-        ipv4: 172.16.4.3/24
+        ipv4: 10.1.0.5/30
         node: sw
       parent_ifindex: 4
       parent_ifname: eth4
@@ -424,11 +424,11 @@ nodes:
     - bridge_group: 3
       ifindex: 13
       ifname: eth4.1002
-      ipv4: 172.16.5.4/24
+      ipv4: 10.1.0.10/30
       name: br -> sw
       neighbors:
       - ifname: eth4.1002
-        ipv4: 172.16.5.3/24
+        ipv4: 10.1.0.9/30
         node: sw
       parent_ifindex: 4
       parent_ifname: eth4
@@ -442,11 +442,11 @@ nodes:
     - bridge_group: 1
       ifindex: 14
       ifname: eth4.1000
-      ipv4: 172.16.6.4/24
+      ipv4: 10.1.0.14/30
       name: br -> sw
       neighbors:
       - ifname: eth4.1000
-        ipv4: 172.16.6.3/24
+        ipv4: 10.1.0.13/30
         node: sw
       parent_ifindex: 4
       parent_ifname: eth4
@@ -988,11 +988,11 @@ nodes:
     - bridge_group: 2
       ifindex: 10
       ifname: eth4.1001
-      ipv4: 172.16.4.3/24
+      ipv4: 10.1.0.5/30
       name: sw -> br
       neighbors:
       - ifname: eth4.1001
-        ipv4: 172.16.4.4/24
+        ipv4: 10.1.0.6/30
         node: br
       parent_ifindex: 4
       parent_ifname: eth4
@@ -1006,11 +1006,11 @@ nodes:
     - bridge_group: 3
       ifindex: 11
       ifname: eth4.1002
-      ipv4: 172.16.5.3/24
+      ipv4: 10.1.0.9/30
       name: sw -> br
       neighbors:
       - ifname: eth4.1002
-        ipv4: 172.16.5.4/24
+        ipv4: 10.1.0.10/30
         node: br
       parent_ifindex: 4
       parent_ifname: eth4
@@ -1024,11 +1024,11 @@ nodes:
     - bridge_group: 1
       ifindex: 12
       ifname: eth4.1000
-      ipv4: 172.16.6.3/24
+      ipv4: 10.1.0.13/30
       name: sw -> br
       neighbors:
       - ifname: eth4.1000
-        ipv4: 172.16.6.4/24
+        ipv4: 10.1.0.14/30
         node: br
       parent_ifindex: 4
       parent_ifname: eth4
diff --git a/tests/topology/expected/vlan-vrf-lite.yml b/tests/topology/expected/vlan-vrf-lite.yml
index 71d0d2aff..a44ead991 100644
--- a/tests/topology/expected/vlan-vrf-lite.yml
+++ b/tests/topology/expected/vlan-vrf-lite.yml
@@ -495,11 +495,11 @@ nodes:
     - bridge_group: 2
       ifindex: 5
       ifname: Ethernet1.1
-      ipv4: 172.16.6.1/24
+      ipv4: 10.1.0.5/30
       name: r1 -> r2
       neighbors:
       - ifname: Ethernet1.1
-        ipv4: 172.16.6.2/24
+        ipv4: 10.1.0.6/30
         node: r2
         vrf: blue
       parent_ifindex: 1
@@ -515,11 +515,11 @@ nodes:
     - bridge_group: 1
       ifindex: 6
       ifname: Ethernet1.2
-      ipv4: 172.16.7.1/24
+      ipv4: 10.1.0.9/30
       name: r1 -> r2
       neighbors:
       - ifname: Ethernet1.2
-        ipv4: 172.16.7.2/24
+        ipv4: 10.1.0.10/30
         node: r2
         vrf: red
       parent_ifindex: 1
@@ -612,11 +612,11 @@ nodes:
           - bridge_group: 2
             ifindex: 5
             ifname: Ethernet1.1
-            ipv4: 172.16.6.1/24
+            ipv4: 10.1.0.5/30
             name: r1 -> r2
             neighbors:
             - ifname: Ethernet1.1
-              ipv4: 172.16.6.2/24
+              ipv4: 10.1.0.6/30
               node: r2
               vrf: blue
             ospf:
@@ -694,11 +694,11 @@ nodes:
           - bridge_group: 1
             ifindex: 6
             ifname: Ethernet1.2
-            ipv4: 172.16.7.1/24
+            ipv4: 10.1.0.9/30
             name: r1 -> r2
             neighbors:
             - ifname: Ethernet1.2
-              ipv4: 172.16.7.2/24
+              ipv4: 10.1.0.10/30
               node: r2
               vrf: red
             ospf:
@@ -779,11 +779,11 @@ nodes:
     - bridge_group: 2
       ifindex: 5
       ifname: Ethernet1.1
-      ipv4: 172.16.6.2/24
+      ipv4: 10.1.0.6/30
       name: r2 -> r1
       neighbors:
       - ifname: Ethernet1.1
-        ipv4: 172.16.6.1/24
+        ipv4: 10.1.0.5/30
         node: r1
         vrf: blue
       parent_ifindex: 1
@@ -799,11 +799,11 @@ nodes:
     - bridge_group: 1
       ifindex: 6
       ifname: Ethernet1.2
-      ipv4: 172.16.7.2/24
+      ipv4: 10.1.0.10/30
       name: r2 -> r1
       neighbors:
       - ifname: Ethernet1.2
-        ipv4: 172.16.7.1/24
+        ipv4: 10.1.0.9/30
         node: r1
         vrf: red
       parent_ifindex: 1
@@ -819,11 +819,11 @@ nodes:
     - bridge_group: 2
       ifindex: 7
       ifname: Ethernet2.1
-      ipv4: 172.16.8.2/24
+      ipv4: 10.1.0.13/30
       name: r2 -> r3
       neighbors:
       - ifname: Ethernet1.1
-        ipv4: 172.16.8.3/24
+        ipv4: 10.1.0.14/30
         node: r3
         vrf: blue
       parent_ifindex: 2
@@ -839,11 +839,11 @@ nodes:
     - bridge_group: 1
       ifindex: 8
       ifname: Ethernet2.2
-      ipv4: 172.16.9.2/24
+      ipv4: 10.1.0.17/30
       name: r2 -> r3
       neighbors:
       - ifname: Ethernet1.2
-        ipv4: 172.16.9.3/24
+        ipv4: 10.1.0.18/30
         node: r3
         vrf: red
       parent_ifindex: 2
@@ -936,11 +936,11 @@ nodes:
           - bridge_group: 2
             ifindex: 5
             ifname: Ethernet1.1
-            ipv4: 172.16.6.2/24
+            ipv4: 10.1.0.6/30
             name: r2 -> r1
             neighbors:
             - ifname: Ethernet1.1
-              ipv4: 172.16.6.1/24
+              ipv4: 10.1.0.5/30
               node: r1
               vrf: blue
             ospf:
@@ -960,11 +960,11 @@ nodes:
           - bridge_group: 2
             ifindex: 7
             ifname: Ethernet2.1
-            ipv4: 172.16.8.2/24
+            ipv4: 10.1.0.13/30
             name: r2 -> r3
             neighbors:
             - ifname: Ethernet1.1
-              ipv4: 172.16.8.3/24
+              ipv4: 10.1.0.14/30
               node: r3
               vrf: blue
             ospf:
@@ -1024,11 +1024,11 @@ nodes:
           - bridge_group: 1
             ifindex: 6
             ifname: Ethernet1.2
-            ipv4: 172.16.7.2/24
+            ipv4: 10.1.0.10/30
             name: r2 -> r1
             neighbors:
             - ifname: Ethernet1.2
-              ipv4: 172.16.7.1/24
+              ipv4: 10.1.0.9/30
               node: r1
               vrf: red
             ospf:
@@ -1048,11 +1048,11 @@ nodes:
           - bridge_group: 1
             ifindex: 8
             ifname: Ethernet2.2
-            ipv4: 172.16.9.2/24
+            ipv4: 10.1.0.17/30
             name: r2 -> r3
             neighbors:
             - ifname: Ethernet1.2
-              ipv4: 172.16.9.3/24
+              ipv4: 10.1.0.18/30
               node: r3
               vrf: red
             ospf:
@@ -1092,11 +1092,11 @@ nodes:
     - bridge_group: 1
       ifindex: 2
       ifname: Ethernet1.1
-      ipv4: 172.16.8.3/24
+      ipv4: 10.1.0.14/30
       name: r3 -> r2
       neighbors:
       - ifname: Ethernet2.1
-        ipv4: 172.16.8.2/24
+        ipv4: 10.1.0.13/30
         node: r2
         vrf: blue
       parent_ifindex: 1
@@ -1112,11 +1112,11 @@ nodes:
     - bridge_group: 2
       ifindex: 3
       ifname: Ethernet1.2
-      ipv4: 172.16.9.3/24
+      ipv4: 10.1.0.18/30
       name: r3 -> r2
       neighbors:
       - ifname: Ethernet2.2
-        ipv4: 172.16.9.2/24
+        ipv4: 10.1.0.17/30
         node: r2
         vrf: red
       parent_ifindex: 1
@@ -1189,11 +1189,11 @@ nodes:
           - bridge_group: 1
             ifindex: 2
             ifname: Ethernet1.1
-            ipv4: 172.16.8.3/24
+            ipv4: 10.1.0.14/30
             name: r3 -> r2
             neighbors:
             - ifname: Ethernet2.1
-              ipv4: 172.16.8.2/24
+              ipv4: 10.1.0.13/30
               node: r2
               vrf: blue
             ospf:
@@ -1233,11 +1233,11 @@ nodes:
           - bridge_group: 2
             ifindex: 3
             ifname: Ethernet1.2
-            ipv4: 172.16.9.3/24
+            ipv4: 10.1.0.18/30
             name: r3 -> r2
             neighbors:
             - ifname: Ethernet2.2
-              ipv4: 172.16.9.2/24
+              ipv4: 10.1.0.17/30
               node: r2
               vrf: red
             ospf:
diff --git a/tests/topology/expected/vrf-leaking-loop.yml b/tests/topology/expected/vrf-leaking-loop.yml
index 8d6710f76..d11159eeb 100644
--- a/tests/topology/expected/vrf-leaking-loop.yml
+++ b/tests/topology/expected/vrf-leaking-loop.yml
@@ -81,11 +81,11 @@ nodes:
     - bridge_group: 1
       ifindex: 3
       ifname: eth1.1000
-      ipv4: 172.16.2.1/24
+      ipv4: 10.1.0.1/30
       name: leaf1 -> leaf1
       neighbors:
       - ifname: eth2.1000
-        ipv4: 172.16.2.2/24
+        ipv4: 10.1.0.2/30
         node: leaf1
         vrf: customer1
       parent_ifindex: 1
@@ -101,11 +101,11 @@ nodes:
     - bridge_group: 1
       ifindex: 4
       ifname: eth2.1000
-      ipv4: 172.16.2.2/24
+      ipv4: 10.1.0.2/30
       name: leaf1 -> leaf1
       neighbors:
       - ifname: eth1.1000
-        ipv4: 172.16.2.1/24
+        ipv4: 10.1.0.1/30
         node: leaf1
         vrf: global
       parent_ifindex: 2
@@ -121,11 +121,11 @@ nodes:
     - bridge_group: 2
       ifindex: 5
       ifname: eth1.1001
-      ipv4: 172.16.3.1/24
+      ipv4: 10.1.0.5/30
       name: leaf1 -> leaf1
       neighbors:
       - ifname: eth2.1001
-        ipv4: 172.16.3.2/24
+        ipv4: 10.1.0.6/30
         node: leaf1
         vrf: customer2
       parent_ifindex: 1
@@ -141,11 +141,11 @@ nodes:
     - bridge_group: 2
       ifindex: 6
       ifname: eth2.1001
-      ipv4: 172.16.3.2/24
+      ipv4: 10.1.0.6/30
       name: leaf1 -> leaf1
       neighbors:
       - ifname: eth1.1001
-        ipv4: 172.16.3.1/24
+        ipv4: 10.1.0.5/30
         node: leaf1
         vrf: global
       parent_ifindex: 2