diff --git a/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.1-legacy.json b/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.1-legacy.json
index deb696dc7..e238554be 100644
--- a/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.1-legacy.json
+++ b/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.1-legacy.json
@@ -1,7 +1,7 @@
 {
   "C": {
-    "f(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->6[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: BEGIN_LOOP 4\n\"];\n4->7;\n5[label=\"Node Type: END_LOOP 5\n\"];\n5->16;\n6[label=\"Node Type: NEW VARIABLE 6\n\"];\n6->4;\n7[label=\"Node Type: IF_LOOP 7\n\"];\n7->8[label=\"True\"];\n7->5[label=\"False\"];\n8[label=\"Node Type: IF 8\n\"];\n8->9[label=\"True\"];\n8->13[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->11[label=\"False\"];\n10[label=\"Node Type: EXPRESSION 10\n\"];\n10->12;\n11[label=\"Node Type: THROW 11\n\"];\n11->17;\n12[label=\"Node Type: END_IF 12\n\"];\n12->14;\n13[label=\"Node Type: EXPRESSION 13\n\"];\n13->14;\n14[label=\"Node Type: END_IF 14\n\"];\n14->15;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->7;\n16[label=\"Node Type: END_IF 16\n\"];\n16->17;\n17[label=\"Node Type: RETURN 17\n\"];\n}\n",
-    "g(uint256,uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n2->3;\n3[label=\"Node Type: IF 3\n\"];\n3->4[label=\"True\"];\n3->7[label=\"False\"];\n4[label=\"Node Type: RETURN 4\n\"];\n5[label=\"Node Type: BEGIN_LOOP 5\n\"];\n5->8;\n6[label=\"Node Type: END_LOOP 6\n\"];\n6->19;\n7[label=\"Node Type: NEW VARIABLE 7\n\"];\n7->5;\n8[label=\"Node Type: IF_LOOP 8\n\"];\n8->9[label=\"True\"];\n8->6[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->15[label=\"False\"];\n10[label=\"Node Type: IF 10\n\"];\n10->11[label=\"True\"];\n10->13[label=\"False\"];\n11[label=\"Node Type: EXPRESSION 11\n\"];\n11->12;\n12[label=\"Node Type: EXPRESSION 12\n\"];\n12->14;\n13[label=\"Node Type: THROW 13\n\"];\n13->20;\n14[label=\"Node Type: END_IF 14\n\"];\n14->17;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->16;\n16[label=\"Node Type: EXPRESSION 16\n\"];\n16->17;\n17[label=\"Node Type: END_IF 17\n\"];\n17->18;\n18[label=\"Node Type: EXPRESSION 18\n\"];\n18->8;\n19[label=\"Node Type: END_IF 19\n\"];\n19->20;\n20[label=\"Node Type: RETURN 20\n\"];\n}\n",
+    "f(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->6[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: BEGIN_LOOP 4\n\"];\n4->7;\n5[label=\"Node Type: END_LOOP 5\n\"];\n5->16;\n6[label=\"Node Type: NEW VARIABLE 6\n\"];\n6->4;\n7[label=\"Node Type: IF_LOOP 7\n\"];\n7->8[label=\"True\"];\n7->5[label=\"False\"];\n8[label=\"Node Type: IF 8\n\"];\n8->9[label=\"True\"];\n8->13[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->11[label=\"False\"];\n10[label=\"Node Type: EXPRESSION 10\n\"];\n10->12;\n11[label=\"Node Type: THROW 11\n\"];\n12[label=\"Node Type: END_IF 12\n\"];\n12->14;\n13[label=\"Node Type: EXPRESSION 13\n\"];\n13->14;\n14[label=\"Node Type: END_IF 14\n\"];\n14->15;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->7;\n16[label=\"Node Type: END_IF 16\n\"];\n16->17;\n17[label=\"Node Type: RETURN 17\n\"];\n}\n",
+    "g(uint256,uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n2->3;\n3[label=\"Node Type: IF 3\n\"];\n3->4[label=\"True\"];\n3->7[label=\"False\"];\n4[label=\"Node Type: RETURN 4\n\"];\n5[label=\"Node Type: BEGIN_LOOP 5\n\"];\n5->8;\n6[label=\"Node Type: END_LOOP 6\n\"];\n6->19;\n7[label=\"Node Type: NEW VARIABLE 7\n\"];\n7->5;\n8[label=\"Node Type: IF_LOOP 8\n\"];\n8->9[label=\"True\"];\n8->6[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->15[label=\"False\"];\n10[label=\"Node Type: IF 10\n\"];\n10->11[label=\"True\"];\n10->13[label=\"False\"];\n11[label=\"Node Type: EXPRESSION 11\n\"];\n11->12;\n12[label=\"Node Type: EXPRESSION 12\n\"];\n12->14;\n13[label=\"Node Type: THROW 13\n\"];\n14[label=\"Node Type: END_IF 14\n\"];\n14->17;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->16;\n16[label=\"Node Type: EXPRESSION 16\n\"];\n16->17;\n17[label=\"Node Type: END_IF 17\n\"];\n17->18;\n18[label=\"Node Type: EXPRESSION 18\n\"];\n18->8;\n19[label=\"Node Type: END_IF 19\n\"];\n19->20;\n20[label=\"Node Type: RETURN 20\n\"];\n}\n",
     "h(C.St)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->4[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: EXPRESSION 4\n\"];\n4->5;\n5[label=\"Node Type: END_IF 5\n\"];\n5->6;\n6[label=\"Node Type: RETURN 6\n\"];\n}\n"
   }
 }
