diff --git a/tests/fpgadataflow/test_convert_to_hls_conv_layer.py b/tests/fpgadataflow/test_convert_to_hls_conv_layer.py
index 081d5a3b90d23d9feb5ab811aa0c3948e6295fcd..6d1ff31ab554ef1d3fe8ef1fac66e6bc3406efbb 100644
--- a/tests/fpgadataflow/test_convert_to_hls_conv_layer.py
+++ b/tests/fpgadataflow/test_convert_to_hls_conv_layer.py
@@ -117,7 +117,7 @@ def test_convert_to_hls_conv_layer(conv_config, exec_mode):
             inst = getCustomOp(node)
             sim_cycles = inst.get_nodeattr("sim_cycles")
             exp_cycles_dict = new_model.analysis(exp_cycles_per_layer)
-            exp_cycles = exp_cycles_dict[str(node)]
+            exp_cycles = exp_cycles_dict[node.name]
             assert np.isclose(exp_cycles, sim_cycles, atol=11)
             assert exp_cycles != 0
 
diff --git a/tests/fpgadataflow/test_convert_to_hls_pool_batch.py b/tests/fpgadataflow/test_convert_to_hls_pool_batch.py
index 2915ba48c78c79b0be89f76b657f38376d46b902..fbf1e72da266141bd8328cc88c2e8bebff8301fb 100644
--- a/tests/fpgadataflow/test_convert_to_hls_pool_batch.py
+++ b/tests/fpgadataflow/test_convert_to_hls_pool_batch.py
@@ -217,5 +217,5 @@ def test_convert_to_hls_pool_batch(
         inst = getCustomOp(node)
         sim_cycles = inst.get_nodeattr("sim_cycles")
         exp_cycles_dict = new_model.analysis(exp_cycles_per_layer)
-        exp_cycles = exp_cycles_dict[str(node)]
+        exp_cycles = exp_cycles_dict[node.name]
         assert np.isclose(exp_cycles, sim_cycles, atol=10)
diff --git a/tests/fpgadataflow/test_fpgadataflow_addstreams.py b/tests/fpgadataflow/test_fpgadataflow_addstreams.py
index 70cf1f10979295435c1ac5198af58ed6910e7178..7a3df667b7feeafa017e3b03c11d4e55be07b195 100644
--- a/tests/fpgadataflow/test_fpgadataflow_addstreams.py
+++ b/tests/fpgadataflow/test_fpgadataflow_addstreams.py
@@ -134,6 +134,6 @@ def test_fpgadataflow_addstreams(idt, ch, fold, exec_mode):
         inst = getCustomOp(node)
         sim_cycles = inst.get_nodeattr("sim_cycles")
         exp_cycles_dict = model.analysis(exp_cycles_per_layer)
-        exp_cycles = exp_cycles_dict[str(node)]
+        exp_cycles = exp_cycles_dict[node.name]
         assert np.isclose(exp_cycles, sim_cycles, atol=10)
         assert exp_cycles != 0
diff --git a/tests/fpgadataflow/test_fpgadataflow_channelwise_ops.py b/tests/fpgadataflow/test_fpgadataflow_channelwise_ops.py
index 1a5aa82e04cbee347f7508e27a50d1733efd4bc1..3cd937287270481911622c118db27d5a2153a823 100644
--- a/tests/fpgadataflow/test_fpgadataflow_channelwise_ops.py
+++ b/tests/fpgadataflow/test_fpgadataflow_channelwise_ops.py
@@ -161,6 +161,6 @@ def test_fpgadataflow_channelwise_ops(idt, act, pdt, nf, ich, func, vecs, exec_m
         inst = getCustomOp(node)
         sim_cycles = inst.get_nodeattr("sim_cycles")
         exp_cycles_dict = model.analysis(exp_cycles_per_layer)
-        exp_cycles = exp_cycles_dict[str(node)]
+        exp_cycles = exp_cycles_dict[node.name]
         assert np.isclose(exp_cycles, sim_cycles, atol=10)
         assert exp_cycles != 0
diff --git a/tests/fpgadataflow/test_fpgadataflow_convinputgenerator.py b/tests/fpgadataflow/test_fpgadataflow_convinputgenerator.py
index 9bf7117dbd1015299e0afcc93c03190071ec1396..afebcca73f1f2cfdf82061004a7473145b2ff928 100644
--- a/tests/fpgadataflow/test_fpgadataflow_convinputgenerator.py
+++ b/tests/fpgadataflow/test_fpgadataflow_convinputgenerator.py
@@ -192,6 +192,6 @@ def test_fpgadataflow_slidingwindow(
         inst = getCustomOp(node)
         sim_cycles = inst.get_nodeattr("sim_cycles")
         exp_cycles_dict = model.analysis(exp_cycles_per_layer)
-        exp_cycles = exp_cycles_dict[str(node)]
+        exp_cycles = exp_cycles_dict[node.name]
         assert np.isclose(exp_cycles, sim_cycles, atol=10)
         assert exp_cycles != 0
diff --git a/tests/fpgadataflow/test_fpgadataflow_duplicatestreams.py b/tests/fpgadataflow/test_fpgadataflow_duplicatestreams.py
index 241586a0d4abdfeabddbcbb572741ab027440fd6..4255a4dcafadadf3e3de53bf5e7ee9798e74a26d 100644
--- a/tests/fpgadataflow/test_fpgadataflow_duplicatestreams.py
+++ b/tests/fpgadataflow/test_fpgadataflow_duplicatestreams.py
@@ -139,6 +139,6 @@ def test_fpgadataflow_duplicatestreams(idt, ch, fold, imdim, exec_mode):
         inst = getCustomOp(node)
         sim_cycles = inst.get_nodeattr("sim_cycles")
         exp_cycles_dict = model.analysis(exp_cycles_per_layer)
-        exp_cycles = exp_cycles_dict[str(node)]
+        exp_cycles = exp_cycles_dict[node.name]
         assert np.isclose(exp_cycles, sim_cycles, atol=10)
         assert exp_cycles != 0
diff --git a/tests/fpgadataflow/test_fpgadataflow_fclayer.py b/tests/fpgadataflow/test_fpgadataflow_fclayer.py
index 60473e8b7d884eb9c35739e4cb57ddd5bb707582..249f84e9014c4a2f656074062bc53d3f3efd485f 100644
--- a/tests/fpgadataflow/test_fpgadataflow_fclayer.py
+++ b/tests/fpgadataflow/test_fpgadataflow_fclayer.py
@@ -316,12 +316,11 @@ def test_fpgadataflow_fclayer_rtlsim(mem_mode, idt, wdt, act, nf, sf, mw, mh):
     inst = getCustomOp(node)
     sim_cycles = inst.get_nodeattr("sim_cycles")
     exp_cycles_dict = model.analysis(exp_cycles_per_layer)
-    exp_cycles = exp_cycles_dict[str(node)]
+    exp_cycles = exp_cycles_dict[node.name]
     assert np.isclose(exp_cycles, sim_cycles, atol=15)
     assert exp_cycles != 0
 
 
-
 # mem_mode: const or decoupled
 @pytest.mark.parametrize("mem_mode", ["decoupled"])
 # activation: None or DataType
@@ -418,7 +417,6 @@ def test_fpgadataflow_fclayer_large_depth_decoupled_mode_rtlsim(
     inst = getCustomOp(node)
     sim_cycles = inst.get_nodeattr("sim_cycles")
     exp_cycles_dict = model.analysis(exp_cycles_per_layer)
-    exp_cycles = exp_cycles_dict[str(node)]
+    exp_cycles = exp_cycles_dict[node.name]
     assert np.isclose(exp_cycles, sim_cycles, atol=15)
     assert exp_cycles != 0
-
diff --git a/tests/fpgadataflow/test_fpgadataflow_fmpadding.py b/tests/fpgadataflow/test_fpgadataflow_fmpadding.py
index d5e25050a8e9ac2f680c2a549d8aa453402760d2..d1142ceacaec00f6b532cfa54ad5397bf5562bf4 100644
--- a/tests/fpgadataflow/test_fpgadataflow_fmpadding.py
+++ b/tests/fpgadataflow/test_fpgadataflow_fmpadding.py
@@ -131,6 +131,6 @@ def test_fpgadataflow_fmpadding(idim, pad, num_ch, simd, pad_style, idt, mode):
         inst = getCustomOp(node)
         sim_cycles = inst.get_nodeattr("sim_cycles")
         exp_cycles_dict = model.analysis(exp_cycles_per_layer)
-        exp_cycles = exp_cycles_dict[str(node)]
+        exp_cycles = exp_cycles_dict[node.name]
         assert np.isclose(exp_cycles, sim_cycles, atol=10)
         assert exp_cycles != 0
diff --git a/tests/fpgadataflow/test_fpgadataflow_globalaccpool.py b/tests/fpgadataflow/test_fpgadataflow_globalaccpool.py
index 974f17c9f09478474a3e94af7862cd42cdeebaf4..06a1311ab99fefd88b15ee1896b978c83f495e2b 100644
--- a/tests/fpgadataflow/test_fpgadataflow_globalaccpool.py
+++ b/tests/fpgadataflow/test_fpgadataflow_globalaccpool.py
@@ -129,7 +129,7 @@ def test_fpgadataflow_globalaccpool(idt, ch, fold, imdim, exec_mode):
         inst = getCustomOp(node)
         sim_cycles = inst.get_nodeattr("sim_cycles")
         exp_cycles_dict = model.analysis(exp_cycles_per_layer)
-        exp_cycles = exp_cycles_dict[str(node)]
+        exp_cycles = exp_cycles_dict[node.name]
         # commented out, needs performance debug:
         # test_fpgadataflow_globalaccpool[rtlsim-7-1-64-DataType.UINT4]
         # assert False where False =
diff --git a/tests/fpgadataflow/test_fpgadataflow_thresholding.py b/tests/fpgadataflow/test_fpgadataflow_thresholding.py
index 9d4f83a6491091b8de3153efc142183bb49c148f..218c9e61ee5d5ef561bc7c720c2a408c858967af 100644
--- a/tests/fpgadataflow/test_fpgadataflow_thresholding.py
+++ b/tests/fpgadataflow/test_fpgadataflow_thresholding.py
@@ -159,6 +159,6 @@ def test_fpgadataflow_thresholding(idt, act, nf, ich, exec_mode):
         inst = getCustomOp(node)
         sim_cycles = inst.get_nodeattr("sim_cycles")
         exp_cycles_dict = model.analysis(exp_cycles_per_layer)
-        exp_cycles = exp_cycles_dict[str(node)]
+        exp_cycles = exp_cycles_dict[node.name]
         assert np.isclose(exp_cycles, sim_cycles, atol=10)
         assert exp_cycles != 0
diff --git a/tests/fpgadataflow/test_layer_streaming_maxpool_batch.py b/tests/fpgadataflow/test_layer_streaming_maxpool_batch.py
index 0a2275c17491d69e0b33588a3d5590e792305f1e..0b021a4c48047a321b0a7be88d034d6043207984 100644
--- a/tests/fpgadataflow/test_layer_streaming_maxpool_batch.py
+++ b/tests/fpgadataflow/test_layer_streaming_maxpool_batch.py
@@ -163,6 +163,6 @@ def test_fpgadataflow_streamingmaxpool(idt, k, ifm_dim, ifm_ch, exec_mode):
         inst = getCustomOp(node)
         sim_cycles = inst.get_nodeattr("sim_cycles")
         exp_cycles_dict = model.analysis(exp_cycles_per_layer)
-        exp_cycles = exp_cycles_dict[str(node)]
+        exp_cycles = exp_cycles_dict[node.name]
         assert np.isclose(exp_cycles, sim_cycles, atol=15)
         assert exp_cycles != 0