diff --git a/rojo-test/serve-test-snapshots/serve_test__empty-2.snap b/rojo-test/serve-test-snapshots/serve_test__empty_all.snap
similarity index 77%
rename from rojo-test/serve-test-snapshots/serve_test__empty-2.snap
rename to rojo-test/serve-test-snapshots/serve_test__empty_all.snap
index 4535414a..d8a33da7 100644
--- a/rojo-test/serve-test-snapshots/serve_test__empty-2.snap
+++ b/rojo-test/serve-test-snapshots/serve_test__empty_all.snap
@@ -1,6 +1,6 @@
 ---
 source: rojo-test/src/serve_test.rs
-expression: read_result
+expression: "read_response.intern_and_redact(&mut redactions, root_id)"
 ---
 instances:
   id-2:
diff --git a/rojo-test/serve-test-snapshots/serve_test__empty.snap b/rojo-test/serve-test-snapshots/serve_test__empty_info.snap
similarity index 77%
rename from rojo-test/serve-test-snapshots/serve_test__empty.snap
rename to rojo-test/serve-test-snapshots/serve_test__empty_info.snap
index cb619dc5..f826d7e7 100644
--- a/rojo-test/serve-test-snapshots/serve_test__empty.snap
+++ b/rojo-test/serve-test-snapshots/serve_test__empty_info.snap
@@ -1,6 +1,6 @@
 ---
 source: rojo-test/src/serve_test.rs
-expression: info
+expression: redactions.redacted_yaml(info)
 ---
 expectedPlaceIds: ~
 protocolVersion: 3
diff --git a/rojo-test/serve-test-snapshots/serve_test__just_txt-2.snap b/rojo-test/serve-test-snapshots/serve_test__just_txt_all.snap
similarity index 76%
rename from rojo-test/serve-test-snapshots/serve_test__just_txt-2.snap
rename to rojo-test/serve-test-snapshots/serve_test__just_txt_all.snap
index 541ce33e..fb31572b 100644
--- a/rojo-test/serve-test-snapshots/serve_test__just_txt-2.snap
+++ b/rojo-test/serve-test-snapshots/serve_test__just_txt_all.snap
@@ -1,12 +1,12 @@
 ---
 source: rojo-test/src/serve_test.rs
-expression: read_result
+expression: "read_response.intern_and_redact(&mut redactions, root_id)"
 ---
 instances:
   id-2:
     Id: id-2
     Parent: ~
-    Name: just-txt
+    Name: just_txt
     ClassName: StringValue
     Properties:
       Value:
diff --git a/rojo-test/serve-test-snapshots/serve_test__scripts.snap b/rojo-test/serve-test-snapshots/serve_test__just_txt_info.snap
similarity index 77%
rename from rojo-test/serve-test-snapshots/serve_test__scripts.snap
rename to rojo-test/serve-test-snapshots/serve_test__just_txt_info.snap
index cb619dc5..f826d7e7 100644
--- a/rojo-test/serve-test-snapshots/serve_test__scripts.snap
+++ b/rojo-test/serve-test-snapshots/serve_test__just_txt_info.snap
@@ -1,6 +1,6 @@
 ---
 source: rojo-test/src/serve_test.rs
-expression: info
+expression: redactions.redacted_yaml(info)
 ---
 expectedPlaceIds: ~
 protocolVersion: 3
diff --git a/rojo-test/serve-test-snapshots/serve_test__scripts-4.snap b/rojo-test/serve-test-snapshots/serve_test__scripts_all-2.snap
similarity index 90%
rename from rojo-test/serve-test-snapshots/serve_test__scripts-4.snap
rename to rojo-test/serve-test-snapshots/serve_test__scripts_all-2.snap
index e21e3002..d65cca84 100644
--- a/rojo-test/serve-test-snapshots/serve_test__scripts-4.snap
+++ b/rojo-test/serve-test-snapshots/serve_test__scripts_all-2.snap
@@ -1,6 +1,6 @@
 ---
 source: rojo-test/src/serve_test.rs
-expression: read_result
+expression: "read_response.intern_and_redact(&mut redactions, root_id)"
 ---
 instances:
   id-2:
diff --git a/rojo-test/serve-test-snapshots/serve_test__scripts-2.snap b/rojo-test/serve-test-snapshots/serve_test__scripts_all.snap
similarity index 91%
rename from rojo-test/serve-test-snapshots/serve_test__scripts-2.snap
rename to rojo-test/serve-test-snapshots/serve_test__scripts_all.snap
index e012c3b9..e11c4e25 100644
--- a/rojo-test/serve-test-snapshots/serve_test__scripts-2.snap
+++ b/rojo-test/serve-test-snapshots/serve_test__scripts_all.snap
@@ -1,6 +1,6 @@
 ---
 source: rojo-test/src/serve_test.rs
-expression: read_result
+expression: "read_response.intern_and_redact(&mut redactions, root_id)"
 ---
 instances:
   id-2:
diff --git a/rojo-test/serve-test-snapshots/serve_test__just_txt.snap b/rojo-test/serve-test-snapshots/serve_test__scripts_info.snap
similarity index 77%
rename from rojo-test/serve-test-snapshots/serve_test__just_txt.snap
rename to rojo-test/serve-test-snapshots/serve_test__scripts_info.snap
index cb619dc5..f826d7e7 100644
--- a/rojo-test/serve-test-snapshots/serve_test__just_txt.snap
+++ b/rojo-test/serve-test-snapshots/serve_test__scripts_info.snap
@@ -1,6 +1,6 @@
 ---
 source: rojo-test/src/serve_test.rs
-expression: info
+expression: redactions.redacted_yaml(info)
 ---
 expectedPlaceIds: ~
 protocolVersion: 3
diff --git a/rojo-test/serve-test-snapshots/serve_test__scripts-3.snap b/rojo-test/serve-test-snapshots/serve_test__scripts_subscribe.snap
similarity index 86%
rename from rojo-test/serve-test-snapshots/serve_test__scripts-3.snap
rename to rojo-test/serve-test-snapshots/serve_test__scripts_subscribe.snap
index 9befdbad..f71ad85b 100644
--- a/rojo-test/serve-test-snapshots/serve_test__scripts-3.snap
+++ b/rojo-test/serve-test-snapshots/serve_test__scripts_subscribe.snap
@@ -1,6 +1,6 @@
 ---
 source: rojo-test/src/serve_test.rs
-expression: subscribe_result
+expression: redactions.redacted_yaml(subscribe_response)
 ---
 messageCursor: 1
 messages:
diff --git a/rojo-test/serve-tests/just-txt.txt b/rojo-test/serve-tests/just_txt.txt
similarity index 100%
rename from rojo-test/serve-tests/just-txt.txt
rename to rojo-test/serve-tests/just_txt.txt
diff --git a/rojo-test/src/serve_test.rs b/rojo-test/src/serve_test.rs
index 82a8a539..7b1c3fc0 100644
--- a/rojo-test/src/serve_test.rs
+++ b/rojo-test/src/serve_test.rs
@@ -10,10 +10,13 @@ fn empty() {
         let info = session.get_api_rojo().unwrap();
         let root_id = info.root_instance_id;
 
-        assert_yaml_snapshot!(redactions.redacted_yaml(info));
+        assert_yaml_snapshot!("empty_info", redactions.redacted_yaml(info));
 
         let read_response = session.get_api_read(root_id).unwrap();
-        assert_yaml_snapshot!(read_response.intern_and_redact(&mut redactions, root_id));
+        assert_yaml_snapshot!(
+            "empty_all",
+            read_response.intern_and_redact(&mut redactions, root_id)
+        );
     });
 }
 
@@ -23,31 +26,43 @@ fn scripts() {
         let info = session.get_api_rojo().unwrap();
         let root_id = info.root_instance_id;
 
-        assert_yaml_snapshot!(redactions.redacted_yaml(info));
+        assert_yaml_snapshot!("scripts_info", redactions.redacted_yaml(info));
 
         let read_response = session.get_api_read(root_id).unwrap();
-        assert_yaml_snapshot!(read_response.intern_and_redact(&mut redactions, root_id));
+        assert_yaml_snapshot!(
+            "scripts_all",
+            read_response.intern_and_redact(&mut redactions, root_id)
+        );
 
         fs::write(session.path().join("foo.lua"), "Updated foo!").unwrap();
 
         let subscribe_response = session.get_api_subscribe(0).unwrap();
-        assert_yaml_snapshot!(redactions.redacted_yaml(subscribe_response));
+        assert_yaml_snapshot!(
+            "scripts_subscribe",
+            redactions.redacted_yaml(subscribe_response)
+        );
 
         let read_response = session.get_api_read(root_id).unwrap();
-        assert_yaml_snapshot!(read_response.intern_and_redact(&mut redactions, root_id));
+        assert_yaml_snapshot!(
+            "scripts_all-2",
+            read_response.intern_and_redact(&mut redactions, root_id)
+        );
     });
 }
 
 #[test]
 fn just_txt() {
-    run_serve_test("just-txt.txt", |session, mut redactions| {
+    run_serve_test("just_txt.txt", |session, mut redactions| {
         let info = session.get_api_rojo().unwrap();
         let root_id = info.root_instance_id;
 
-        assert_yaml_snapshot!(redactions.redacted_yaml(info));
+        assert_yaml_snapshot!("just_txt_info", redactions.redacted_yaml(info));
 
         let read_response = session.get_api_read(root_id).unwrap();
-        assert_yaml_snapshot!(read_response.intern_and_redact(&mut redactions, root_id));
+        assert_yaml_snapshot!(
+            "just_txt_all",
+            read_response.intern_and_redact(&mut redactions, root_id)
+        );
 
         fs::write(session.path(), "Changed content!").unwrap();