diff --git a/src/lang/KclSingleton.ts b/src/lang/KclSingleton.ts
index 35294ba4d..556a986f1 100644
--- a/src/lang/KclSingleton.ts
+++ b/src/lang/KclSingleton.ts
@@ -58,6 +58,7 @@ export class KclManager {
       nonCodeNodes: {},
       startNodes: [],
     },
+    trivia: [],
   }
   private _execState: ExecState = emptyExecState()
   private _programMemory: ProgramMemory = ProgramMemory.empty()
@@ -239,6 +240,7 @@ export class KclManager {
         nonCodeNodes: {},
         startNodes: [],
       },
+      trivia: [],
     }
   }
 
diff --git a/src/lang/modifyAst.test.ts b/src/lang/modifyAst.test.ts
index 6ea87dea2..4c3998398 100644
--- a/src/lang/modifyAst.test.ts
+++ b/src/lang/modifyAst.test.ts
@@ -128,15 +128,78 @@ describe('Testing findUniqueName', () => {
   it('should find a unique name', () => {
     const result = findUniqueName(
       JSON.stringify([
-        { type: 'Identifier', name: 'yo01', start: 0, end: 0, moduleId: 0 },
-        { type: 'Identifier', name: 'yo02', start: 0, end: 0, moduleId: 0 },
-        { type: 'Identifier', name: 'yo03', start: 0, end: 0, moduleId: 0 },
-        { type: 'Identifier', name: 'yo04', start: 0, end: 0, moduleId: 0 },
-        { type: 'Identifier', name: 'yo05', start: 0, end: 0, moduleId: 0 },
-        { type: 'Identifier', name: 'yo06', start: 0, end: 0, moduleId: 0 },
-        { type: 'Identifier', name: 'yo07', start: 0, end: 0, moduleId: 0 },
-        { type: 'Identifier', name: 'yo08', start: 0, end: 0, moduleId: 0 },
-        { type: 'Identifier', name: 'yo09', start: 0, end: 0, moduleId: 0 },
+        {
+          type: 'Identifier',
+          name: 'yo01',
+          start: 0,
+          end: 0,
+          moduleId: 0,
+          trivia: [],
+        },
+        {
+          type: 'Identifier',
+          name: 'yo02',
+          start: 0,
+          end: 0,
+          moduleId: 0,
+          trivia: [],
+        },
+        {
+          type: 'Identifier',
+          name: 'yo03',
+          start: 0,
+          end: 0,
+          moduleId: 0,
+          trivia: [],
+        },
+        {
+          type: 'Identifier',
+          name: 'yo04',
+          start: 0,
+          end: 0,
+          moduleId: 0,
+          trivia: [],
+        },
+        {
+          type: 'Identifier',
+          name: 'yo05',
+          start: 0,
+          end: 0,
+          moduleId: 0,
+          trivia: [],
+        },
+        {
+          type: 'Identifier',
+          name: 'yo06',
+          start: 0,
+          end: 0,
+          moduleId: 0,
+          trivia: [],
+        },
+        {
+          type: 'Identifier',
+          name: 'yo07',
+          start: 0,
+          end: 0,
+          moduleId: 0,
+          trivia: [],
+        },
+        {
+          type: 'Identifier',
+          name: 'yo08',
+          start: 0,
+          end: 0,
+          moduleId: 0,
+          trivia: [],
+        },
+        {
+          type: 'Identifier',
+          name: 'yo09',
+          start: 0,
+          end: 0,
+          moduleId: 0,
+          trivia: [],
+        },
       ] satisfies Node<Identifier>[]),
       'yo',
       2
@@ -154,6 +217,7 @@ describe('Testing addSketchTo', () => {
         end: 0,
         moduleId: 0,
         nonCodeMeta: { nonCodeNodes: {}, startNodes: [] },
+        trivia: [],
       },
       'yz'
     )
diff --git a/src/lang/modifyAst.ts b/src/lang/modifyAst.ts
index 3eb8e2aeb..3560b2c3c 100644
--- a/src/lang/modifyAst.ts
+++ b/src/lang/modifyAst.ts
@@ -278,6 +278,7 @@ export function mutateObjExpProp(
         start: 0,
         end: 0,
         moduleId: 0,
+        trivia: [],
       })
     }
   }
@@ -890,6 +891,7 @@ export function createLiteral(value: LiteralValue | number): Node<Literal> {
     moduleId: 0,
     value,
     raw,
+    trivia: [],
   }
 }
 
@@ -899,6 +901,7 @@ export function createTagDeclarator(value: string): Node<TagDeclarator> {
     start: 0,
     end: 0,
     moduleId: 0,
+    trivia: [],
 
     value,
   }
@@ -910,6 +913,7 @@ export function createIdentifier(name: string): Node<Identifier> {
     start: 0,
     end: 0,
     moduleId: 0,
+    trivia: [],
 
     name,
   }
@@ -921,6 +925,7 @@ export function createPipeSubstitution(): Node<PipeSubstitution> {
     start: 0,
     end: 0,
     moduleId: 0,
+    trivia: [],
   }
 }
 
