diff --git a/tests/simple/testdata/block_ext.textproto b/tests/simple/testdata/block_ext.textproto
index 7c89739..baa7b80 100644
--- a/tests/simple/testdata/block_ext.textproto
+++ b/tests/simple/testdata/block_ext.textproto
@@ -267,6 +267,10 @@ section: {
     value: {
       int64_value: 6
     }
+    type_env: {
+      name: "msg"
+      ident: { type: { message_type: "google.api.expr.test.v1.proto3.TestAllTypes" }}
+    }
     bindings: {
       key: "msg"
       value: {
@@ -309,6 +313,10 @@ section: {
     value: {
       int64_value: 31
     }
+    type_env: {
+      name: "msg"
+      ident: { type: { message_type: "google.api.expr.test.v1.proto3.TestAllTypes" }}
+    }
     bindings: {
       key: "msg"
       value: {
@@ -351,6 +359,10 @@ section: {
     value: {
       bool_value: true
     }
+    type_env: {
+      name: "msg"
+      ident: { type: { message_type: "google.api.expr.test.v1.proto3.TestAllTypes" }}
+    }
     bindings: {
       key: "msg"
       value: {
@@ -393,6 +405,10 @@ section: {
     value: {
       int64_value: 15
     }
+    type_env: {
+      name: "msg"
+      ident: { type: { message_type: "google.api.expr.test.v1.proto3.TestAllTypes" }}
+    }
     bindings: {
       key: "msg"
       value: {
@@ -435,6 +451,10 @@ section: {
     value: {
       int64_value: 8
     }
+    type_env: {
+      name: "msg"
+      ident: { type: { message_type: "google.api.expr.test.v1.proto3.TestAllTypes" }}
+    }
     bindings: {
       key: "msg"
       value: {
@@ -477,6 +497,10 @@ section: {
     value: {
       int64_value: 3
     }
+    type_env: {
+      name: "msg"
+      ident: { type: { message_type: "google.api.expr.test.v1.proto3.TestAllTypes" }}
+    }
     bindings: {
       key: "msg"
       value: {
@@ -519,6 +543,10 @@ section: {
     value: {
       int64_value: 8
     }
+    type_env: {
+      name: "msg"
+      ident: { type: { message_type: "google.api.expr.test.v1.proto3.TestAllTypes" }}
+    }
     bindings: {
       key: "msg"
       value: {
@@ -671,6 +699,10 @@ section: {
     value: {
       bool_value: true
     }
+    type_env: {
+      name: "x"
+      ident: { type: { primitive: INT64 }}
+    }
     bindings: {
       key: "x"
       value: {
@@ -759,6 +791,10 @@ section: {
         }
       }
     }
+    type_env: {
+      name: "x"
+      ident: { type: { primitive: INT64 }}
+    }
     bindings: {
       key: "x"
       value: {
@@ -802,6 +838,10 @@ section: {
     value: {
       int64_value: 10
     }
+    type_env: {
+      name: "msg"
+      ident: { type: { message_type: "google.api.expr.test.v1.proto3.TestAllTypes" }}
+    }
     bindings: {
       key: "msg"
       value: {
@@ -844,6 +884,10 @@ section: {
     value: {
       int64_value: 10
     }
+    type_env: {
+      name: "msg"
+      ident: { type: { message_type: "google.api.expr.test.v1.proto3.TestAllTypes" }}
+    }
     bindings: {
       key: "msg"
       value: {
@@ -886,6 +930,10 @@ section: {
     value: {
       int64_value: 10
     }
+    type_env: {
+      name: "msg"
+      ident: { type: { message_type: "google.api.expr.test.v1.proto3.TestAllTypes" }}
+    }
     bindings: {
       key: "msg"
       value: {
@@ -928,6 +976,10 @@ section: {
     value: {
       bool_value: true
     }
+    type_env: {
+      name: "msg"
+      ident: { type: { message_type: "google.api.expr.test.v1.proto3.TestAllTypes" }}
+    }
     bindings: {
       key: "msg"
       value: {
@@ -970,6 +1022,10 @@ section: {
     value: {
       bool_value: true
     }
+    type_env: {
+      name: "opt_x"
+      ident: { type: { primitive: INT64 }}
+    }
     bindings: {
       key: "opt_x",
       value: {