\ No newline at end of file
diff --git a/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.2-legacy.json b/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.2-legacy.json
index deb696dc7..e238554be 100644
--- a/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.2-legacy.json
+++ b/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.2-legacy.json
@@ -1,7 +1,7 @@
 {
   "C": {
-    "f(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->6[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: BEGIN_LOOP 4\n\"];\n4->7;\n5[label=\"Node Type: END_LOOP 5\n\"];\n5->16;\n6[label=\"Node Type: NEW VARIABLE 6\n\"];\n6->4;\n7[label=\"Node Type: IF_LOOP 7\n\"];\n7->8[label=\"True\"];\n7->5[label=\"False\"];\n8[label=\"Node Type: IF 8\n\"];\n8->9[label=\"True\"];\n8->13[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->11[label=\"False\"];\n10[label=\"Node Type: EXPRESSION 10\n\"];\n10->12;\n11[label=\"Node Type: THROW 11\n\"];\n11->17;\n12[label=\"Node Type: END_IF 12\n\"];\n12->14;\n13[label=\"Node Type: EXPRESSION 13\n\"];\n13->14;\n14[label=\"Node Type: END_IF 14\n\"];\n14->15;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->7;\n16[label=\"Node Type: END_IF 16\n\"];\n16->17;\n17[label=\"Node Type: RETURN 17\n\"];\n}\n",
-    "g(uint256,uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n2->3;\n3[label=\"Node Type: IF 3\n\"];\n3->4[label=\"True\"];\n3->7[label=\"False\"];\n4[label=\"Node Type: RETURN 4\n\"];\n5[label=\"Node Type: BEGIN_LOOP 5\n\"];\n5->8;\n6[label=\"Node Type: END_LOOP 6\n\"];\n6->19;\n7[label=\"Node Type: NEW VARIABLE 7\n\"];\n7->5;\n8[label=\"Node Type: IF_LOOP 8\n\"];\n8->9[label=\"True\"];\n8->6[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->15[label=\"False\"];\n10[label=\"Node Type: IF 10\n\"];\n10->11[label=\"True\"];\n10->13[label=\"False\"];\n11[label=\"Node Type: EXPRESSION 11\n\"];\n11->12;\n12[label=\"Node Type: EXPRESSION 12\n\"];\n12->14;\n13[label=\"Node Type: THROW 13\n\"];\n13->20;\n14[label=\"Node Type: END_IF 14\n\"];\n14->17;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->16;\n16[label=\"Node Type: EXPRESSION 16\n\"];\n16->17;\n17[label=\"Node Type: END_IF 17\n\"];\n17->18;\n18[label=\"Node Type: EXPRESSION 18\n\"];\n18->8;\n19[label=\"Node Type: END_IF 19\n\"];\n19->20;\n20[label=\"Node Type: RETURN 20\n\"];\n}\n",
+    "f(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->6[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: BEGIN_LOOP 4\n\"];\n4->7;\n5[label=\"Node Type: END_LOOP 5\n\"];\n5->16;\n6[label=\"Node Type: NEW VARIABLE 6\n\"];\n6->4;\n7[label=\"Node Type: IF_LOOP 7\n\"];\n7->8[label=\"True\"];\n7->5[label=\"False\"];\n8[label=\"Node Type: IF 8\n\"];\n8->9[label=\"True\"];\n8->13[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->11[label=\"False\"];\n10[label=\"Node Type: EXPRESSION 10\n\"];\n10->12;\n11[label=\"Node Type: THROW 11\n\"];\n12[label=\"Node Type: END_IF 12\n\"];\n12->14;\n13[label=\"Node Type: EXPRESSION 13\n\"];\n13->14;\n14[label=\"Node Type: END_IF 14\n\"];\n14->15;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->7;\n16[label=\"Node Type: END_IF 16\n\"];\n16->17;\n17[label=\"Node Type: RETURN 17\n\"];\n}\n",
+    "g(uint256,uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n2->3;\n3[label=\"Node Type: IF 3\n\"];\n3->4[label=\"True\"];\n3->7[label=\"False\"];\n4[label=\"Node Type: RETURN 4\n\"];\n5[label=\"Node Type: BEGIN_LOOP 5\n\"];\n5->8;\n6[label=\"Node Type: END_LOOP 6\n\"];\n6->19;\n7[label=\"Node Type: NEW VARIABLE 7\n\"];\n7->5;\n8[label=\"Node Type: IF_LOOP 8\n\"];\n8->9[label=\"True\"];\n8->6[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->15[label=\"False\"];\n10[label=\"Node Type: IF 10\n\"];\n10->11[label=\"True\"];\n10->13[label=\"False\"];\n11[label=\"Node Type: EXPRESSION 11\n\"];\n11->12;\n12[label=\"Node Type: EXPRESSION 12\n\"];\n12->14;\n13[label=\"Node Type: THROW 13\n\"];\n14[label=\"Node Type: END_IF 14\n\"];\n14->17;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->16;\n16[label=\"Node Type: EXPRESSION 16\n\"];\n16->17;\n17[label=\"Node Type: END_IF 17\n\"];\n17->18;\n18[label=\"Node Type: EXPRESSION 18\n\"];\n18->8;\n19[label=\"Node Type: END_IF 19\n\"];\n19->20;\n20[label=\"Node Type: RETURN 20\n\"];\n}\n",
     "h(C.St)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->4[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: EXPRESSION 4\n\"];\n4->5;\n5[label=\"Node Type: END_IF 5\n\"];\n5->6;\n6[label=\"Node Type: RETURN 6\n\"];\n}\n"
   }
 }