@@ -933,11 +938,13 @@ export function createCallExpressionStdLib(
     start: 0,
     end: 0,
     moduleId: 0,
+    trivia: [],
     callee: {
       type: 'Identifier',
       start: 0,
       end: 0,
       moduleId: 0,
+      trivia: [],
 
       name,
     },
@@ -955,11 +962,13 @@ export function createCallExpressionStdLibKw(
     start: 0,
     end: 0,
     moduleId: 0,
+    trivia: [],
     callee: {
       type: 'Identifier',
       start: 0,
       end: 0,
       moduleId: 0,
+      trivia: [],
 
       name,
     },
@@ -977,11 +986,13 @@ export function createCallExpression(
     start: 0,
     end: 0,
     moduleId: 0,
+    trivia: [],
     callee: {
       type: 'Identifier',
       start: 0,
       end: 0,
       moduleId: 0,
+      trivia: [],
 
       name,
     },
@@ -997,6 +1008,7 @@ export function createArrayExpression(
     start: 0,
     end: 0,
     moduleId: 0,
+    trivia: [],
 
     nonCodeMeta: nonCodeMetaEmpty(),
     elements,
@@ -1011,6 +1023,7 @@ export function createPipeExpression(
     start: 0,
     end: 0,
     moduleId: 0,
+    trivia: [],
 
     body,
     nonCodeMeta: nonCodeMetaEmpty(),
@@ -1028,12 +1041,14 @@ export function createVariableDeclaration(
     start: 0,
     end: 0,
     moduleId: 0,
+    trivia: [],
 
     declaration: {
       type: 'VariableDeclarator',
       start: 0,
       end: 0,
       moduleId: 0,
+      trivia: [],
 
       id: createIdentifier(varName),
       init,
@@ -1051,6 +1066,7 @@ export function createObjectExpression(properties: {
     start: 0,
     end: 0,
     moduleId: 0,
+    trivia: [],
 
     nonCodeMeta: nonCodeMetaEmpty(),
     properties: Object.entries(properties).map(([key, value]) => ({
@@ -1058,6 +1074,7 @@ export function createObjectExpression(properties: {
       start: 0,
       end: 0,
       moduleId: 0,
+      trivia: [],
       key: createIdentifier(key),
 
       value,
@@ -1074,6 +1091,7 @@ export function createUnaryExpression(
     start: 0,
     end: 0,
     moduleId: 0,
+    trivia: [],
 
     operator,
     argument,
@@ -1090,6 +1108,7 @@ export function createBinaryExpression([left, operator, right]: [
     start: 0,
     end: 0,
     moduleId: 0,
+    trivia: [],
 
     operator,
     left,
diff --git a/src/lang/std/sketch.ts b/src/lang/std/sketch.ts
index 12fff4b72..28d1b7204 100644
--- a/src/lang/std/sketch.ts
+++ b/src/lang/std/sketch.ts
@@ -1954,6 +1954,7 @@ export const updateStartProfileAtArgs: SketchLineHelper['updateArgs'] = ({
           startNodes: [],
           nonCodeNodes: [],
         },
+        trivia: [],
       },
       pathToNode,
     }
@@ -2534,6 +2535,8 @@ function addTagKw(): addTagFn {
         ...primaryCallExp,
         start: callExpr.node.start,
         end: callExpr.node.end,
+        moduleId: callExpr.node.moduleId,
+        trivia: callExpr.node.trivia,
       })
     }
 
diff --git a/src/wasm-lib/kcl/src/execution/exec_ast.rs b/src/wasm-lib/kcl/src/execution/exec_ast.rs
index d734c03c5..4b8537b4f 100644
--- a/src/wasm-lib/kcl/src/execution/exec_ast.rs
+++ b/src/wasm-lib/kcl/src/execution/exec_ast.rs
@@ -1769,6 +1769,7 @@ mod test {
                     start: 0,
                     end: 0,
                     module_id: ModuleId::default(),
+                    trivia: Vec::new(),
                 },
                 return_type: None,
                 digest: None,
diff --git a/src/wasm-lib/kcl/src/parsing/ast/types/mod.rs b/src/wasm-lib/kcl/src/parsing/ast/types/mod.rs
index 329a4a701..467ac3665 100644
--- a/src/wasm-lib/kcl/src/parsing/ast/types/mod.rs
+++ b/src/wasm-lib/kcl/src/parsing/ast/types/mod.rs
@@ -41,7 +41,7 @@ pub enum Definition<'a> {
     Import(NodeRef<'a, ImportStatement>),
 }
 
-#[derive(Debug, Default, Clone, Deserialize, Serialize, PartialEq, Eq, ts_rs::TS)]
+#[derive(Debug, Default, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 pub struct Node<T> {
@@ -51,6 +51,8 @@ pub struct Node<T> {
     pub end: usize,
     #[serde(default, skip_serializing_if = "ModuleId::is_top_level")]
     pub module_id: ModuleId,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub trivia: NodeList<NonCodeNode>,
 }
 
 impl<T> Node<T> {
@@ -94,6 +96,7 @@ impl<T> Node<T> {
             start,
             end,
             module_id,
+            trivia: Vec::new(),
         }
     }
 
@@ -103,6 +106,7 @@ impl<T> Node<T> {
             start: 0,
             end: 0,
             module_id: ModuleId::default(),
+            trivia: Vec::new(),
         }
     }
 
@@ -112,6 +116,7 @@ impl<T> Node<T> {
             start,
             end,
             module_id,
+            trivia: Vec::new(),
         })
     }
 
@@ -642,6 +647,7 @@ impl From<&BodyItem> for SourceRange {
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type")]
+#[allow(clippy::large_enum_variant)]
 pub enum Expr {
     Literal(BoxNode<Literal>),
     Identifier(BoxNode<Identifier>),
@@ -3823,6 +3829,7 @@ const cylinder = startSketchOn('-XZ')
                         start: 0,
                         end: 0,
                         module_id: ModuleId::default(),
+                        trivia: Vec::new(),
                     },
                     return_type: None,
                     digest: None,
@@ -3852,6 +3859,7 @@ const cylinder = startSketchOn('-XZ')
                         start: 0,
                         end: 0,
                         module_id: ModuleId::default(),
+                        trivia: Vec::new(),
                     },
                     return_type: None,
                     digest: None,
@@ -3893,6 +3901,7 @@ const cylinder = startSketchOn('-XZ')
                         start: 0,
                         end: 0,
                         module_id: ModuleId::default(),
+                        trivia: Vec::new(),
                     },
                     return_type: None,
                     digest: None,
diff --git a/src/wasm-lib/kcl/src/parsing/parser.rs b/src/wasm-lib/kcl/src/parsing/parser.rs
index 455648cab..95e61901c 100644
--- a/src/wasm-lib/kcl/src/parsing/parser.rs
+++ b/src/wasm-lib/kcl/src/parsing/parser.rs
@@ -308,6 +308,7 @@ fn annotation(i: &mut TokenSlice) -> PResult<Node<NonCodeNode>> {
                     value,
                     digest: None,
                 },
+                trivia: Vec::new(),
             }),
             comma_sep,
         )
@@ -426,6 +427,7 @@ fn pipe_expression(i: &mut TokenSlice) -> PResult<Node<PipeExpression>> {
             non_code_meta,
             digest: None,
         },
+        trivia: Vec::new(),
     })
 }
 
@@ -828,6 +830,7 @@ fn object_property_same_key_and_val(i: &mut TokenSlice) -> PResult<Node<ObjectPr
             key,
             digest: None,
         },
+        trivia: Vec::new(),
     })
 }
 
