diff --git a/test/vast/Transform/FromHL/StructsToLLVM/empty-a.c b/test/vast/Transform/FromHL/StructsToLLVM/empty-a.c
index 1dddd49bf9..d6bfa9d31e 100644
--- a/test/vast/Transform/FromHL/StructsToLLVM/empty-a.c
+++ b/test/vast/Transform/FromHL/StructsToLLVM/empty-a.c
@@ -1,4 +1,9 @@
 // RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-structs-to-llvm | %file-check %s
 
-// CHECK: hl.typedef "X" : !llvm.struct<"X", ()>
 struct X {};
+
+int main()
+{
+    // CHECK: {{.*}} = hl.var "x" : !hl.lvalue<!hl.elaborated<!llvm.struct<"X", ()>>>
+    struct X x;
+}
diff --git a/test/vast/Transform/FromHL/StructsToLLVM/struct-a.c b/test/vast/Transform/FromHL/StructsToLLVM/struct-a.c
index 2852ea44a9..3d65b4a4bf 100644
--- a/test/vast/Transform/FromHL/StructsToLLVM/struct-a.c
+++ b/test/vast/Transform/FromHL/StructsToLLVM/struct-a.c
@@ -1,4 +1,9 @@
 // RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-structs-to-llvm | %file-check %s
 
-// CHECK: hl.typedef "X" : !llvm.struct<"X", (i32)>
 struct X { int x; };
+
+int main()
+{
+    // CHECK: {{.*}} = hl.var "x" : !hl.lvalue<!hl.elaborated<!llvm.struct<"X", (si32)>>>
+    struct X x;
+}
diff --git a/test/vast/Transform/FromHL/StructsToLLVM/struct-b.c b/test/vast/Transform/FromHL/StructsToLLVM/struct-b.c
index ef500ac144..ca4a939006 100644
--- a/test/vast/Transform/FromHL/StructsToLLVM/struct-b.c
+++ b/test/vast/Transform/FromHL/StructsToLLVM/struct-b.c
@@ -1,6 +1,10 @@
 // RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-structs-to-llvm | %file-check %s
 
-// CHECK: hl.type "Y"
 struct Y;
-// CHECK: hl.typedef "X" : !llvm.struct<"X", (i32, ptr<struct<"Y", opaque>>)>
 struct X { int x; struct Y *y; };
+
+int main()
+{
+    // CHECK: {{.*}} = hl.var "x" : !hl.lvalue<!hl.elaborated<!llvm.struct<"X", (si32, !hl.ptr<!hl.elaborated<!llvm.struct<"Y", opaque>>>)>>> = {
+    struct X x = { 2, 0 };
+}
diff --git a/test/vast/Transform/FromHL/StructsToLLVM/struct-c.c b/test/vast/Transform/FromHL/StructsToLLVM/struct-c.c
index 90932f44e0..d0f04c1aca 100644
--- a/test/vast/Transform/FromHL/StructsToLLVM/struct-c.c
+++ b/test/vast/Transform/FromHL/StructsToLLVM/struct-c.c
@@ -2,8 +2,15 @@
 
 struct Y;
 
-// CHECK: hl.typedef "X" : !llvm.struct<"X", (i32, ptr<struct<"Y", (f32)>>)>
-struct X { int x; struct Y *y; };
+struct X { const int x; struct Y *y; };
 
-// CHECK: hl.typedef "Y" : !llvm.struct<"Y", (f32)>
-struct Y { float x; };
+struct Y { const float x; };
+
+int main()
+{
+    // CHECK: {{.*}} = hl.var "x" : !hl.lvalue<!hl.elaborated<!llvm.struct<"X", (si32, !hl.ptr<!hl.elaborated<!llvm.struct<"Y", (f32)>>>)>>> = {
+    struct X x = { 2, 0 };
+
+    // CHECK: {{.*}} = hl.var "y" : !hl.lvalue<!hl.elaborated<!llvm.struct<"Y", (f32)>>> = {
+    struct Y y = { 2.0f };
+}
diff --git a/test/vast/Transform/FromHL/StructsToLLVM/struct-d.c b/test/vast/Transform/FromHL/StructsToLLVM/struct-d.c
index d30432d3d3..b9df6d850c 100644
--- a/test/vast/Transform/FromHL/StructsToLLVM/struct-d.c
+++ b/test/vast/Transform/FromHL/StructsToLLVM/struct-d.c
@@ -1,4 +1,10 @@
 // RUN: %vast-cc1 -vast-emit-mlir=hl %s -o - | %vast-opt --vast-hl-lower-types --vast-hl-structs-to-llvm | %file-check %s
 
-// CHECK: hl.typedef "X" : !llvm.struct<"X", (i32, ptr<struct<"X">>)>
 struct X { int a; struct X *x; };
+
+int main()
+{
+    // CHECK: {{.*}} = hl.var "x" : !hl.lvalue<!hl.elaborated<!llvm.struct<"X", (si32, !hl.ptr<!hl.elaborated<!llvm.struct<"X">>>)>>> = {
+    struct X x = { 2, 0 };
+    x.a = 5;
+}