\ No newline at end of file
diff --git a/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.3-legacy.json b/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.3-legacy.json
index deb696dc7..e238554be 100644
--- a/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.3-legacy.json
+++ b/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.3-legacy.json
@@ -1,7 +1,7 @@
 {
   "C": {
-    "f(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->6[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: BEGIN_LOOP 4\n\"];\n4->7;\n5[label=\"Node Type: END_LOOP 5\n\"];\n5->16;\n6[label=\"Node Type: NEW VARIABLE 6\n\"];\n6->4;\n7[label=\"Node Type: IF_LOOP 7\n\"];\n7->8[label=\"True\"];\n7->5[label=\"False\"];\n8[label=\"Node Type: IF 8\n\"];\n8->9[label=\"True\"];\n8->13[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->11[label=\"False\"];\n10[label=\"Node Type: EXPRESSION 10\n\"];\n10->12;\n11[label=\"Node Type: THROW 11\n\"];\n11->17;\n12[label=\"Node Type: END_IF 12\n\"];\n12->14;\n13[label=\"Node Type: EXPRESSION 13\n\"];\n13->14;\n14[label=\"Node Type: END_IF 14\n\"];\n14->15;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->7;\n16[label=\"Node Type: END_IF 16\n\"];\n16->17;\n17[label=\"Node Type: RETURN 17\n\"];\n}\n",
-    "g(uint256,uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n2->3;\n3[label=\"Node Type: IF 3\n\"];\n3->4[label=\"True\"];\n3->7[label=\"False\"];\n4[label=\"Node Type: RETURN 4\n\"];\n5[label=\"Node Type: BEGIN_LOOP 5\n\"];\n5->8;\n6[label=\"Node Type: END_LOOP 6\n\"];\n6->19;\n7[label=\"Node Type: NEW VARIABLE 7\n\"];\n7->5;\n8[label=\"Node Type: IF_LOOP 8\n\"];\n8->9[label=\"True\"];\n8->6[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->15[label=\"False\"];\n10[label=\"Node Type: IF 10\n\"];\n10->11[label=\"True\"];\n10->13[label=\"False\"];\n11[label=\"Node Type: EXPRESSION 11\n\"];\n11->12;\n12[label=\"Node Type: EXPRESSION 12\n\"];\n12->14;\n13[label=\"Node Type: THROW 13\n\"];\n13->20;\n14[label=\"Node Type: END_IF 14\n\"];\n14->17;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->16;\n16[label=\"Node Type: EXPRESSION 16\n\"];\n16->17;\n17[label=\"Node Type: END_IF 17\n\"];\n17->18;\n18[label=\"Node Type: EXPRESSION 18\n\"];\n18->8;\n19[label=\"Node Type: END_IF 19\n\"];\n19->20;\n20[label=\"Node Type: RETURN 20\n\"];\n}\n",
+    "f(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->6[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: BEGIN_LOOP 4\n\"];\n4->7;\n5[label=\"Node Type: END_LOOP 5\n\"];\n5->16;\n6[label=\"Node Type: NEW VARIABLE 6\n\"];\n6->4;\n7[label=\"Node Type: IF_LOOP 7\n\"];\n7->8[label=\"True\"];\n7->5[label=\"False\"];\n8[label=\"Node Type: IF 8\n\"];\n8->9[label=\"True\"];\n8->13[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->11[label=\"False\"];\n10[label=\"Node Type: EXPRESSION 10\n\"];\n10->12;\n11[label=\"Node Type: THROW 11\n\"];\n12[label=\"Node Type: END_IF 12\n\"];\n12->14;\n13[label=\"Node Type: EXPRESSION 13\n\"];\n13->14;\n14[label=\"Node Type: END_IF 14\n\"];\n14->15;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->7;\n16[label=\"Node Type: END_IF 16\n\"];\n16->17;\n17[label=\"Node Type: RETURN 17\n\"];\n}\n",
+    "g(uint256,uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n2->3;\n3[label=\"Node Type: IF 3\n\"];\n3->4[label=\"True\"];\n3->7[label=\"False\"];\n4[label=\"Node Type: RETURN 4\n\"];\n5[label=\"Node Type: BEGIN_LOOP 5\n\"];\n5->8;\n6[label=\"Node Type: END_LOOP 6\n\"];\n6->19;\n7[label=\"Node Type: NEW VARIABLE 7\n\"];\n7->5;\n8[label=\"Node Type: IF_LOOP 8\n\"];\n8->9[label=\"True\"];\n8->6[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->15[label=\"False\"];\n10[label=\"Node Type: IF 10\n\"];\n10->11[label=\"True\"];\n10->13[label=\"False\"];\n11[label=\"Node Type: EXPRESSION 11\n\"];\n11->12;\n12[label=\"Node Type: EXPRESSION 12\n\"];\n12->14;\n13[label=\"Node Type: THROW 13\n\"];\n14[label=\"Node Type: END_IF 14\n\"];\n14->17;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->16;\n16[label=\"Node Type: EXPRESSION 16\n\"];\n16->17;\n17[label=\"Node Type: END_IF 17\n\"];\n17->18;\n18[label=\"Node Type: EXPRESSION 18\n\"];\n18->8;\n19[label=\"Node Type: END_IF 19\n\"];\n19->20;\n20[label=\"Node Type: RETURN 20\n\"];\n}\n",
     "h(C.St)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->4[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: EXPRESSION 4\n\"];\n4->5;\n5[label=\"Node Type: END_IF 5\n\"];\n5->6;\n6[label=\"Node Type: RETURN 6\n\"];\n}\n"
   }
 }