@@ -856,6 +859,7 @@ fn object_property(i: &mut TokenSlice) -> PResult<Node<ObjectProperty>> {
             value: expr,
             digest: None,
         },
+        trivia: Vec::new(),
     };
 
     if sep.token_type == TokenType::Colon {
@@ -1786,6 +1790,7 @@ fn return_stmt(i: &mut TokenSlice) -> PResult<Node<ReturnStatement>> {
         end: argument.end(),
         module_id: ret.module_id,
         inner: ReturnStatement { argument, digest: None },
+        trivia: Vec::new(),
     })
 }
 
@@ -2012,11 +2017,13 @@ fn declaration(i: &mut TokenSlice) -> PResult<BoxNode<VariableDeclaration>> {
                     init: val,
                     digest: None,
                 },
+                trivia: Vec::new(),
             },
             visibility,
             kind,
             digest: None,
         },
+        trivia: Vec::new(),
     }))
 }
 
@@ -2222,6 +2229,7 @@ fn unary_expression(i: &mut TokenSlice) -> PResult<Node<UnaryExpression>> {
             argument,
             digest: None,
         },
+        trivia: Vec::new(),
     })
 }
 
@@ -2302,6 +2310,7 @@ fn expression_stmt(i: &mut TokenSlice) -> PResult<Node<ExpressionStatement>> {
             expression: val,
             digest: None,
         },
