diff --git a/crates/plotnik-lib/src/query/query_tests.rs b/crates/plotnik-lib/src/query/query_tests.rs
index 364be15c..755ae157 100644
--- a/crates/plotnik-lib/src/query/query_tests.rs
+++ b/crates/plotnik-lib/src/query/query_tests.rs
@@ -4,12 +4,7 @@ use crate::query::query::{LinkedQuery, QueryAnalyzed, QueryBuilder};
 
 impl<'q> QueryAnalyzed<'q> {
     #[track_caller]
-    pub fn expect(src: &'q str) -> Self {
-        QueryBuilder::new(src).parse().unwrap().analyze()
-    }
-
-    #[track_caller]
-    pub fn expect_valid(src: &'q str) -> Self {
+    fn parse_and_validate(src: &'q str) -> Self {
         let query = QueryBuilder::new(src).parse().unwrap().analyze();
         if !query.is_valid() {
             panic!(
@@ -17,111 +12,62 @@ impl<'q> QueryAnalyzed<'q> {
                 query.dump_diagnostics()
             );
         }
-
         query
     }
 
     #[track_caller]
-    pub fn expect_valid_cst(src: &'q str) -> String {
-        let query = QueryBuilder::new(src).parse().unwrap().analyze();
-        if !query.is_valid() {
-            panic!(
-                "Expected valid query, got error:\n{}",
-                query.dump_diagnostics()
-            );
-        }
+    pub fn expect(src: &'q str) -> Self {
+        QueryBuilder::new(src).parse().unwrap().analyze()
+    }
+
+    #[track_caller]
+    pub fn expect_valid(src: &'q str) -> Self {
+        Self::parse_and_validate(src)
+    }
 
-        query.dump_cst()
+    #[track_caller]
+    pub fn expect_valid_cst(src: &'q str) -> String {
+        Self::parse_and_validate(src).dump_cst()
     }
 
     #[track_caller]
     pub fn expect_valid_cst_full(src: &'q str) -> String {
-        let query = QueryBuilder::new(src).parse().unwrap().analyze();
-        if !query.is_valid() {
-            panic!(
-                "Expected valid query, got error:\n{}",
-                query.dump_diagnostics()
-            );
-        }
-
-        query.dump_cst_full()
+        Self::parse_and_validate(src).dump_cst_full()
     }
 
     #[track_caller]
     pub fn expect_valid_ast(src: &'q str) -> String {
-        let query = QueryBuilder::new(src).parse().unwrap().analyze();
-        if !query.is_valid() {
-            panic!(
-                "Expected valid query, got error:\n{}",
-                query.dump_diagnostics()
-            );
-        }
-
-        query.dump_ast()
+        Self::parse_and_validate(src).dump_ast()
     }
 
     #[track_caller]
     pub fn expect_valid_arities(src: &'q str) -> String {
-        let query = QueryBuilder::new(src).parse().unwrap().analyze();
-        if !query.is_valid() {
-            panic!(
-                "Expected valid query, got error:\n{}",
-                query.dump_diagnostics()
-            );
-        }
-
-        query.dump_with_arities()
+        Self::parse_and_validate(src).dump_with_arities()
     }
 
     #[track_caller]
     pub fn expect_valid_symbols(src: &'q str) -> String {
-        let query = QueryBuilder::new(src).parse().unwrap().analyze();
-        if !query.is_valid() {
-            panic!(
-                "Expected valid query, got error:\n{}",
-                query.dump_diagnostics()
-            );
-        }
-
-        query.dump_symbols()
+        Self::parse_and_validate(src).dump_symbols()
     }
 
     #[track_caller]
     pub fn expect_valid_linking(src: &'q str, lang: &Lang) -> LinkedQuery<'q> {
-        let query = QueryBuilder::new(src).parse().unwrap().analyze();
-        if !query.is_valid() {
-            panic!(
-                "Expected valid query, got error:\n{}",
-                query.dump_diagnostics()
-            );
-        }
-
-        let query = query.link(lang);
+        let query = Self::parse_and_validate(src).link(lang);
         if !query.is_valid() {
             panic!(
                 "Expected valid linking, got error:\n{}",
                 query.dump_diagnostics()
             );
         }
-
         query
     }
 
     #[track_caller]
     pub fn expect_invalid_linking(src: &'q str, lang: &Lang) -> String {
-        let query = QueryBuilder::new(src).parse().unwrap().analyze();
-        if !query.is_valid() {
-            panic!(
-                "Expected valid query, got error:\n{}",
-                query.dump_diagnostics()
-            );
-        }
-
-        let query = query.link(lang);
+        let query = Self::parse_and_validate(src).link(lang);
         if query.is_valid() {
-            panic!("Expected failed linking, got valid",);
+            panic!("Expected failed linking, got valid");
         }
-
         query.dump_diagnostics()
     }
 
@@ -131,7 +77,6 @@ impl<'q> QueryAnalyzed<'q> {
         if query.is_valid() {
             panic!("Expected invalid query, got valid:\n{}", query.dump_cst());
         }
-
         query.dump_diagnostics()
     }
 }