\ No newline at end of file
diff --git a/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.4-legacy.json b/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.4-legacy.json
index deb696dc7..e238554be 100644
--- a/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.4-legacy.json
+++ b/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.4-legacy.json
@@ -1,7 +1,7 @@
 {
   "C": {
-    "f(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->6[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: BEGIN_LOOP 4\n\"];\n4->7;\n5[label=\"Node Type: END_LOOP 5\n\"];\n5->16;\n6[label=\"Node Type: NEW VARIABLE 6\n\"];\n6->4;\n7[label=\"Node Type: IF_LOOP 7\n\"];\n7->8[label=\"True\"];\n7->5[label=\"False\"];\n8[label=\"Node Type: IF 8\n\"];\n8->9[label=\"True\"];\n8->13[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->11[label=\"False\"];\n10[label=\"Node Type: EXPRESSION 10\n\"];\n10->12;\n11[label=\"Node Type: THROW 11\n\"];\n11->17;\n12[label=\"Node Type: END_IF 12\n\"];\n12->14;\n13[label=\"Node Type: EXPRESSION 13\n\"];\n13->14;\n14[label=\"Node Type: END_IF 14\n\"];\n14->15;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->7;\n16[label=\"Node Type: END_IF 16\n\"];\n16->17;\n17[label=\"Node Type: RETURN 17\n\"];\n}\n",
-    "g(uint256,uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n2->3;\n3[label=\"Node Type: IF 3\n\"];\n3->4[label=\"True\"];\n3->7[label=\"False\"];\n4[label=\"Node Type: RETURN 4\n\"];\n5[label=\"Node Type: BEGIN_LOOP 5\n\"];\n5->8;\n6[label=\"Node Type: END_LOOP 6\n\"];\n6->19;\n7[label=\"Node Type: NEW VARIABLE 7\n\"];\n7->5;\n8[label=\"Node Type: IF_LOOP 8\n\"];\n8->9[label=\"True\"];\n8->6[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->15[label=\"False\"];\n10[label=\"Node Type: IF 10\n\"];\n10->11[label=\"True\"];\n10->13[label=\"False\"];\n11[label=\"Node Type: EXPRESSION 11\n\"];\n11->12;\n12[label=\"Node Type: EXPRESSION 12\n\"];\n12->14;\n13[label=\"Node Type: THROW 13\n\"];\n13->20;\n14[label=\"Node Type: END_IF 14\n\"];\n14->17;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->16;\n16[label=\"Node Type: EXPRESSION 16\n\"];\n16->17;\n17[label=\"Node Type: END_IF 17\n\"];\n17->18;\n18[label=\"Node Type: EXPRESSION 18\n\"];\n18->8;\n19[label=\"Node Type: END_IF 19\n\"];\n19->20;\n20[label=\"Node Type: RETURN 20\n\"];\n}\n",
+    "f(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->6[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: BEGIN_LOOP 4\n\"];\n4->7;\n5[label=\"Node Type: END_LOOP 5\n\"];\n5->16;\n6[label=\"Node Type: NEW VARIABLE 6\n\"];\n6->4;\n7[label=\"Node Type: IF_LOOP 7\n\"];\n7->8[label=\"True\"];\n7->5[label=\"False\"];\n8[label=\"Node Type: IF 8\n\"];\n8->9[label=\"True\"];\n8->13[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->11[label=\"False\"];\n10[label=\"Node Type: EXPRESSION 10\n\"];\n10->12;\n11[label=\"Node Type: THROW 11\n\"];\n12[label=\"Node Type: END_IF 12\n\"];\n12->14;\n13[label=\"Node Type: EXPRESSION 13\n\"];\n13->14;\n14[label=\"Node Type: END_IF 14\n\"];\n14->15;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->7;\n16[label=\"Node Type: END_IF 16\n\"];\n16->17;\n17[label=\"Node Type: RETURN 17\n\"];\n}\n",
+    "g(uint256,uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n2->3;\n3[label=\"Node Type: IF 3\n\"];\n3->4[label=\"True\"];\n3->7[label=\"False\"];\n4[label=\"Node Type: RETURN 4\n\"];\n5[label=\"Node Type: BEGIN_LOOP 5\n\"];\n5->8;\n6[label=\"Node Type: END_LOOP 6\n\"];\n6->19;\n7[label=\"Node Type: NEW VARIABLE 7\n\"];\n7->5;\n8[label=\"Node Type: IF_LOOP 8\n\"];\n8->9[label=\"True\"];\n8->6[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->15[label=\"False\"];\n10[label=\"Node Type: IF 10\n\"];\n10->11[label=\"True\"];\n10->13[label=\"False\"];\n11[label=\"Node Type: EXPRESSION 11\n\"];\n11->12;\n12[label=\"Node Type: EXPRESSION 12\n\"];\n12->14;\n13[label=\"Node Type: THROW 13\n\"];\n14[label=\"Node Type: END_IF 14\n\"];\n14->17;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->16;\n16[label=\"Node Type: EXPRESSION 16\n\"];\n16->17;\n17[label=\"Node Type: END_IF 17\n\"];\n17->18;\n18[label=\"Node Type: EXPRESSION 18\n\"];\n18->8;\n19[label=\"Node Type: END_IF 19\n\"];\n19->20;\n20[label=\"Node Type: RETURN 20\n\"];\n}\n",
     "h(C.St)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->4[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: EXPRESSION 4\n\"];\n4->5;\n5[label=\"Node Type: END_IF 5\n\"];\n5->6;\n6[label=\"Node Type: RETURN 6\n\"];\n}\n"
   }
 }
\ No newline at end of file
diff --git a/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.5-legacy.json b/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.5-legacy.json
index deb696dc7..e238554be 100644
--- a/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.5-legacy.json
+++ b/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.5-legacy.json
@@ -1,7 +1,7 @@
 {
   "C": {
-    "f(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->6[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: BEGIN_LOOP 4\n\"];\n4->7;\n5[label=\"Node Type: END_LOOP 5\n\"];\n5->16;\n6[label=\"Node Type: NEW VARIABLE 6\n\"];\n6->4;\n7[label=\"Node Type: IF_LOOP 7\n\"];\n7->8[label=\"True\"];\n7->5[label=\"False\"];\n8[label=\"Node Type: IF 8\n\"];\n8->9[label=\"True\"];\n8->13[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->11[label=\"False\"];\n10[label=\"Node Type: EXPRESSION 10\n\"];\n10->12;\n11[label=\"Node Type: THROW 11\n\"];\n11->17;\n12[label=\"Node Type: END_IF 12\n\"];\n12->14;\n13[label=\"Node Type: EXPRESSION 13\n\"];\n13->14;\n14[label=\"Node Type: END_IF 14\n\"];\n14->15;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->7;\n16[label=\"Node Type: END_IF 16\n\"];\n16->17;\n17[label=\"Node Type: RETURN 17\n\"];\n}\n",
-    "g(uint256,uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n2->3;\n3[label=\"Node Type: IF 3\n\"];\n3->4[label=\"True\"];\n3->7[label=\"False\"];\n4[label=\"Node Type: RETURN 4\n\"];\n5[label=\"Node Type: BEGIN_LOOP 5\n\"];\n5->8;\n6[label=\"Node Type: END_LOOP 6\n\"];\n6->19;\n7[label=\"Node Type: NEW VARIABLE 7\n\"];\n7->5;\n8[label=\"Node Type: IF_LOOP 8\n\"];\n8->9[label=\"True\"];\n8->6[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->15[label=\"False\"];\n10[label=\"Node Type: IF 10\n\"];\n10->11[label=\"True\"];\n10->13[label=\"False\"];\n11[label=\"Node Type: EXPRESSION 11\n\"];\n11->12;\n12[label=\"Node Type: EXPRESSION 12\n\"];\n12->14;\n13[label=\"Node Type: THROW 13\n\"];\n13->20;\n14[label=\"Node Type: END_IF 14\n\"];\n14->17;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->16;\n16[label=\"Node Type: EXPRESSION 16\n\"];\n16->17;\n17[label=\"Node Type: END_IF 17\n\"];\n17->18;\n18[label=\"Node Type: EXPRESSION 18\n\"];\n18->8;\n19[label=\"Node Type: END_IF 19\n\"];\n19->20;\n20[label=\"Node Type: RETURN 20\n\"];\n}\n",
+    "f(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->6[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: BEGIN_LOOP 4\n\"];\n4->7;\n5[label=\"Node Type: END_LOOP 5\n\"];\n5->16;\n6[label=\"Node Type: NEW VARIABLE 6\n\"];\n6->4;\n7[label=\"Node Type: IF_LOOP 7\n\"];\n7->8[label=\"True\"];\n7->5[label=\"False\"];\n8[label=\"Node Type: IF 8\n\"];\n8->9[label=\"True\"];\n8->13[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->11[label=\"False\"];\n10[label=\"Node Type: EXPRESSION 10\n\"];\n10->12;\n11[label=\"Node Type: THROW 11\n\"];\n12[label=\"Node Type: END_IF 12\n\"];\n12->14;\n13[label=\"Node Type: EXPRESSION 13\n\"];\n13->14;\n14[label=\"Node Type: END_IF 14\n\"];\n14->15;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->7;\n16[label=\"Node Type: END_IF 16\n\"];\n16->17;\n17[label=\"Node Type: RETURN 17\n\"];\n}\n",
+    "g(uint256,uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n2->3;\n3[label=\"Node Type: IF 3\n\"];\n3->4[label=\"True\"];\n3->7[label=\"False\"];\n4[label=\"Node Type: RETURN 4\n\"];\n5[label=\"Node Type: BEGIN_LOOP 5\n\"];\n5->8;\n6[label=\"Node Type: END_LOOP 6\n\"];\n6->19;\n7[label=\"Node Type: NEW VARIABLE 7\n\"];\n7->5;\n8[label=\"Node Type: IF_LOOP 8\n\"];\n8->9[label=\"True\"];\n8->6[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->15[label=\"False\"];\n10[label=\"Node Type: IF 10\n\"];\n10->11[label=\"True\"];\n10->13[label=\"False\"];\n11[label=\"Node Type: EXPRESSION 11\n\"];\n11->12;\n12[label=\"Node Type: EXPRESSION 12\n\"];\n12->14;\n13[label=\"Node Type: THROW 13\n\"];\n14[label=\"Node Type: END_IF 14\n\"];\n14->17;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->16;\n16[label=\"Node Type: EXPRESSION 16\n\"];\n16->17;\n17[label=\"Node Type: END_IF 17\n\"];\n17->18;\n18[label=\"Node Type: EXPRESSION 18\n\"];\n18->8;\n19[label=\"Node Type: END_IF 19\n\"];\n19->20;\n20[label=\"Node Type: RETURN 20\n\"];\n}\n",
     "h(C.St)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->4[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: EXPRESSION 4\n\"];\n4->5;\n5[label=\"Node Type: END_IF 5\n\"];\n5->6;\n6[label=\"Node Type: RETURN 6\n\"];\n}\n"
   }
 }
