diff --git a/test/case/ietf_routing/ospf_basic/topology.png b/test/case/ietf_routing/ospf_basic/topology.png
index 8e985ef3..cdf4e35b 100644
Binary files a/test/case/ietf_routing/ospf_basic/topology.png and b/test/case/ietf_routing/ospf_basic/topology.png differ
diff --git a/test/case/ietf_routing/ospf_multiarea/topology.png b/test/case/ietf_routing/ospf_multiarea/topology.png
index 8caf9b51..7bd3db30 100644
Binary files a/test/case/ietf_routing/ospf_multiarea/topology.png and b/test/case/ietf_routing/ospf_multiarea/topology.png differ
diff --git a/test/case/ietf_routing/ospf_unnumbered_interface/topology.png b/test/case/ietf_routing/ospf_unnumbered_interface/topology.png
index 1e0aebf6..2e047f7f 100644
Binary files a/test/case/ietf_routing/ospf_unnumbered_interface/topology.png and b/test/case/ietf_routing/ospf_unnumbered_interface/topology.png differ
diff --git a/test/case/ietf_routing/static_routing/topology.png b/test/case/ietf_routing/static_routing/topology.png
index ee1efac4..8f53641c 100644
Binary files a/test/case/ietf_routing/static_routing/topology.png and b/test/case/ietf_routing/static_routing/topology.png differ
diff --git a/test/case/ietf_syslog/basic/topology.dot b/test/case/ietf_syslog/basic/topology.dot
deleted file mode 100644
index dc72e816..00000000
--- a/test/case/ietf_syslog/basic/topology.dot
+++ /dev/null
@@ -1,23 +0,0 @@
-graph "1x1" {
-	layout="neato";
-	overlap="false";
-	esep="+20";
-
-        node [shape=record, fontname="monospace"];
-	edge [color="cornflowerblue", penwidth="2"];
-
-	host [
-	    label="host | { <tgt> tgt }",
-	    pos="0,12!",
-	    kind="controller",
-	];
-
-        target [
-	    label="{ <mgmt> mgmt } | target",
-	    pos="10,12!",
-
-	    kind="infix",
-	];
-
-	host:tgt -- target:mgmt [kind=mgmt]
-}
diff --git a/test/case/ietf_syslog/basic/topology.dot b/test/case/ietf_syslog/basic/topology.dot
new file mode 120000
index 00000000..02b78869
--- /dev/null
+++ b/test/case/ietf_syslog/basic/topology.dot
@@ -0,0 +1 @@
+../../../infamy/topologies/1x1.dot
\ No newline at end of file
diff --git a/test/case/ietf_syslog/remote/test.py b/test/case/ietf_syslog/remote/test.py
index ee57c220..b85a186f 100755
--- a/test/case/ietf_syslog/remote/test.py
+++ b/test/case/ietf_syslog/remote/test.py
@@ -9,15 +9,14 @@
 with infamy.Test() as test:
     with test.step("Initialize"):
         env = infamy.Env()
-        client = env.attach("target1", "mgmt")
-        server = env.attach("target2", "mgmt")
-        clientssh = env.attach("target1", "mgmt", "ssh")
-        serverssh = env.attach("target2", "mgmt", "ssh")
+        client = env.attach("client", "mgmt")
+        server = env.attach("server", "mgmt")
+        clientssh = env.attach("client", "mgmt", "ssh")
+        serverssh = env.attach("server", "mgmt", "ssh")
 
     with test.step("Topology setup"):
-        _, client_e0 = env.ltop.xlate("target1", "data")
-        _, client_e1 = env.ltop.xlate("target1", "target2")
-        _, server_e0 = env.ltop.xlate("target2", "target1")
+        _, client_e1 = env.ltop.xlate("client", "to_server")
+        _, server_e0 = env.ltop.xlate("server", "to_client")
 
         client.put_config_dict("ietf-interfaces", {
             "interfaces": {
diff --git a/test/case/ietf_syslog/remote/topology.dot b/test/case/ietf_syslog/remote/topology.dot
index c3b6af0b..698fc0ae 100644
--- a/test/case/ietf_syslog/remote/topology.dot
+++ b/test/case/ietf_syslog/remote/topology.dot
@@ -1,32 +1,30 @@
 graph "2x2" {
 	layout="neato";
 	overlap="false";
-	esep="+20";
+	esep="+60";
 
         node [shape=record, fontname="monospace"];
 	edge [color="cornflowerblue", penwidth="2"];
 
 	host [
-	    label="host | { <mgmt1> mgmt1 | <data1> data1 | <mgmt2> mgmt2 | <data2> data2 }",
+	    label="host | { <cli_mgmt> cli_mgmt | <ser_mgmt> ser_mgmt }",
 	    pos="0,12!",
 	    kind="controller",
 	];
 
-        target1 [
-	    label="{ <mgmt> mgmt | <data> data | <target2> target2} | target1",
-	    pos="10,18!",
+        client [
+	    label="{ <mgmt> mgmt | <to_server> to_server} | client",
+	    pos="15,18!",
 
 	    kind="infix",
 	];
-	target2 [
-	    label="{ <target1> target1 |<mgmt> mgmt | <data> data  } | target2",
-	    pos="10,6!",
+	server [
+	    label="{ <to_client> to_client | <mgmt> mgmt  } | server",
+	    pos="15,6!",
 
 	    kind="infix",
 	];
-	host:mgmt1 -- target1:mgmt [kind=mgmt]
-        host:mgmt2 -- target2:mgmt [kind=mgmt]
-	host:data1 -- target1:data
-	host:data2 -- target2:data
-	target1:target2 -- target2:target1
+	host:cli_mgmt -- client:mgmt [kind=mgmt]
+        host:ser_mgmt -- server:mgmt [kind=mgmt]
+	client:to_server -- server:to_client [color=black, fontcolor=black, taillabel="10.0.0.2/24", headlabel="10.0.0.1/24"]
 }
diff --git a/test/case/ietf_syslog/remote/topology.png b/test/case/ietf_syslog/remote/topology.png
index 483114ef..2ba6011e 100644
Binary files a/test/case/ietf_syslog/remote/topology.png and b/test/case/ietf_syslog/remote/topology.png differ