diff --git a/crates/kind-tests/suite/kdl/ChangeName.golden b/crates/kind-tests/suite/kdl/ChangeName.golden
index e69de29b..c3c44bce 100644
--- a/crates/kind-tests/suite/kdl/ChangeName.golden
+++ b/crates/kind-tests/suite/kdl/ChangeName.golden
@@ -0,0 +1,4 @@
+fun (JOJO ) {
+  (JOJO) = #42
+}
+
diff --git a/crates/kind-tests/suite/kdl/ChangeName.kind2 b/crates/kind-tests/suite/kdl/ChangeName.kind2
index 85f73756..d12d9901 100644
--- a/crates/kind-tests/suite/kdl/ChangeName.kind2
+++ b/crates/kind-tests/suite/kdl/ChangeName.kind2
@@ -1,3 +1,4 @@
 #kdl_name = JOJO
+#keep
 Jonathan.Joestar : U60
 Jonathan.Joestar = 42
\ No newline at end of file
diff --git a/crates/kind-tests/suite/kdl/Lambda.golden b/crates/kind-tests/suite/kdl/Lambda.golden
index e69de29b..cbe413bc 100644
--- a/crates/kind-tests/suite/kdl/Lambda.golden
+++ b/crates/kind-tests/suite/kdl/Lambda.golden
@@ -0,0 +1,8 @@
+fun (CoolFnApp n) {
+  (CoolFnApp x0) = (!@x0.0 (!@x1 (!@x1.0 (!x1.0 x0.0) x1) @x2 (!@x2.0 (!(CoolFn) x2.0) x2)) x0)
+}
+
+fun (CoolFn ) {
+  (CoolFn) = @x0 (!@x0.0 (& (* #2 x0.0) #1152921504606846975) x0)
+}
+
diff --git a/crates/kind-tests/suite/kdl/Lambda.kind2 b/crates/kind-tests/suite/kdl/Lambda.kind2
index d63a0fee..20638cff 100644
--- a/crates/kind-tests/suite/kdl/Lambda.kind2
+++ b/crates/kind-tests/suite/kdl/Lambda.kind2
@@ -1,7 +1,9 @@
+#keep
 CoolFn : U60 -> U60 {
   (x: U60) => (* 2 x)
 }
 
+#keep
 CoolFnApp (n: U60) : U60 {
   let lam = (x: U60) => ((CoolFn) x)
   (lam n)
diff --git a/crates/kind-tests/suite/kdl/NonInlineState.golden b/crates/kind-tests/suite/kdl/NonInlineState.golden
index 38cdeec3..9a62a26c 100644
--- a/crates/kind-tests/suite/kdl/NonInlineState.golden
+++ b/crates/kind-tests/suite/kdl/NonInlineState.golden
@@ -1 +1,10 @@
-ctr {MyFn.state}
+   ERROR  This entry should only have one rule.
+
+      /--[suite/kdl/NonInlineState.kind2:7:1]
+      |
+    6 |    
+    7 |    MyFn.state : U60
+      |    v---------------
+      |    \Here!
+
+
diff --git a/crates/kind-tests/suite/kdl/NonInlineState.kind2 b/crates/kind-tests/suite/kdl/NonInlineState.kind2
index d94e77b5..76e01913 100644
--- a/crates/kind-tests/suite/kdl/NonInlineState.kind2
+++ b/crates/kind-tests/suite/kdl/NonInlineState.kind2
@@ -1,4 +1,5 @@
 #kdl_state = MyFn.state
+#keep
 MyFn : U60 {
   1
 }
diff --git a/crates/kind-tests/suite/kdl/Shortener.golden b/crates/kind-tests/suite/kdl/Shortener.golden
index e69de29b..4772cdba 100644
--- a/crates/kind-tests/suite/kdl/Shortener.golden
+++ b/crates/kind-tests/suite/kdl/Shortener.golden
@@ -0,0 +1,4 @@
+fun (NDFMHGgkiOr2 ) {
+  (NDFMHGgkiOr2) = #0
+}
+
diff --git a/crates/kind-tests/suite/kdl/Shortener.kind2 b/crates/kind-tests/suite/kdl/Shortener.kind2
index 7f0c6436..a1305618 100644
--- a/crates/kind-tests/suite/kdl/Shortener.kind2
+++ b/crates/kind-tests/suite/kdl/Shortener.kind2
@@ -1,3 +1,4 @@
+#keep
 FunctionWithAVeryLongName : U60 {
     0
 }
\ No newline at end of file
diff --git a/crates/kind-tests/suite/kdl/U60.kind2 b/crates/kind-tests/suite/kdl/U60.kind2
index 1f6fa84c..e41c58c2 100644
--- a/crates/kind-tests/suite/kdl/U60.kind2
+++ b/crates/kind-tests/suite/kdl/U60.kind2
@@ -1,4 +1,3 @@
 #kdl_run
-#keep
 Main: U60
 Main = 2
\ No newline at end of file