\ No newline at end of file
diff --git a/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.6-legacy.json b/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.6-legacy.json
index deb696dc7..e238554be 100644
--- a/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.6-legacy.json
+++ b/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.6-legacy.json
@@ -1,7 +1,7 @@
 {
   "C": {
-    "f(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->6[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: BEGIN_LOOP 4\n\"];\n4->7;\n5[label=\"Node Type: END_LOOP 5\n\"];\n5->16;\n6[label=\"Node Type: NEW VARIABLE 6\n\"];\n6->4;\n7[label=\"Node Type: IF_LOOP 7\n\"];\n7->8[label=\"True\"];\n7->5[label=\"False\"];\n8[label=\"Node Type: IF 8\n\"];\n8->9[label=\"True\"];\n8->13[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->11[label=\"False\"];\n10[label=\"Node Type: EXPRESSION 10\n\"];\n10->12;\n11[label=\"Node Type: THROW 11\n\"];\n11->17;\n12[label=\"Node Type: END_IF 12\n\"];\n12->14;\n13[label=\"Node Type: EXPRESSION 13\n\"];\n13->14;\n14[label=\"Node Type: END_IF 14\n\"];\n14->15;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->7;\n16[label=\"Node Type: END_IF 16\n\"];\n16->17;\n17[label=\"Node Type: RETURN 17\n\"];\n}\n",
-    "g(uint256,uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n2->3;\n3[label=\"Node Type: IF 3\n\"];\n3->4[label=\"True\"];\n3->7[label=\"False\"];\n4[label=\"Node Type: RETURN 4\n\"];\n5[label=\"Node Type: BEGIN_LOOP 5\n\"];\n5->8;\n6[label=\"Node Type: END_LOOP 6\n\"];\n6->19;\n7[label=\"Node Type: NEW VARIABLE 7\n\"];\n7->5;\n8[label=\"Node Type: IF_LOOP 8\n\"];\n8->9[label=\"True\"];\n8->6[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->15[label=\"False\"];\n10[label=\"Node Type: IF 10\n\"];\n10->11[label=\"True\"];\n10->13[label=\"False\"];\n11[label=\"Node Type: EXPRESSION 11\n\"];\n11->12;\n12[label=\"Node Type: EXPRESSION 12\n\"];\n12->14;\n13[label=\"Node Type: THROW 13\n\"];\n13->20;\n14[label=\"Node Type: END_IF 14\n\"];\n14->17;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->16;\n16[label=\"Node Type: EXPRESSION 16\n\"];\n16->17;\n17[label=\"Node Type: END_IF 17\n\"];\n17->18;\n18[label=\"Node Type: EXPRESSION 18\n\"];\n18->8;\n19[label=\"Node Type: END_IF 19\n\"];\n19->20;\n20[label=\"Node Type: RETURN 20\n\"];\n}\n",
+    "f(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->6[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: BEGIN_LOOP 4\n\"];\n4->7;\n5[label=\"Node Type: END_LOOP 5\n\"];\n5->16;\n6[label=\"Node Type: NEW VARIABLE 6\n\"];\n6->4;\n7[label=\"Node Type: IF_LOOP 7\n\"];\n7->8[label=\"True\"];\n7->5[label=\"False\"];\n8[label=\"Node Type: IF 8\n\"];\n8->9[label=\"True\"];\n8->13[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->11[label=\"False\"];\n10[label=\"Node Type: EXPRESSION 10\n\"];\n10->12;\n11[label=\"Node Type: THROW 11\n\"];\n12[label=\"Node Type: END_IF 12\n\"];\n12->14;\n13[label=\"Node Type: EXPRESSION 13\n\"];\n13->14;\n14[label=\"Node Type: END_IF 14\n\"];\n14->15;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->7;\n16[label=\"Node Type: END_IF 16\n\"];\n16->17;\n17[label=\"Node Type: RETURN 17\n\"];\n}\n",
+    "g(uint256,uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n2->3;\n3[label=\"Node Type: IF 3\n\"];\n3->4[label=\"True\"];\n3->7[label=\"False\"];\n4[label=\"Node Type: RETURN 4\n\"];\n5[label=\"Node Type: BEGIN_LOOP 5\n\"];\n5->8;\n6[label=\"Node Type: END_LOOP 6\n\"];\n6->19;\n7[label=\"Node Type: NEW VARIABLE 7\n\"];\n7->5;\n8[label=\"Node Type: IF_LOOP 8\n\"];\n8->9[label=\"True\"];\n8->6[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->15[label=\"False\"];\n10[label=\"Node Type: IF 10\n\"];\n10->11[label=\"True\"];\n10->13[label=\"False\"];\n11[label=\"Node Type: EXPRESSION 11\n\"];\n11->12;\n12[label=\"Node Type: EXPRESSION 12\n\"];\n12->14;\n13[label=\"Node Type: THROW 13\n\"];\n14[label=\"Node Type: END_IF 14\n\"];\n14->17;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->16;\n16[label=\"Node Type: EXPRESSION 16\n\"];\n16->17;\n17[label=\"Node Type: END_IF 17\n\"];\n17->18;\n18[label=\"Node Type: EXPRESSION 18\n\"];\n18->8;\n19[label=\"Node Type: END_IF 19\n\"];\n19->20;\n20[label=\"Node Type: RETURN 20\n\"];\n}\n",
     "h(C.St)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->4[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: EXPRESSION 4\n\"];\n4->5;\n5[label=\"Node Type: END_IF 5\n\"];\n5->6;\n6[label=\"Node Type: RETURN 6\n\"];\n}\n"
   }
 }