+        trivia: Vec::new(),
     })
 }
 
@@ -2741,6 +2750,7 @@ fn fn_call(i: &mut TokenSlice) -> PResult<Node<CallExpression>> {
             arguments: args,
             digest: None,
         },
+        trivia: Vec::new(),
     })
 }
 
@@ -2770,6 +2780,7 @@ fn fn_call_kw(i: &mut TokenSlice) -> PResult<Node<CallExpressionKw>> {
             arguments: args,
             digest: None,
         },
+        trivia: Vec::new(),
     })
 }
 
diff --git a/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bj.snap b/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bj.snap
index fe8afa014..db338f47f 100644
--- a/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bj.snap
+++ b/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bj.snap
@@ -1,8 +1,6 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 4521
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
diff --git a/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bk.snap b/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bk.snap
index 777c1da67..14550aae4 100644
--- a/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bk.snap
+++ b/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bk.snap
@@ -1,8 +1,6 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 4522
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
diff --git a/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bl.snap b/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bl.snap
index 4573d0c1f..e38695b5e 100644
--- a/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bl.snap
+++ b/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bl.snap
@@ -1,8 +1,6 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 4523
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
diff --git a/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bm.snap b/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bm.snap
index b82bc3164..8ea6402bf 100644
--- a/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bm.snap
+++ b/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bm.snap
@@ -1,8 +1,6 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 4524
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
diff --git a/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bn.snap b/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bn.snap
index c094e8715..8cd2ee821 100644
--- a/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bn.snap
+++ b/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bn.snap
@@ -1,8 +1,6 @@
 ---
 source: kcl/src/parsing/parser.rs
-assertion_line: 4525
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
diff --git a/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__kw_function_all_named.snap b/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__kw_function_all_named.snap
index 8093ebb08..4482e00bb 100644
--- a/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__kw_function_all_named.snap
+++ b/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__kw_function_all_named.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/parsing/parser.rs
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
diff --git a/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__kw_function_unnamed_first.snap b/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__kw_function_unnamed_first.snap
index 14297e950..83286b984 100644
--- a/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__kw_function_unnamed_first.snap
+++ b/src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__kw_function_unnamed_first.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/parsing/parser.rs
 expression: actual
