diff --git a/micro-benchmark-autogen-templates/python_features/assignments/starred/main_gt.json b/micro-benchmark-autogen-templates/python_features/assignments/starred/main_gt.json
index 0aa56cdff..1a67dc737 100644
--- a/micro-benchmark-autogen-templates/python_features/assignments/starred/main_gt.json
+++ b/micro-benchmark-autogen-templates/python_features/assignments/starred/main_gt.json
@@ -65,8 +65,8 @@
         },
         {
             "file": "main.py",
-            "line_number": 18,
-            "col_offset": 8,
+            "line_number": 17,
+            "col_offset": 5,
             "variable": "b[0]",
             "type": [
                 "callable"
@@ -74,8 +74,8 @@
         },
         {
             "file": "main.py",
-            "line_number": 18,
-            "col_offset": 8,
+            "line_number": 17,
+            "col_offset": 5,
             "variable": "b[1]",
             "type": [
                 "callable"
@@ -127,4 +127,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/micro-benchmark-autogen-templates/python_features/builtins/functions/main_gt.json b/micro-benchmark-autogen-templates/python_features/builtins/functions/main_gt.json
index d6a0da903..66e2020f8 100644
--- a/micro-benchmark-autogen-templates/python_features/builtins/functions/main_gt.json
+++ b/micro-benchmark-autogen-templates/python_features/builtins/functions/main_gt.json
@@ -47,7 +47,7 @@
             "col_offset": 1,
             "variable": "total",
             "type": [
-                "int"
+                "<value1>"
             ]
         },
         {
@@ -56,7 +56,7 @@
             "col_offset": 1,
             "variable": "largest",
             "type": [
-                "int"
+                "<value1>"
             ]
         },
         {
@@ -65,7 +65,7 @@
             "col_offset": 1,
             "variable": "smallest",
             "type": [
-                "int"
+                "<value1>"
             ]
         },
         {
@@ -96,4 +96,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/micro-benchmark-autogen-templates/python_features/dicts/update/main_gt.json b/micro-benchmark-autogen-templates/python_features/dicts/update/main_gt.json
index 1e7cfa0fa..b3a804265 100644
--- a/micro-benchmark-autogen-templates/python_features/dicts/update/main_gt.json
+++ b/micro-benchmark-autogen-templates/python_features/dicts/update/main_gt.json
@@ -46,15 +46,6 @@
                 "callable"
             ]
         },
-        {
-            "file": "main.py",
-            "line_number": 14,
-            "col_offset": 1,
-            "variable": "d['a']",
-            "type": [
-                "callable"
-            ]
-        },
         {
             "file": "main.py",
             "line_number": 15,
@@ -65,4 +56,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/micro-benchmark-autogen-templates/python_features/dicts/zip/main.py b/micro-benchmark-autogen-templates/python_features/dicts/zip/main.py
index c54c7fd85..94cd89512 100644
--- a/micro-benchmark-autogen-templates/python_features/dicts/zip/main.py
+++ b/micro-benchmark-autogen-templates/python_features/dicts/zip/main.py
@@ -1,6 +1,6 @@
 # Creating dictionaries from lists using the zip() function
 
 
-keys = [<value1>, <value1>, <value1>]
-values = [<value2>, <value2>, <value2>]
+keys = ['a', 0, True]
+values = [<value1>, <value2>, <value1>]
 my_dict = dict(zip(keys, values))
diff --git a/micro-benchmark-autogen-templates/python_features/dicts/zip/main_gt.json b/micro-benchmark-autogen-templates/python_features/dicts/zip/main_gt.json
index 4dc024198..75b927fd3 100644
--- a/micro-benchmark-autogen-templates/python_features/dicts/zip/main_gt.json
+++ b/micro-benchmark-autogen-templates/python_features/dicts/zip/main_gt.json
@@ -22,7 +22,7 @@
             "col_offset": 1,
             "variable": "keys[0]",
             "type": [
-                "<value1>"
+                "str"
             ]
         },
         {
@@ -31,7 +31,7 @@
             "col_offset": 1,
             "variable": "keys[1]",
             "type": [
-                "<value1>"
+                "int"
             ]
         },
         {
@@ -40,7 +40,7 @@
             "col_offset": 1,
             "variable": "keys[2]",
             "type": [
-                "<value1>"
+                "bool"
             ]
         },
         {
@@ -58,7 +58,7 @@
             "col_offset": 1,
             "variable": "values[0]",
             "type": [
-                "<value2>"
+                "<value1>"
             ]
         },
         {
@@ -76,7 +76,7 @@
             "col_offset": 1,
             "variable": "values[2]",
             "type": [
-                "<value2>"
+                "<value1>"
             ]
         },
         {
@@ -94,14 +94,14 @@
             "col_offset": 1,
             "variable": "my_dict['a']",
             "type": [
-                "<value2>"
+                "<value1>"
             ]
         },
         {
             "file": "main.py",
             "line_number": 6,
             "col_offset": 1,
-            "variable": "my_dict['b']",
+            "variable": "my_dict[0]",
             "type": [
                 "<value2>"
             ]
@@ -110,10 +110,10 @@
             "file": "main.py",
             "line_number": 6,
             "col_offset": 1,
-            "variable": "my_dict['c']",
+            "variable": "my_dict[True]",
             "type": [
-                "<value2>"
+                "<value1>"
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/micro-benchmark-autogen-templates/python_features/generators/iterable/main.py b/micro-benchmark-autogen-templates/python_features/generators/iterable/main.py
index 5bd3c54e1..b9e10bdab 100644
--- a/micro-benchmark-autogen-templates/python_features/generators/iterable/main.py
+++ b/micro-benchmark-autogen-templates/python_features/generators/iterable/main.py
@@ -11,7 +11,7 @@ def __iter__(self):
 
     def __next__(self):
         if self.num < self.n:
-            cur, self.num = self.num, self.num + <value1>
+            cur, self.num = <value1> * self.num, self.num + 1
             return cur
         else:
             raise StopIteration()
diff --git a/micro-benchmark-autogen-templates/python_features/generators/iterable/main_gt.json b/micro-benchmark-autogen-templates/python_features/generators/iterable/main_gt.json
index 713816eec..4e3b1a1c5 100644
--- a/micro-benchmark-autogen-templates/python_features/generators/iterable/main_gt.json
+++ b/micro-benchmark-autogen-templates/python_features/generators/iterable/main_gt.json
@@ -1,7 +1,9 @@
 {
     "replacement_mode": "Complex",
     "type_replacements": [
-        "int"
+        "int",
+        "str",
+        "float"
     ],
     "ground_truth": [
         {
@@ -49,7 +51,7 @@
             "col_offset": 9,
             "function": "func.__next__",
             "type": [
-                "int"
+                "<value1>"
             ]
         },
         {
@@ -59,7 +61,7 @@
             "variable": "cur",
             "function": "func.__next__",
             "type": [
-                "int"
+                "<value1>"
             ]
         },
         {
@@ -87,7 +89,7 @@
             "col_offset": 1,
             "variable": "output_list[0]",
             "type": [
-                "int"
+                "<value1>"
             ]
         },
         {
@@ -96,7 +98,7 @@
             "col_offset": 1,
             "variable": "output_list[1]",
             "type": [
-                "int"
+                "<value1>"
             ]
         },
         {
@@ -105,7 +107,7 @@
             "col_offset": 1,
             "variable": "output_list[2]",
             "type": [
-                "int"
+                "<value1>"
             ]
         },
         {
diff --git a/micro-benchmark-autogen-templates/python_features/generators/iterable_assigned/main_gt.json b/micro-benchmark-autogen-templates/python_features/generators/iterable_assigned/main_gt.json
index 740452e7d..ebef48ed0 100644
--- a/micro-benchmark-autogen-templates/python_features/generators/iterable_assigned/main_gt.json
+++ b/micro-benchmark-autogen-templates/python_features/generators/iterable_assigned/main_gt.json
@@ -62,7 +62,7 @@
             "variable": "result",
             "function": "Cls.__next__",
             "type": [
-                "int"
+                "<value1>"
             ]
         },
         {
diff --git a/micro-benchmark-autogen-templates/python_features/imports/import_as/main_gt.json b/micro-benchmark-autogen-templates/python_features/imports/import_as/main_gt.json
index 2d8d47e3a..46bf37f1d 100644
--- a/micro-benchmark-autogen-templates/python_features/imports/import_as/main_gt.json
+++ b/micro-benchmark-autogen-templates/python_features/imports/import_as/main_gt.json
@@ -28,7 +28,7 @@
             "col_offset": 1,
             "variable": "a",
             "type": [
-                "str"
+                "<value1>"
             ]
         },
         {
@@ -41,4 +41,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/micro-benchmark-autogen-templates/python_features/returns/return_lambda/main_gt.json b/micro-benchmark-autogen-templates/python_features/returns/return_lambda/main_gt.json
index 788cb4935..1054004c7 100644
--- a/micro-benchmark-autogen-templates/python_features/returns/return_lambda/main_gt.json
+++ b/micro-benchmark-autogen-templates/python_features/returns/return_lambda/main_gt.json
@@ -18,7 +18,7 @@
             "file": "main.py",
             "line_number": 5,
             "col_offset": 19,
-            "function": "func",
+            "function": "lambda",
             "variable": "x",
             "type": [
                 "<value1>",
@@ -53,4 +53,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/micro-benchmark/python_features/dicts/update/main_gt.json b/micro-benchmark/python_features/dicts/update/main_gt.json
index a28ae31a7..23c294773 100644
--- a/micro-benchmark/python_features/dicts/update/main_gt.json
+++ b/micro-benchmark/python_features/dicts/update/main_gt.json
@@ -35,15 +35,6 @@
             "callable"
         ]
     },
-    {
-        "file": "main.py",
-        "line_number": 14,
-        "col_offset": 1,
-        "variable": "d['a']",
-        "type": [
-            "callable"
-        ]
-    },
     {
         "file": "main.py",
         "line_number": 15,