\ No newline at end of file
diff --git a/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.7-legacy.json b/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.7-legacy.json
index deb696dc7..e238554be 100644
--- a/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.7-legacy.json
+++ b/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.7-legacy.json
@@ -1,7 +1,7 @@
 {
   "C": {
-    "f(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->6[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: BEGIN_LOOP 4\n\"];\n4->7;\n5[label=\"Node Type: END_LOOP 5\n\"];\n5->16;\n6[label=\"Node Type: NEW VARIABLE 6\n\"];\n6->4;\n7[label=\"Node Type: IF_LOOP 7\n\"];\n7->8[label=\"True\"];\n7->5[label=\"False\"];\n8[label=\"Node Type: IF 8\n\"];\n8->9[label=\"True\"];\n8->13[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->11[label=\"False\"];\n10[label=\"Node Type: EXPRESSION 10\n\"];\n10->12;\n11[label=\"Node Type: THROW 11\n\"];\n11->17;\n12[label=\"Node Type: END_IF 12\n\"];\n12->14;\n13[label=\"Node Type: EXPRESSION 13\n\"];\n13->14;\n14[label=\"Node Type: END_IF 14\n\"];\n14->15;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->7;\n16[label=\"Node Type: END_IF 16\n\"];\n16->17;\n17[label=\"Node Type: RETURN 17\n\"];\n}\n",
-    "g(uint256,uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n2->3;\n3[label=\"Node Type: IF 3\n\"];\n3->4[label=\"True\"];\n3->7[label=\"False\"];\n4[label=\"Node Type: RETURN 4\n\"];\n5[label=\"Node Type: BEGIN_LOOP 5\n\"];\n5->8;\n6[label=\"Node Type: END_LOOP 6\n\"];\n6->19;\n7[label=\"Node Type: NEW VARIABLE 7\n\"];\n7->5;\n8[label=\"Node Type: IF_LOOP 8\n\"];\n8->9[label=\"True\"];\n8->6[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->15[label=\"False\"];\n10[label=\"Node Type: IF 10\n\"];\n10->11[label=\"True\"];\n10->13[label=\"False\"];\n11[label=\"Node Type: EXPRESSION 11\n\"];\n11->12;\n12[label=\"Node Type: EXPRESSION 12\n\"];\n12->14;\n13[label=\"Node Type: THROW 13\n\"];\n13->20;\n14[label=\"Node Type: END_IF 14\n\"];\n14->17;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->16;\n16[label=\"Node Type: EXPRESSION 16\n\"];\n16->17;\n17[label=\"Node Type: END_IF 17\n\"];\n17->18;\n18[label=\"Node Type: EXPRESSION 18\n\"];\n18->8;\n19[label=\"Node Type: END_IF 19\n\"];\n19->20;\n20[label=\"Node Type: RETURN 20\n\"];\n}\n",
+    "f(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->6[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: BEGIN_LOOP 4\n\"];\n4->7;\n5[label=\"Node Type: END_LOOP 5\n\"];\n5->16;\n6[label=\"Node Type: NEW VARIABLE 6\n\"];\n6->4;\n7[label=\"Node Type: IF_LOOP 7\n\"];\n7->8[label=\"True\"];\n7->5[label=\"False\"];\n8[label=\"Node Type: IF 8\n\"];\n8->9[label=\"True\"];\n8->13[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->11[label=\"False\"];\n10[label=\"Node Type: EXPRESSION 10\n\"];\n10->12;\n11[label=\"Node Type: THROW 11\n\"];\n12[label=\"Node Type: END_IF 12\n\"];\n12->14;\n13[label=\"Node Type: EXPRESSION 13\n\"];\n13->14;\n14[label=\"Node Type: END_IF 14\n\"];\n14->15;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->7;\n16[label=\"Node Type: END_IF 16\n\"];\n16->17;\n17[label=\"Node Type: RETURN 17\n\"];\n}\n",
+    "g(uint256,uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n2->3;\n3[label=\"Node Type: IF 3\n\"];\n3->4[label=\"True\"];\n3->7[label=\"False\"];\n4[label=\"Node Type: RETURN 4\n\"];\n5[label=\"Node Type: BEGIN_LOOP 5\n\"];\n5->8;\n6[label=\"Node Type: END_LOOP 6\n\"];\n6->19;\n7[label=\"Node Type: NEW VARIABLE 7\n\"];\n7->5;\n8[label=\"Node Type: IF_LOOP 8\n\"];\n8->9[label=\"True\"];\n8->6[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->15[label=\"False\"];\n10[label=\"Node Type: IF 10\n\"];\n10->11[label=\"True\"];\n10->13[label=\"False\"];\n11[label=\"Node Type: EXPRESSION 11\n\"];\n11->12;\n12[label=\"Node Type: EXPRESSION 12\n\"];\n12->14;\n13[label=\"Node Type: THROW 13\n\"];\n14[label=\"Node Type: END_IF 14\n\"];\n14->17;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->16;\n16[label=\"Node Type: EXPRESSION 16\n\"];\n16->17;\n17[label=\"Node Type: END_IF 17\n\"];\n17->18;\n18[label=\"Node Type: EXPRESSION 18\n\"];\n18->8;\n19[label=\"Node Type: END_IF 19\n\"];\n19->20;\n20[label=\"Node Type: RETURN 20\n\"];\n}\n",
     "h(C.St)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->4[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: EXPRESSION 4\n\"];\n4->5;\n5[label=\"Node Type: END_IF 5\n\"];\n5->6;\n6[label=\"Node Type: RETURN 6\n\"];\n}\n"
   }
 }