-snapshot_kind: text
 ---
 {
   "body": [
diff --git a/src/wasm-lib/kcl/tests/angled_line/program_memory.snap b/src/wasm-lib/kcl/tests/angled_line/program_memory.snap
index dd87ad766..b08d17953 100644
--- a/src/wasm-lib/kcl/tests/angled_line/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/angled_line/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing angled_line.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/artifact_graph_example_code1/ast.snap b/src/wasm-lib/kcl/tests/artifact_graph_example_code1/ast.snap
index d13ad0d17..12ca62c48 100644
--- a/src/wasm-lib/kcl/tests/artifact_graph_example_code1/ast.snap
+++ b/src/wasm-lib/kcl/tests/artifact_graph_example_code1/ast.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Result of parsing artifact_graph_example_code1.kcl
-snapshot_kind: text
 ---
 {
   "Ok": {
diff --git a/src/wasm-lib/kcl/tests/artifact_graph_example_code1/program_memory.snap b/src/wasm-lib/kcl/tests/artifact_graph_example_code1/program_memory.snap
index 6866cdf70..c74e3b763 100644
--- a/src/wasm-lib/kcl/tests/artifact_graph_example_code1/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/artifact_graph_example_code1/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing artifact_graph_example_code1.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/artifact_graph_example_code_no_3d/ast.snap b/src/wasm-lib/kcl/tests/artifact_graph_example_code_no_3d/ast.snap
index 0d58e6092..ef5f126b8 100644
--- a/src/wasm-lib/kcl/tests/artifact_graph_example_code_no_3d/ast.snap
+++ b/src/wasm-lib/kcl/tests/artifact_graph_example_code_no_3d/ast.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Result of parsing artifact_graph_example_code_no_3d.kcl
-snapshot_kind: text
 ---
 {
   "Ok": {
diff --git a/src/wasm-lib/kcl/tests/artifact_graph_example_code_no_3d/program_memory.snap b/src/wasm-lib/kcl/tests/artifact_graph_example_code_no_3d/program_memory.snap
index 42c8b8ab8..a2aefd9b3 100644
--- a/src/wasm-lib/kcl/tests/artifact_graph_example_code_no_3d/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/artifact_graph_example_code_no_3d/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing artifact_graph_example_code_no_3d.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/artifact_graph_example_code_offset_planes/ast.snap b/src/wasm-lib/kcl/tests/artifact_graph_example_code_offset_planes/ast.snap
index 70c87fa2d..e0e101ae7 100644
--- a/src/wasm-lib/kcl/tests/artifact_graph_example_code_offset_planes/ast.snap
+++ b/src/wasm-lib/kcl/tests/artifact_graph_example_code_offset_planes/ast.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Result of parsing artifact_graph_example_code_offset_planes.kcl
-snapshot_kind: text
 ---
 {
   "Ok": {
diff --git a/src/wasm-lib/kcl/tests/artifact_graph_sketch_on_face_etc/ast.snap b/src/wasm-lib/kcl/tests/artifact_graph_sketch_on_face_etc/ast.snap
index b30c3e2a6..751af076a 100644
--- a/src/wasm-lib/kcl/tests/artifact_graph_sketch_on_face_etc/ast.snap
+++ b/src/wasm-lib/kcl/tests/artifact_graph_sketch_on_face_etc/ast.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
-snapshot_kind: text
 ---
 {
   "Ok": {
diff --git a/src/wasm-lib/kcl/tests/artifact_graph_sketch_on_face_etc/program_memory.snap b/src/wasm-lib/kcl/tests/artifact_graph_sketch_on_face_etc/program_memory.snap
index 2ab737480..b1364a7b1 100644
--- a/src/wasm-lib/kcl/tests/artifact_graph_sketch_on_face_etc/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/artifact_graph_sketch_on_face_etc/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing artifact_graph_sketch_on_face_etc.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/basic_fillet_cube_close_opposite/program_memory.snap b/src/wasm-lib/kcl/tests/basic_fillet_cube_close_opposite/program_memory.snap
index c2e28eab5..f4050b9dc 100644
--- a/src/wasm-lib/kcl/tests/basic_fillet_cube_close_opposite/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/basic_fillet_cube_close_opposite/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing basic_fillet_cube_close_opposite.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/basic_fillet_cube_end/program_memory.snap b/src/wasm-lib/kcl/tests/basic_fillet_cube_end/program_memory.snap
index b649ea4cc..ad846cb0f 100644
--- a/src/wasm-lib/kcl/tests/basic_fillet_cube_end/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/basic_fillet_cube_end/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing basic_fillet_cube_end.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/basic_fillet_cube_next_adjacent/program_memory.snap b/src/wasm-lib/kcl/tests/basic_fillet_cube_next_adjacent/program_memory.snap
index 91f43884f..27c077796 100644
--- a/src/wasm-lib/kcl/tests/basic_fillet_cube_next_adjacent/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/basic_fillet_cube_next_adjacent/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing basic_fillet_cube_next_adjacent.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/basic_fillet_cube_previous_adjacent/program_memory.snap b/src/wasm-lib/kcl/tests/basic_fillet_cube_previous_adjacent/program_memory.snap
index 9565f7bb4..7345ce17a 100644
--- a/src/wasm-lib/kcl/tests/basic_fillet_cube_previous_adjacent/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/basic_fillet_cube_previous_adjacent/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing basic_fillet_cube_previous_adjacent.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/basic_fillet_cube_start/program_memory.snap b/src/wasm-lib/kcl/tests/basic_fillet_cube_start/program_memory.snap
index 916aa6379..3f6ff4ebc 100644
--- a/src/wasm-lib/kcl/tests/basic_fillet_cube_start/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/basic_fillet_cube_start/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing basic_fillet_cube_start.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/big_number_angle_to_match_length_x/program_memory.snap b/src/wasm-lib/kcl/tests/big_number_angle_to_match_length_x/program_memory.snap
index 51b18a113..2fa9b71ad 100644
--- a/src/wasm-lib/kcl/tests/big_number_angle_to_match_length_x/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/big_number_angle_to_match_length_x/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing big_number_angle_to_match_length_x.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/big_number_angle_to_match_length_y/program_memory.snap b/src/wasm-lib/kcl/tests/big_number_angle_to_match_length_y/program_memory.snap
index dfac9c2eb..6c29bb24f 100644
--- a/src/wasm-lib/kcl/tests/big_number_angle_to_match_length_y/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/big_number_angle_to_match_length_y/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing big_number_angle_to_match_length_y.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/cube/program_memory.snap b/src/wasm-lib/kcl/tests/cube/program_memory.snap
index dbd4efa6e..e85c6522d 100644
--- a/src/wasm-lib/kcl/tests/cube/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/cube/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing cube.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/cube_with_error/ast.snap b/src/wasm-lib/kcl/tests/cube_with_error/ast.snap
index f0b67f84c..c2936af60 100644
--- a/src/wasm-lib/kcl/tests/cube_with_error/ast.snap
+++ b/src/wasm-lib/kcl/tests/cube_with_error/ast.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Result of parsing cube_with_error.kcl
-snapshot_kind: text
 ---
 {
   "Ok": {
diff --git a/src/wasm-lib/kcl/tests/fillet-and-shell/ast.snap b/src/wasm-lib/kcl/tests/fillet-and-shell/ast.snap
index 0ca863d28..0d82a80ac 100644
--- a/src/wasm-lib/kcl/tests/fillet-and-shell/ast.snap
+++ b/src/wasm-lib/kcl/tests/fillet-and-shell/ast.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Result of parsing fillet-and-shell.kcl
-snapshot_kind: text
 ---
 {
   "Ok": {
diff --git a/src/wasm-lib/kcl/tests/fillet-and-shell/program_memory.snap b/src/wasm-lib/kcl/tests/fillet-and-shell/program_memory.snap
index c84f47843..dfde5b42e 100644
--- a/src/wasm-lib/kcl/tests/fillet-and-shell/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/fillet-and-shell/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing fillet-and-shell.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/function_sketch/program_memory.snap b/src/wasm-lib/kcl/tests/function_sketch/program_memory.snap
index f034544e1..964a17e57 100644
--- a/src/wasm-lib/kcl/tests/function_sketch/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/function_sketch/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing function_sketch.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/function_sketch_with_position/program_memory.snap b/src/wasm-lib/kcl/tests/function_sketch_with_position/program_memory.snap
index c178837fd..427ecb753 100644
--- a/src/wasm-lib/kcl/tests/function_sketch_with_position/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/function_sketch_with_position/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing function_sketch_with_position.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/import_cycle1/ast.snap b/src/wasm-lib/kcl/tests/import_cycle1/ast.snap
index 8ac2719da..8fe3a5d20 100644
--- a/src/wasm-lib/kcl/tests/import_cycle1/ast.snap
+++ b/src/wasm-lib/kcl/tests/import_cycle1/ast.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Result of parsing import_cycle1.kcl
-snapshot_kind: text
 ---
 {
   "Ok": {
diff --git a/src/wasm-lib/kcl/tests/import_function_not_sketch/ast.snap b/src/wasm-lib/kcl/tests/import_function_not_sketch/ast.snap
index d9cc0b74f..c916f8643 100644
--- a/src/wasm-lib/kcl/tests/import_function_not_sketch/ast.snap
+++ b/src/wasm-lib/kcl/tests/import_function_not_sketch/ast.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Result of parsing import_function_not_sketch.kcl
-snapshot_kind: text
 ---
 {
   "Ok": {
diff --git a/src/wasm-lib/kcl/tests/import_function_not_sketch/program_memory.snap b/src/wasm-lib/kcl/tests/import_function_not_sketch/program_memory.snap
index 4537d1c57..449a4cdec 100644
--- a/src/wasm-lib/kcl/tests/import_function_not_sketch/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/import_function_not_sketch/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing import_function_not_sketch.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/import_side_effect/program_memory.snap b/src/wasm-lib/kcl/tests/import_side_effect/program_memory.snap
index f4a02cf0e..712ac3e2f 100644
--- a/src/wasm-lib/kcl/tests/import_side_effect/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/import_side_effect/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing import_side_effect.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/import_whole/ast.snap b/src/wasm-lib/kcl/tests/import_whole/ast.snap
index 501137542..41c61cfb8 100644
--- a/src/wasm-lib/kcl/tests/import_whole/ast.snap
+++ b/src/wasm-lib/kcl/tests/import_whole/ast.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Result of parsing import_whole.kcl
-snapshot_kind: text
 ---
 {
   "Ok": {
diff --git a/src/wasm-lib/kcl/tests/pentagon_fillet_sugar/program_memory.snap b/src/wasm-lib/kcl/tests/pentagon_fillet_sugar/program_memory.snap
index 065169e9c..deb3e47cc 100644
--- a/src/wasm-lib/kcl/tests/pentagon_fillet_sugar/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/pentagon_fillet_sugar/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing pentagon_fillet_sugar.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/pipe_as_arg/ast.snap b/src/wasm-lib/kcl/tests/pipe_as_arg/ast.snap
index 09f080481..f4ca08224 100644
--- a/src/wasm-lib/kcl/tests/pipe_as_arg/ast.snap
+++ b/src/wasm-lib/kcl/tests/pipe_as_arg/ast.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Result of parsing pipe_as_arg.kcl
-snapshot_kind: text
 ---
 {
   "Ok": {
diff --git a/src/wasm-lib/kcl/tests/pipe_as_arg/program_memory.snap b/src/wasm-lib/kcl/tests/pipe_as_arg/program_memory.snap
index ebf1a26ca..5173c3988 100644
--- a/src/wasm-lib/kcl/tests/pipe_as_arg/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/pipe_as_arg/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing pipe_as_arg.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/poop_chute/ast.snap b/src/wasm-lib/kcl/tests/poop_chute/ast.snap
index 6b29ecbb1..b2e187458 100644
--- a/src/wasm-lib/kcl/tests/poop_chute/ast.snap
+++ b/src/wasm-lib/kcl/tests/poop_chute/ast.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Result of parsing poop_chute.kcl
-snapshot_kind: text
 ---
 {
   "Ok": {
diff --git a/src/wasm-lib/kcl/tests/poop_chute/program_memory.snap b/src/wasm-lib/kcl/tests/poop_chute/program_memory.snap
index 2b99727b4..9f6234954 100644
--- a/src/wasm-lib/kcl/tests/poop_chute/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/poop_chute/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing poop_chute.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/riddle_small/program_memory.snap b/src/wasm-lib/kcl/tests/riddle_small/program_memory.snap
index eeb9efcdb..d02d36ecb 100644
--- a/src/wasm-lib/kcl/tests/riddle_small/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/riddle_small/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing riddle_small.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/sketch-on-chamfer-two-times-different-order/program_memory.snap b/src/wasm-lib/kcl/tests/sketch-on-chamfer-two-times-different-order/program_memory.snap
index 322697ee0..fbb9662a5 100644
--- a/src/wasm-lib/kcl/tests/sketch-on-chamfer-two-times-different-order/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/sketch-on-chamfer-two-times-different-order/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing sketch-on-chamfer-two-times-different-order.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/sketch-on-chamfer-two-times/program_memory.snap b/src/wasm-lib/kcl/tests/sketch-on-chamfer-two-times/program_memory.snap
index 3be1ab4f5..088f002e4 100644
--- a/src/wasm-lib/kcl/tests/sketch-on-chamfer-two-times/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/sketch-on-chamfer-two-times/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing sketch-on-chamfer-two-times.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/sketch_in_object/program_memory.snap b/src/wasm-lib/kcl/tests/sketch_in_object/program_memory.snap
index e986a4198..e5bc89de0 100644
--- a/src/wasm-lib/kcl/tests/sketch_in_object/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/sketch_in_object/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing sketch_in_object.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/sketch_on_face/program_memory.snap b/src/wasm-lib/kcl/tests/sketch_on_face/program_memory.snap
index bdeb2380c..3215c5dca 100644
--- a/src/wasm-lib/kcl/tests/sketch_on_face/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/sketch_on_face/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing sketch_on_face.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/sketch_on_face_after_fillets_referencing_face/program_memory.snap b/src/wasm-lib/kcl/tests/sketch_on_face_after_fillets_referencing_face/program_memory.snap
index d8c42abf6..ebe0799c3 100644
--- a/src/wasm-lib/kcl/tests/sketch_on_face_after_fillets_referencing_face/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/sketch_on_face_after_fillets_referencing_face/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing sketch_on_face_after_fillets_referencing_face.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/sketch_on_face_circle_tagged/program_memory.snap b/src/wasm-lib/kcl/tests/sketch_on_face_circle_tagged/program_memory.snap
index b80e225a1..8218aec07 100644
--- a/src/wasm-lib/kcl/tests/sketch_on_face_circle_tagged/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/sketch_on_face_circle_tagged/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing sketch_on_face_circle_tagged.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/sketch_on_face_end/program_memory.snap b/src/wasm-lib/kcl/tests/sketch_on_face_end/program_memory.snap
index 914475e8e..94e5b3178 100644
--- a/src/wasm-lib/kcl/tests/sketch_on_face_end/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/sketch_on_face_end/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing sketch_on_face_end.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/sketch_on_face_end_negative_extrude/program_memory.snap b/src/wasm-lib/kcl/tests/sketch_on_face_end_negative_extrude/program_memory.snap
index a0ab1b806..4b1f0a7c4 100644
--- a/src/wasm-lib/kcl/tests/sketch_on_face_end_negative_extrude/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/sketch_on_face_end_negative_extrude/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing sketch_on_face_end_negative_extrude.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/sketch_on_face_start/program_memory.snap b/src/wasm-lib/kcl/tests/sketch_on_face_start/program_memory.snap
index c9155b3b0..dff843b29 100644
--- a/src/wasm-lib/kcl/tests/sketch_on_face_start/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/sketch_on_face_start/program_memory.snap
@@ -1,7 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
 description: Program memory after executing sketch_on_face_start.kcl
-snapshot_kind: text
 ---
 {
   "environments": [
diff --git a/src/wasm-lib/kcl/tests/tan_arc_x_line/program_memory.snap b/src/wasm-lib/kcl/tests/tan_arc_x_line/program_memory.snap
index 140495cae..6c08a125b 100644
--- a/src/wasm-lib/kcl/tests/tan_arc_x_line/program_memory.snap
+++ b/src/wasm-lib/kcl/tests/tan_arc_x_line/program_memory.snap
@@ -1,8 +1,6 @@
 ---
 source: kcl/src/simulation_tests.rs
-assertion_line: 92
 description: Program memory after executing tan_arc_x_line.kcl
-snapshot_kind: text
 ---
 {
   "environments": [