\ No newline at end of file
diff --git a/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.8-legacy.json b/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.8-legacy.json
index deb696dc7..e238554be 100644
--- a/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.8-legacy.json
+++ b/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.8-legacy.json
@@ -1,7 +1,7 @@
 {
   "C": {
-    "f(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->6[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: BEGIN_LOOP 4\n\"];\n4->7;\n5[label=\"Node Type: END_LOOP 5\n\"];\n5->16;\n6[label=\"Node Type: NEW VARIABLE 6\n\"];\n6->4;\n7[label=\"Node Type: IF_LOOP 7\n\"];\n7->8[label=\"True\"];\n7->5[label=\"False\"];\n8[label=\"Node Type: IF 8\n\"];\n8->9[label=\"True\"];\n8->13[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->11[label=\"False\"];\n10[label=\"Node Type: EXPRESSION 10\n\"];\n10->12;\n11[label=\"Node Type: THROW 11\n\"];\n11->17;\n12[label=\"Node Type: END_IF 12\n\"];\n12->14;\n13[label=\"Node Type: EXPRESSION 13\n\"];\n13->14;\n14[label=\"Node Type: END_IF 14\n\"];\n14->15;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->7;\n16[label=\"Node Type: END_IF 16\n\"];\n16->17;\n17[label=\"Node Type: RETURN 17\n\"];\n}\n",
-    "g(uint256,uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n2->3;\n3[label=\"Node Type: IF 3\n\"];\n3->4[label=\"True\"];\n3->7[label=\"False\"];\n4[label=\"Node Type: RETURN 4\n\"];\n5[label=\"Node Type: BEGIN_LOOP 5\n\"];\n5->8;\n6[label=\"Node Type: END_LOOP 6\n\"];\n6->19;\n7[label=\"Node Type: NEW VARIABLE 7\n\"];\n7->5;\n8[label=\"Node Type: IF_LOOP 8\n\"];\n8->9[label=\"True\"];\n8->6[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->15[label=\"False\"];\n10[label=\"Node Type: IF 10\n\"];\n10->11[label=\"True\"];\n10->13[label=\"False\"];\n11[label=\"Node Type: EXPRESSION 11\n\"];\n11->12;\n12[label=\"Node Type: EXPRESSION 12\n\"];\n12->14;\n13[label=\"Node Type: THROW 13\n\"];\n13->20;\n14[label=\"Node Type: END_IF 14\n\"];\n14->17;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->16;\n16[label=\"Node Type: EXPRESSION 16\n\"];\n16->17;\n17[label=\"Node Type: END_IF 17\n\"];\n17->18;\n18[label=\"Node Type: EXPRESSION 18\n\"];\n18->8;\n19[label=\"Node Type: END_IF 19\n\"];\n19->20;\n20[label=\"Node Type: RETURN 20\n\"];\n}\n",
+    "f(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->6[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: BEGIN_LOOP 4\n\"];\n4->7;\n5[label=\"Node Type: END_LOOP 5\n\"];\n5->16;\n6[label=\"Node Type: NEW VARIABLE 6\n\"];\n6->4;\n7[label=\"Node Type: IF_LOOP 7\n\"];\n7->8[label=\"True\"];\n7->5[label=\"False\"];\n8[label=\"Node Type: IF 8\n\"];\n8->9[label=\"True\"];\n8->13[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->11[label=\"False\"];\n10[label=\"Node Type: EXPRESSION 10\n\"];\n10->12;\n11[label=\"Node Type: THROW 11\n\"];\n12[label=\"Node Type: END_IF 12\n\"];\n12->14;\n13[label=\"Node Type: EXPRESSION 13\n\"];\n13->14;\n14[label=\"Node Type: END_IF 14\n\"];\n14->15;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->7;\n16[label=\"Node Type: END_IF 16\n\"];\n16->17;\n17[label=\"Node Type: RETURN 17\n\"];\n}\n",
+    "g(uint256,uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n2->3;\n3[label=\"Node Type: IF 3\n\"];\n3->4[label=\"True\"];\n3->7[label=\"False\"];\n4[label=\"Node Type: RETURN 4\n\"];\n5[label=\"Node Type: BEGIN_LOOP 5\n\"];\n5->8;\n6[label=\"Node Type: END_LOOP 6\n\"];\n6->19;\n7[label=\"Node Type: NEW VARIABLE 7\n\"];\n7->5;\n8[label=\"Node Type: IF_LOOP 8\n\"];\n8->9[label=\"True\"];\n8->6[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->15[label=\"False\"];\n10[label=\"Node Type: IF 10\n\"];\n10->11[label=\"True\"];\n10->13[label=\"False\"];\n11[label=\"Node Type: EXPRESSION 11\n\"];\n11->12;\n12[label=\"Node Type: EXPRESSION 12\n\"];\n12->14;\n13[label=\"Node Type: THROW 13\n\"];\n14[label=\"Node Type: END_IF 14\n\"];\n14->17;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->16;\n16[label=\"Node Type: EXPRESSION 16\n\"];\n16->17;\n17[label=\"Node Type: END_IF 17\n\"];\n17->18;\n18[label=\"Node Type: EXPRESSION 18\n\"];\n18->8;\n19[label=\"Node Type: END_IF 19\n\"];\n19->20;\n20[label=\"Node Type: RETURN 20\n\"];\n}\n",
     "h(C.St)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->4[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: EXPRESSION 4\n\"];\n4->5;\n5[label=\"Node Type: END_IF 5\n\"];\n5->6;\n6[label=\"Node Type: RETURN 6\n\"];\n}\n"
   }
 }
\ No newline at end of file
diff --git a/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.9-legacy.json b/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.9-legacy.json
index deb696dc7..e238554be 100644
--- a/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.9-legacy.json
+++ b/tests/e2e/solc_parsing/test_data/expected/implicit-return-0.4.0.sol-0.4.9-legacy.json
@@ -1,7 +1,7 @@
 {
   "C": {
-    "f(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->6[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: BEGIN_LOOP 4\n\"];\n4->7;\n5[label=\"Node Type: END_LOOP 5\n\"];\n5->16;\n6[label=\"Node Type: NEW VARIABLE 6\n\"];\n6->4;\n7[label=\"Node Type: IF_LOOP 7\n\"];\n7->8[label=\"True\"];\n7->5[label=\"False\"];\n8[label=\"Node Type: IF 8\n\"];\n8->9[label=\"True\"];\n8->13[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->11[label=\"False\"];\n10[label=\"Node Type: EXPRESSION 10\n\"];\n10->12;\n11[label=\"Node Type: THROW 11\n\"];\n11->17;\n12[label=\"Node Type: END_IF 12\n\"];\n12->14;\n13[label=\"Node Type: EXPRESSION 13\n\"];\n13->14;\n14[label=\"Node Type: END_IF 14\n\"];\n14->15;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->7;\n16[label=\"Node Type: END_IF 16\n\"];\n16->17;\n17[label=\"Node Type: RETURN 17\n\"];\n}\n",
-    "g(uint256,uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n2->3;\n3[label=\"Node Type: IF 3\n\"];\n3->4[label=\"True\"];\n3->7[label=\"False\"];\n4[label=\"Node Type: RETURN 4\n\"];\n5[label=\"Node Type: BEGIN_LOOP 5\n\"];\n5->8;\n6[label=\"Node Type: END_LOOP 6\n\"];\n6->19;\n7[label=\"Node Type: NEW VARIABLE 7\n\"];\n7->5;\n8[label=\"Node Type: IF_LOOP 8\n\"];\n8->9[label=\"True\"];\n8->6[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->15[label=\"False\"];\n10[label=\"Node Type: IF 10\n\"];\n10->11[label=\"True\"];\n10->13[label=\"False\"];\n11[label=\"Node Type: EXPRESSION 11\n\"];\n11->12;\n12[label=\"Node Type: EXPRESSION 12\n\"];\n12->14;\n13[label=\"Node Type: THROW 13\n\"];\n13->20;\n14[label=\"Node Type: END_IF 14\n\"];\n14->17;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->16;\n16[label=\"Node Type: EXPRESSION 16\n\"];\n16->17;\n17[label=\"Node Type: END_IF 17\n\"];\n17->18;\n18[label=\"Node Type: EXPRESSION 18\n\"];\n18->8;\n19[label=\"Node Type: END_IF 19\n\"];\n19->20;\n20[label=\"Node Type: RETURN 20\n\"];\n}\n",
+    "f(uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->6[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: BEGIN_LOOP 4\n\"];\n4->7;\n5[label=\"Node Type: END_LOOP 5\n\"];\n5->16;\n6[label=\"Node Type: NEW VARIABLE 6\n\"];\n6->4;\n7[label=\"Node Type: IF_LOOP 7\n\"];\n7->8[label=\"True\"];\n7->5[label=\"False\"];\n8[label=\"Node Type: IF 8\n\"];\n8->9[label=\"True\"];\n8->13[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->11[label=\"False\"];\n10[label=\"Node Type: EXPRESSION 10\n\"];\n10->12;\n11[label=\"Node Type: THROW 11\n\"];\n12[label=\"Node Type: END_IF 12\n\"];\n12->14;\n13[label=\"Node Type: EXPRESSION 13\n\"];\n13->14;\n14[label=\"Node Type: END_IF 14\n\"];\n14->15;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->7;\n16[label=\"Node Type: END_IF 16\n\"];\n16->17;\n17[label=\"Node Type: RETURN 17\n\"];\n}\n",
+    "g(uint256,uint256)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: EXPRESSION 2\n\"];\n2->3;\n3[label=\"Node Type: IF 3\n\"];\n3->4[label=\"True\"];\n3->7[label=\"False\"];\n4[label=\"Node Type: RETURN 4\n\"];\n5[label=\"Node Type: BEGIN_LOOP 5\n\"];\n5->8;\n6[label=\"Node Type: END_LOOP 6\n\"];\n6->19;\n7[label=\"Node Type: NEW VARIABLE 7\n\"];\n7->5;\n8[label=\"Node Type: IF_LOOP 8\n\"];\n8->9[label=\"True\"];\n8->6[label=\"False\"];\n9[label=\"Node Type: IF 9\n\"];\n9->10[label=\"True\"];\n9->15[label=\"False\"];\n10[label=\"Node Type: IF 10\n\"];\n10->11[label=\"True\"];\n10->13[label=\"False\"];\n11[label=\"Node Type: EXPRESSION 11\n\"];\n11->12;\n12[label=\"Node Type: EXPRESSION 12\n\"];\n12->14;\n13[label=\"Node Type: THROW 13\n\"];\n14[label=\"Node Type: END_IF 14\n\"];\n14->17;\n15[label=\"Node Type: EXPRESSION 15\n\"];\n15->16;\n16[label=\"Node Type: EXPRESSION 16\n\"];\n16->17;\n17[label=\"Node Type: END_IF 17\n\"];\n17->18;\n18[label=\"Node Type: EXPRESSION 18\n\"];\n18->8;\n19[label=\"Node Type: END_IF 19\n\"];\n19->20;\n20[label=\"Node Type: RETURN 20\n\"];\n}\n",
     "h(C.St)": "digraph{\n0[label=\"Node Type: ENTRY_POINT 0\n\"];\n0->1;\n1[label=\"Node Type: EXPRESSION 1\n\"];\n1->2;\n2[label=\"Node Type: IF 2\n\"];\n2->3[label=\"True\"];\n2->4[label=\"False\"];\n3[label=\"Node Type: RETURN 3\n\"];\n4[label=\"Node Type: EXPRESSION 4\n\"];\n4->5;\n5[label=\"Node Type: END_IF 5\n\"];\n5->6;\n6[label=\"Node Type: RETURN 6\n\"];\n}\n"
   }
 }
\ No newline at end of file