diff --git a/Cargo.lock b/Cargo.lock
index 7c7da66..676e14f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,6 +2,18 @@
 # It is not intended for manual editing.
 version = 4
 
+[[package]]
+name = "ahash"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
 [[package]]
 name = "aho-corasick"
 version = "1.1.3"
@@ -25,9 +37,12 @@ checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "aria-query"
-version = "0.0.4"
+version = "0.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4c6e6778de8b9abfa42ebcc484b7295a2e53da985c428bdb473a7bddf124fd7"
+checksum = "2d4456c92d34f933d42cdd8d5b4eca7f816c88c323a3b9ab80872c17e2a3d19d"
+dependencies = [
+ "ordered_hash_map",
+]
 
 [[package]]
 name = "bumpalo"
@@ -50,6 +65,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "diff"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
+
 [[package]]
 name = "dom-accessibility-api"
 version = "0.0.3"
@@ -72,6 +93,15 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28dd6caf6059519a65843af8fe2a3ae298b14b80179855aeb4adc2c1934ee619"
 
+[[package]]
+name = "hashbrown"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+dependencies = [
+ "ahash",
+]
+
 [[package]]
 name = "indoc"
 version = "2.0.6"
@@ -142,6 +172,15 @@ version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
+[[package]]
+name = "ordered_hash_map"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab0e5f22bf6dd04abd854a8874247813a8fa2c8c1260eba6fbb150270ce7c176"
+dependencies = [
+ "hashbrown",
+]
+
 [[package]]
 name = "paste"
 version = "1.0.15"
@@ -184,6 +223,16 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "pretty_assertions"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
+dependencies = [
+ "diff",
+ "yansi",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.94"
@@ -284,16 +333,28 @@ dependencies = [
  "indoc",
  "log",
  "mockall",
+ "ordered_hash_map",
  "paste",
  "pretty-format",
+ "pretty_assertions",
  "regex",
  "send_wrapper",
+ "testing_logger",
  "thiserror",
  "wasm-bindgen",
  "wasm-bindgen-test",
  "web-sys",
 ]
 
+[[package]]
+name = "testing_logger"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d92b727cb45d33ae956f7f46b966b25f1bc712092aeef9dba5ac798fc89f720"
+dependencies = [
+ "log",
+]
+
 [[package]]
 name = "thiserror"
 version = "2.0.12"
@@ -320,6 +381,12 @@ version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
 [[package]]
 name = "walkdir"
 version = "2.5.0"
@@ -516,3 +583,29 @@ name = "windows_x86_64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "yansi"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+
+[[package]]
+name = "zerocopy"
+version = "0.8.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/packages/dom/Cargo.toml b/packages/dom/Cargo.toml
index 24aca69..bf77884 100644
--- a/packages/dom/Cargo.toml
+++ b/packages/dom/Cargo.toml
@@ -10,15 +10,17 @@ repository.workspace = true
 version.workspace = true
 
 [dependencies]
-aria-query = "0.0.4"
+aria-query = "0.0.5"
 dom-accessibility-api = "0.0.3"
 log.workspace = true
+ordered_hash_map = "0.4.0"
 paste = "1.0.15"
 pretty-format = { path = "../pretty-format", version = "0.0.1" }
 regex.workspace = true
 thiserror.workspace = true
 wasm-bindgen.workspace = true
 web-sys = { workspace = true, features = [
+    "AddEventListenerOptions",
     "AnimationEvent",
     "AnimationEventInit",
     "Attr",
@@ -48,6 +50,8 @@ web-sys = { workspace = true, features = [
     "InputEventInit",
     "KeyboardEvent",
     "KeyboardEventInit",
+    "MessageEvent",
+    "MessageEventInit",
     "MouseEvent",
     "MouseEventInit",
     "NamedNodeMap",
@@ -75,7 +79,9 @@ web-sys = { workspace = true, features = [
 [dev-dependencies]
 indoc = "2.0.5"
 mockall = "0.13.0"
+pretty_assertions = "1.4.1"
 send_wrapper = "0.6.0"
+testing_logger = "0.1.1"
 wasm-bindgen-test.workspace = true
 
 [lints.rust]
diff --git a/packages/dom/src/config.rs b/packages/dom/src/config.rs
index 22f176d..a63cec0 100644
--- a/packages/dom/src/config.rs
+++ b/packages/dom/src/config.rs
@@ -8,10 +8,10 @@ use crate::{
 
 static CONFIG: LazyLock<Arc<Mutex<Config>>> = LazyLock::new(|| {
     Arc::new(Mutex::new(Config {
-        test_id_attribute: "data-testid".into(),
+        test_id_attribute: "data-testid".to_owned(),
         event_wrapper: Arc::new(|cb| cb()),
         default_hidden: false,
-        default_ignore: "script, style".into(),
+        default_ignore: "script, style".to_owned(),
         show_original_stack_trace: false,
         throw_suggestions: false,
         get_element_error: Arc::new(|message, container| {
diff --git a/packages/dom/src/dom_element_filter.rs b/packages/dom/src/dom_element_filter.rs
index e0f706a..44587e0 100644
--- a/packages/dom/src/dom_element_filter.rs
+++ b/packages/dom/src/dom_element_filter.rs
@@ -5,14 +5,15 @@ use regex::Regex;
 use wasm_bindgen::{JsCast, JsValue};
 use web_sys::{Comment, Element, Node, Text};
 
-use crate::util::{named_node_map_to_hashmap, node_list_to_vec};
+use crate::util::{named_node_map_to_hashmap, named_node_map_to_vec, node_list_to_vec};
 
 fn escape_html(text: String) -> String {
     text.replace('<', "&lt;").replace('>', "&gt;")
 }
 
 fn print_props(
-    attributes: HashMap<String, String>,
+    keys: Vec<String>,
+    props: HashMap<String, String>,
     config: &Config,
     indentation: String,
     depth: usize,
@@ -21,25 +22,26 @@ fn print_props(
 ) -> String {
     let indentation_next = format!("{}{}", indentation, config.indent);
 
-    attributes
-        .into_iter()
-        .map(|(key, value)| {
-            let printed = printer(
-                &JsValue::from_str(&value),
-                config,
-                indentation_next.clone(),
-                depth,
-                refs.clone(),
-                None,
-            );
+    keys.into_iter()
+        .filter_map(|key| {
+            props.get(&key).map(|value| {
+                let printed = printer(
+                    &JsValue::from_str(value),
+                    config,
+                    indentation_next.clone(),
+                    depth,
+                    refs.clone(),
+                    None,
+                );
 
-            format!(
-                "{}{}{}={}",
-                config.spacing_inner,
-                indentation,
-                config.colors.prop.paint(&key),
-                config.colors.value.paint(&printed)
-            )
+                format!(
+                    "{}{}{}={}",
+                    config.spacing_inner,
+                    indentation,
+                    config.colors.prop.paint(&key),
+                    config.colors.value.paint(&printed)
+                )
+            })
         })
         .collect::<Vec<_>>()
         .join("")
@@ -67,7 +69,7 @@ fn print_children(
 
             if printed_child.is_empty() && child.node_type() != Node::TEXT_NODE {
                 // A plugin serialized this Node to '' meaning we should ignore it.
-                "".into()
+                "".to_owned()
             } else {
                 format!("{}{}{}", config.spacing_outer, indentation, printed_child)
             }
@@ -99,7 +101,7 @@ fn print_element(
         "<{}{}{}>",
         r#type,
         if printed_props.is_empty() {
-            "".into()
+            "".to_owned()
         } else {
             format!(
                 "{}{}{}{}{}",
@@ -112,9 +114,9 @@ fn print_element(
         },
         if printed_children.is_empty() {
             if !printed_props.is_empty() && !config.min {
-                "/".into()
+                "/".to_owned()
             } else {
-                " /".into()
+                " /".to_owned()
             }
         } else {
             format!(
@@ -207,7 +209,7 @@ impl Plugin for DomElementFilter {
         }
 
         let r#type = if node_is_fragment(node) {
-            "DocumentFragment".into()
+            "DocumentFragment".to_owned()
         } else {
             node.unchecked_ref::<Element>().tag_name().to_lowercase()
         };
@@ -220,6 +222,19 @@ impl Plugin for DomElementFilter {
         print_element(
             r#type,
             print_props(
+                if node_is_fragment(node) {
+                    vec![]
+                } else {
+                    let mut keys =
+                        named_node_map_to_vec(node.unchecked_ref::<Element>().attributes())
+                            .into_iter()
+                            .map(|attr| attr.name())
+                            .collect::<Vec<_>>();
+
+                    keys.sort();
+
+                    keys
+                },
                 if node_is_fragment(node) {
                     HashMap::new()
                 } else {
diff --git a/packages/dom/src/events.rs b/packages/dom/src/events.rs
index d6c41fb..42ca25e 100644
--- a/packages/dom/src/events.rs
+++ b/packages/dom/src/events.rs
@@ -3,10 +3,11 @@ use wasm_bindgen::JsValue;
 use web_sys::{
     AnimationEvent, AnimationEventInit, ClipboardEvent, ClipboardEventInit, CompositionEvent,
     CompositionEventInit, DragEvent, DragEventInit, Event, EventInit, EventTarget, FocusEvent,
-    FocusEventInit, InputEvent, InputEventInit, KeyboardEvent, KeyboardEventInit, MouseEvent,
-    MouseEventInit, PageTransitionEvent, PageTransitionEventInit, PointerEvent, PointerEventInit,
-    PopStateEvent, PopStateEventInit, ProgressEvent, ProgressEventInit, TouchEvent, TouchEventInit,
-    TransitionEvent, TransitionEventInit, UiEvent, UiEventInit, WheelEvent, WheelEventInit,
+    FocusEventInit, InputEvent, InputEventInit, KeyboardEvent, KeyboardEventInit, MessageEvent,
+    MessageEventInit, MouseEvent, MouseEventInit, PageTransitionEvent, PageTransitionEventInit,
+    PointerEvent, PointerEventInit, PopStateEvent, PopStateEventInit, ProgressEvent,
+    ProgressEventInit, TouchEvent, TouchEventInit, TransitionEvent, TransitionEventInit, UiEvent,
+    UiEventInit, WheelEvent, WheelEventInit,
 };
 
 use crate::{
@@ -282,6 +283,7 @@ generate_event_types!(
     (FocusEvent, new_with_focus_event_init_dict),
     (InputEvent, new_with_event_init_dict),
     (KeyboardEvent, new_with_keyboard_event_init_dict),
+    (MessageEvent, new_with_event_init_dict),
     (MouseEvent, new_with_mouse_event_init_dict),
     (PageTransitionEvent, new_with_event_init_dict),
     (PointerEvent, new_with_event_init_dict),
diff --git a/packages/dom/src/label_helpers.rs b/packages/dom/src/label_helpers.rs
index 49dd712..cdf4849 100644
--- a/packages/dom/src/label_helpers.rs
+++ b/packages/dom/src/label_helpers.rs
@@ -10,7 +10,7 @@ const LABELLED_NODE_NAMES: [&str; 7] = [
 
 fn get_text_content(node: &Node) -> Option<String> {
     if LABELLED_NODE_NAMES.contains(&node.node_name().to_lowercase().as_str()) {
-        Some("".into())
+        Some("".to_owned())
     } else if node.node_type() == Node::TEXT_NODE {
         node.text_content()
     } else {
@@ -62,7 +62,8 @@ fn is_labelable(element: &Element) -> bool {
     Regex::new(r"BUTTON|METER|OUTPUT|PROGRESS|SELECT|TEXTAREA")
         .expect("Regex should be valid.")
         .is_match(&element.tag_name())
-        || element.tag_name() == "INPUT" && element.get_attribute("type") != Some("hidden".into())
+        || element.tag_name() == "INPUT"
+            && element.get_attribute("type") != Some("hidden".to_owned())
 }
 
 #[derive(Clone, Debug)]
@@ -76,7 +77,7 @@ pub fn get_labels(
     element: &HtmlElement,
     selector: Option<String>,
 ) -> Vec<Label> {
-    let selector = selector.unwrap_or("*".into());
+    let selector = selector.unwrap_or("*".to_owned());
 
     let aria_labelled_by = element.get_attribute("aria-labelledby");
     let labels_id = aria_labelled_by
@@ -118,7 +119,7 @@ pub fn get_labels(
                         form_control: None,
                     })
                     .unwrap_or(Label {
-                        content: Some("".into()),
+                        content: Some("".to_owned()),
                         form_control: None,
                     })
             })
diff --git a/packages/dom/src/lib.rs b/packages/dom/src/lib.rs
index 0823b31..00766b2 100644
--- a/packages/dom/src/lib.rs
+++ b/packages/dom/src/lib.rs
@@ -25,7 +25,13 @@ pub use matches::get_default_normalizer;
 pub use pretty_dom::*;
 pub use queries::*;
 pub use query_helpers::*;
-pub use role_helpers::{get_roles, is_inaccessible, log_roles};
+pub use role_helpers::{
+    GetRolesOptions, PrettyRolesOptions, get_implicit_aria_roles, get_roles, is_inaccessible,
+    log_roles,
+};
 pub use suggestions::*;
 pub use types::*;
 pub use wait_for::*;
+
+// TODO: Export useful types from `aria_query`.
+pub use aria_query::{AriaRole, AriaRoleDefinitionKey};
diff --git a/packages/dom/src/matches.rs b/packages/dom/src/matches.rs
index 5a2d0dd..09cb809 100644
--- a/packages/dom/src/matches.rs
+++ b/packages/dom/src/matches.rs
@@ -88,7 +88,7 @@ pub fn make_normalizer(
                 `trim` and `collapse_whitespace` are not supported with a normalizer. \n\
                 If you want to use the default trim and `collapse_whitespace logic in your normalizer, \n\
                 use `get_default_normalizer(DefaultNormalizerOptions {trim, collapse_whitespace})` and compose that into your normalizer.\
-            ".into()))
+            ".to_owned()))
         } else {
             Ok(normalizer)
         }
@@ -125,15 +125,15 @@ mod tests {
     #[wasm_bindgen_test]
     fn matchers_accept_strings() {
         assert!(matches(
-            Some("ABC".into()),
+            Some("ABC".to_owned()),
             None,
-            &Matcher::String("ABC".into()),
+            &Matcher::String("ABC".to_owned()),
             &normalizer,
         ));
         assert!(fuzzy_matches(
-            Some("ABC".into()),
+            Some("ABC".to_owned()),
             None,
-            &Matcher::String("ABC".into()),
+            &Matcher::String("ABC".to_owned()),
             &normalizer,
         ));
     }
@@ -141,13 +141,13 @@ mod tests {
     #[wasm_bindgen_test]
     fn matchers_accept_regex() {
         assert!(matches(
-            Some("ABC".into()),
+            Some("ABC".to_owned()),
             None,
             &Matcher::Regex(Regex::new("ABC").expect("Regex should be valid.")),
             &normalizer,
         ));
         assert!(fuzzy_matches(
-            Some("ABC".into()),
+            Some("ABC".to_owned()),
             None,
             &Matcher::Regex(Regex::new("ABC").expect("Regex should be valid.")),
             &normalizer,
@@ -157,13 +157,13 @@ mod tests {
     #[wasm_bindgen_test]
     fn matchers_accept_functions() {
         assert!(matches(
-            Some("ABC".into()),
+            Some("ABC".to_owned()),
             None,
             &Matcher::Function(Rc::new(|text, _| text == "ABC")),
             &normalizer,
         ));
         assert!(fuzzy_matches(
-            Some("ABC".into()),
+            Some("ABC".to_owned()),
             None,
             &Matcher::Function(Rc::new(|text, _| text == "ABC")),
             &normalizer,
@@ -175,13 +175,13 @@ mod tests {
         assert!(!matches(
             None,
             None,
-            &Matcher::String("ABC".into()),
+            &Matcher::String("ABC".to_owned()),
             &normalizer,
         ));
         assert!(!fuzzy_matches(
             None,
             None,
-            &Matcher::String("ABC".into()),
+            &Matcher::String("ABC".to_owned()),
             &normalizer,
         ));
     }
diff --git a/packages/dom/src/pretty_dom.rs b/packages/dom/src/pretty_dom.rs
index c6a311a..ba0896f 100644
--- a/packages/dom/src/pretty_dom.rs
+++ b/packages/dom/src/pretty_dom.rs
@@ -2,7 +2,7 @@ use std::rc::Rc;
 
 use pretty_format::PrettyFormatOptions;
 use wasm_bindgen::{JsCast, JsValue};
-use web_sys::{Document, Element, Node};
+use web_sys::{Document, Element, HtmlElement, Node};
 
 use crate::{config::get_config, dom_element_filter::DomElementFilter, helpers::get_document};
 
@@ -23,6 +23,12 @@ impl From<Element> for DocumentOrElement {
     }
 }
 
+impl From<HtmlElement> for DocumentOrElement {
+    fn from(value: HtmlElement) -> Self {
+        Self::Element(value.into())
+    }
+}
+
 fn should_highlight() -> bool {
     // TODO
 
@@ -50,7 +56,7 @@ pub fn pretty_dom(dom: Option<DocumentOrElement>, max_length: Option<usize>) ->
     let max_length = max_length.unwrap_or(7000);
 
     if max_length == 0 {
-        return "".into();
+        return "".to_owned();
     }
 
     let dom: JsValue = match dom {
diff --git a/packages/dom/src/queries/alt_text.rs b/packages/dom/src/queries/alt_text.rs
index 4c5dbb4..ac96e13 100644
--- a/packages/dom/src/queries/alt_text.rs
+++ b/packages/dom/src/queries/alt_text.rs
@@ -15,12 +15,10 @@ pub fn _query_all_by_alt_text<M: Into<Matcher>>(
 ) -> Result<Vec<HtmlElement>, QueryError> {
     let valid_tag_regex = Regex::new(r"^(img|input|area|.+-.+)$").expect("Regex should be valid.");
 
-    Ok(
-        query_all_by_attribute("alt".to_string(), container, alt, options)?
-            .into_iter()
-            .filter(|node| valid_tag_regex.is_match(&node.tag_name()))
-            .collect(),
-    )
+    Ok(query_all_by_attribute("alt", container, alt, options)?
+        .into_iter()
+        .filter(|node| valid_tag_regex.is_match(&node.tag_name()))
+        .collect())
 }
 
 fn get_multiple_error(
diff --git a/packages/dom/src/queries/label_text.rs b/packages/dom/src/queries/label_text.rs
index 9be44c4..a9decbe 100644
--- a/packages/dom/src/queries/label_text.rs
+++ b/packages/dom/src/queries/label_text.rs
@@ -16,7 +16,7 @@ pub fn _query_all_by_label_text<M: Into<Matcher>>(
     options: SelectorMatcherOptions,
 ) -> Result<Vec<HtmlElement>, QueryError> {
     let text = text.into();
-    let selector = options.selector.unwrap_or("*".into());
+    let selector = options.selector.unwrap_or("*".to_owned());
     let matcher = match options.exact.unwrap_or(true) {
         true => matches,
         false => fuzzy_matches,
@@ -99,7 +99,7 @@ pub fn _query_all_by_label_text<M: Into<Matcher>>(
     });
 
     matching_labelled_elements.append(&mut query_all_by_attribute(
-        "aria-label".into(),
+        "aria-label",
         container,
         text,
         MatcherOptions {
diff --git a/packages/dom/src/queries/placeholder_text.rs b/packages/dom/src/queries/placeholder_text.rs
index 94045dc..d524a29 100644
--- a/packages/dom/src/queries/placeholder_text.rs
+++ b/packages/dom/src/queries/placeholder_text.rs
@@ -12,7 +12,7 @@ pub fn _query_all_by_placeholder_text<M: Into<Matcher>>(
     text: M,
     options: MatcherOptions,
 ) -> Result<Vec<HtmlElement>, QueryError> {
-    query_all_by_attribute("placeholder".to_string(), container, text, options)
+    query_all_by_attribute("placeholder", container, text, options)
 }
 
 fn get_multiple_error(
diff --git a/packages/dom/src/queries/role.rs b/packages/dom/src/queries/role.rs
index 0e0de72..cc25a82 100644
--- a/packages/dom/src/queries/role.rs
+++ b/packages/dom/src/queries/role.rs
@@ -53,7 +53,7 @@ pub fn _query_all_by_role<M: Into<ByRoleMatcher>>(
             .is_some_and(|role| role.props.contains_key(&AriaProperty::AriaSelected))
     {
         return Err(QueryError::Unsupported(format!(
-            "`aria-selected` is not supported on role \"{role}\"."
+            "\"aria-selected\" is not supported on role \"{role}\"."
         )));
     }
 
@@ -64,7 +64,7 @@ pub fn _query_all_by_role<M: Into<ByRoleMatcher>>(
             .is_some_and(|role| role.props.contains_key(&AriaProperty::AriaBusy))
     {
         return Err(QueryError::Unsupported(format!(
-            "`aria-busy` is not supported on role \"{role}\"."
+            "\"aria-busy\" is not supported on role \"{role}\"."
         )));
     }
 
@@ -75,7 +75,7 @@ pub fn _query_all_by_role<M: Into<ByRoleMatcher>>(
             .is_some_and(|role| role.props.contains_key(&AriaProperty::AriaChecked))
     {
         return Err(QueryError::Unsupported(format!(
-            "`aria-checked` is not supported on role \"{role}\"."
+            "\"aria-checked\" is not supported on role \"{role}\"."
         )));
     }
 
@@ -86,7 +86,7 @@ pub fn _query_all_by_role<M: Into<ByRoleMatcher>>(
             .is_some_and(|role| role.props.contains_key(&AriaProperty::AriaPressed))
     {
         return Err(QueryError::Unsupported(format!(
-            "`aria-pressed` is not supported on role \"{role}\"."
+            "\"aria-pressed\" is not supported on role \"{role}\"."
         )));
     }
 
@@ -99,7 +99,7 @@ pub fn _query_all_by_role<M: Into<ByRoleMatcher>>(
             .is_some_and(|role| role.props.contains_key(&AriaProperty::AriaCurrent))
     {
         return Err(QueryError::Unsupported(format!(
-            "`aria-current` is not supported on role \"{role}\"."
+            "\"aria-current\" is not supported on role \"{role}\"."
         )));
     }
 
@@ -117,7 +117,7 @@ pub fn _query_all_by_role<M: Into<ByRoleMatcher>>(
             .is_some_and(|role| role.props.contains_key(&AriaProperty::AriaValuenow))
     {
         return Err(QueryError::Unsupported(format!(
-            "`aria-valuenow` is not supported on role \"{role}\"."
+            "\"aria-valuenow\" is not supported on role \"{role}\"."
         )));
     }
 
@@ -128,7 +128,7 @@ pub fn _query_all_by_role<M: Into<ByRoleMatcher>>(
             .is_some_and(|role| role.props.contains_key(&AriaProperty::AriaValuemax))
     {
         return Err(QueryError::Unsupported(format!(
-            "`aria-valuemax` is not supported on role \"{role}\"."
+            "\"aria-valuemax\" is not supported on role \"{role}\"."
         )));
     }
 
@@ -139,7 +139,7 @@ pub fn _query_all_by_role<M: Into<ByRoleMatcher>>(
             .is_some_and(|role| role.props.contains_key(&AriaProperty::AriaValuemin))
     {
         return Err(QueryError::Unsupported(format!(
-            "`aria-valuemin` is not supported on role \"{role}\"."
+            "\"aria-valuemin\" is not supported on role \"{role}\"."
         )));
     }
 
@@ -150,7 +150,7 @@ pub fn _query_all_by_role<M: Into<ByRoleMatcher>>(
             .is_some_and(|role| role.props.contains_key(&AriaProperty::AriaValuetext))
     {
         return Err(QueryError::Unsupported(format!(
-            "`aria-valuetext` is not supported on role \"{role}\"."
+            "\"aria-valuetext\" is not supported on role \"{role}\"."
         )));
     }
 
@@ -161,7 +161,7 @@ pub fn _query_all_by_role<M: Into<ByRoleMatcher>>(
             .is_some_and(|role| role.props.contains_key(&AriaProperty::AriaExpanded))
     {
         return Err(QueryError::Unsupported(format!(
-            "`aria-expanded` is not supported on role \"{role}\"."
+            "\"aria-expanded\" is not supported on role \"{role}\"."
         )));
     }
 
@@ -316,8 +316,8 @@ fn get_name_hint(name: Option<Matcher>) -> String {
         Some(Matcher::String(name)) => format!(" and name \"{name}\""),
         Some(Matcher::Regex(name)) => format!(" and name `{name}`"),
         Some(Matcher::Number(name)) => format!(" and name `{name}`"),
-        Some(Matcher::Function(_name)) => " and name `Fn`".into(),
-        None => "".into(),
+        Some(Matcher::Function(_name)) => " and name `Fn`".to_owned(),
+        None => "".to_owned(),
     }
 }
 
diff --git a/packages/dom/src/queries/test_id.rs b/packages/dom/src/queries/test_id.rs
index 4a07a46..40fac3c 100644
--- a/packages/dom/src/queries/test_id.rs
+++ b/packages/dom/src/queries/test_id.rs
@@ -17,7 +17,7 @@ pub fn _query_all_by_test_id<M: Into<Matcher>>(
     id: M,
     options: MatcherOptions,
 ) -> Result<Vec<HtmlElement>, QueryError> {
-    query_all_by_attribute(get_test_id_attribute(), container, id, options)
+    query_all_by_attribute(&get_test_id_attribute(), container, id, options)
 }
 
 fn get_multiple_error(
diff --git a/packages/dom/src/queries/text.rs b/packages/dom/src/queries/text.rs
index dcbd40b..2018b8b 100644
--- a/packages/dom/src/queries/text.rs
+++ b/packages/dom/src/queries/text.rs
@@ -16,7 +16,7 @@ pub fn _query_all_by_text<M: Into<Matcher>>(
     options: SelectorMatcherOptions,
 ) -> Result<Vec<HtmlElement>, QueryError> {
     let text = text.into();
-    let selector = options.selector.unwrap_or("*".into());
+    let selector = options.selector.unwrap_or("*".to_owned());
     let ignore = options.ignore.unwrap_or(get_config().default_ignore.into());
     let matcher = match options.exact.unwrap_or(true) {
         true => matches,
@@ -77,7 +77,7 @@ fn get_missing_error(
     let normalized_text = match_normalizer(text.clone());
     let is_normalized_different = normalized_text != text;
 
-    let selector = options.selector.unwrap_or("*".into());
+    let selector = options.selector.unwrap_or("*".to_owned());
     let is_custom_selector = selector != "*";
 
     Ok(format!(
@@ -90,7 +90,7 @@ fn get_missing_error(
         },
         match is_custom_selector {
             true => format!(", which matches selector '{selector}'"),
-            false => "".into(),
+            false => "".to_owned(),
         }
     ))
 }
diff --git a/packages/dom/src/query_helpers.rs b/packages/dom/src/query_helpers.rs
index ca54a07..648f934 100644
--- a/packages/dom/src/query_helpers.rs
+++ b/packages/dom/src/query_helpers.rs
@@ -22,7 +22,7 @@ pub fn get_multiple_elements_found_error(message: String, container: Element) ->
 }
 
 pub fn query_all_by_attribute<M: Into<Matcher>>(
-    attribute: String,
+    attribute: &str,
     container: &HtmlElement,
     text: M,
     MatcherOptions {
@@ -54,7 +54,7 @@ pub fn query_all_by_attribute<M: Into<Matcher>>(
     .into_iter()
     .filter(|node| {
         matcher(
-            node.get_attribute(&attribute),
+            node.get_attribute(attribute),
             Some(node),
             &text,
             match_normalizer.as_ref(),
@@ -64,14 +64,14 @@ pub fn query_all_by_attribute<M: Into<Matcher>>(
 }
 
 pub fn query_by_attribute<M: Into<Matcher>>(
-    attribute: String,
+    attribute: &str,
     container: &HtmlElement,
     text: M,
     options: MatcherOptions,
 ) -> Result<Option<HtmlElement>, QueryError> {
     let text = text.into();
 
-    let mut els = query_all_by_attribute(attribute.clone(), container, text.clone(), options)?;
+    let mut els = query_all_by_attribute(attribute, container, text.clone(), options)?;
     if els.len() > 1 {
         Err(get_multiple_elements_found_error(
             format!("Found multiple elements by [{attribute}={text}]"),
diff --git a/packages/dom/src/role_helpers.rs b/packages/dom/src/role_helpers.rs
index 45c4f18..c1bea6b 100644
--- a/packages/dom/src/role_helpers.rs
+++ b/packages/dom/src/role_helpers.rs
@@ -1,4 +1,4 @@
-use std::{collections::HashMap, sync::LazyLock};
+use std::{hash::RandomState, sync::LazyLock};
 
 use aria_query::{
     AriaRoleDefinitionKey, AriaRoleRelationConcept, AriaRoleRelationConceptAttributeConstraint,
@@ -7,6 +7,7 @@ use aria_query::{
 use dom_accessibility_api::{
     ComputeTextAlternativeOptions, compute_accessible_description, compute_accessible_name,
 };
+use ordered_hash_map::OrderedHashMap;
 use wasm_bindgen::JsCast;
 use web_sys::{Element, HtmlElement, HtmlInputElement, HtmlOptionElement};
 
@@ -84,8 +85,9 @@ static ELEMENT_ROLE_LIST: LazyLock<Vec<ElementRole>> = LazyLock::new(|| {
         result.push(ElementRole {
             r#match: Box::new(move |element| {
                 if type_text_index.is_some()
-                    && let Some(input_element) = element.dyn_ref::<HtmlInputElement>()
-                    && input_element.type_() != "text"
+                    && element
+                        .dyn_ref::<HtmlInputElement>()
+                        .is_none_or(|input_element| input_element.type_() != "text")
                 {
                     return false;
                 }
@@ -110,7 +112,7 @@ pub fn is_subtree_inaccessible(element: &Element) -> bool {
         return true;
     }
 
-    if element.get_attribute("aria-hidden") == Some("true".into()) {
+    if element.get_attribute("aria-hidden") == Some("true".to_owned()) {
         return true;
     }
 
@@ -189,7 +191,7 @@ pub struct GetRolesOptions {
 pub fn get_roles(
     container: Element,
     options: GetRolesOptions,
-) -> HashMap<AriaRoleDefinitionKey, Vec<Element>> {
+) -> OrderedHashMap<AriaRoleDefinitionKey, Vec<Element>, RandomState> {
     fn flatten_dom(element: Element) -> Vec<Element> {
         let mut elements = vec![element.clone()];
         elements.extend(
@@ -206,28 +208,36 @@ pub fn get_roles(
     flatten_dom(container)
         .into_iter()
         .filter(|element| hidden || !is_inaccessible(element))
-        .fold(HashMap::new(), |mut acc, element| {
-            // TODO: This violates html-aria which does not allow any role on every element.
-            let roles = if element.has_attribute("role") {
-                element
-                    .get_attribute("role")
-                    .expect("Attribute should exist.")
-                    .split(' ')
-                    .filter_map(|role| role.parse::<AriaRoleDefinitionKey>().ok())
-                    .take(1)
-                    .collect::<Vec<_>>()
-            } else {
-                get_implicit_aria_roles(&element)
-            };
-
-            for role in roles {
-                acc.entry(role)
-                    .and_modify(|entry| entry.push(element.clone()))
-                    .or_insert_with(|| vec![element.clone()]);
-            }
+        .fold(
+            OrderedHashMap::with_hasher(RandomState::new()),
+            |mut acc, element| {
+                // TODO: This violates html-aria which does not allow any role on every element.
+                let roles = if element.has_attribute("role") {
+                    element
+                        .get_attribute("role")
+                        .expect("Attribute should exist.")
+                        .split(' ')
+                        .filter_map(|role| role.parse::<AriaRoleDefinitionKey>().ok())
+                        .take(1)
+                        .collect::<Vec<_>>()
+                } else {
+                    get_implicit_aria_roles(&element)
+                };
+
+                for role in roles {
+                    match acc.get_mut(&role) {
+                        Some(entry) => {
+                            entry.push(element.clone());
+                        }
+                        None => {
+                            acc.insert(role, vec![element.clone()]);
+                        }
+                    }
+                }
 
-            acc
-        })
+                acc
+            },
+        )
 }
 
 #[derive(Clone, Default)]
diff --git a/packages/dom/src/types/matches.rs b/packages/dom/src/types/matches.rs
index 78d13b5..749e5e6 100644
--- a/packages/dom/src/types/matches.rs
+++ b/packages/dom/src/types/matches.rs
@@ -20,7 +20,7 @@ impl Display for Matcher {
             f,
             "{}",
             match self {
-                Self::Function(_) => "MatcherFn".to_string(),
+                Self::Function(_) => "MatcherFn".to_owned(),
                 Self::Regex(regex) => regex.to_string(),
                 Self::Number(n) => n.to_string(),
                 Self::String(s) => s.clone(),
@@ -155,8 +155,8 @@ impl SelectorMatcherOptions {
         self
     }
 
-    pub fn selector(mut self, value: String) -> Self {
-        self.selector = Some(value);
+    pub fn selector(mut self, value: &str) -> Self {
+        self.selector = Some(value.to_owned());
         self
     }
 
diff --git a/packages/dom/src/types/queries.rs b/packages/dom/src/types/queries.rs
index e389d15..b247084 100644
--- a/packages/dom/src/types/queries.rs
+++ b/packages/dom/src/types/queries.rs
@@ -87,13 +87,13 @@ impl ByRoleOptions {
         self
     }
 
-    pub fn name(mut self, value: Matcher) -> Self {
-        self.name = Some(value);
+    pub fn name<M: Into<Matcher>>(mut self, value: M) -> Self {
+        self.name = Some(value.into());
         self
     }
 
-    pub fn description(mut self, value: Matcher) -> Self {
-        self.description = Some(value);
+    pub fn description<M: Into<Matcher>>(mut self, value: M) -> Self {
+        self.description = Some(value.into());
         self
     }
 }
diff --git a/packages/dom/src/util.rs b/packages/dom/src/util.rs
index df71aa5..388972a 100644
--- a/packages/dom/src/util.rs
+++ b/packages/dom/src/util.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use wasm_bindgen::JsCast;
-use web_sys::{HtmlCollection, NamedNodeMap, NodeList};
+use web_sys::{Attr, HtmlCollection, NamedNodeMap, NodeList};
 
 pub fn html_collection_to_vec<T: JsCast>(collection: HtmlCollection) -> Vec<T> {
     let mut result = Vec::with_capacity(
@@ -21,6 +21,20 @@ pub fn html_collection_to_vec<T: JsCast>(collection: HtmlCollection) -> Vec<T> {
     result
 }
 
+pub fn named_node_map_to_vec(named_node_map: NamedNodeMap) -> Vec<Attr> {
+    let mut result = Vec::with_capacity(
+        named_node_map
+            .length()
+            .try_into()
+            .expect("usize should be at least u32."),
+    );
+    for i in 0..named_node_map.length() {
+        let attr = named_node_map.item(i).expect("Item should exist.");
+        result.push(attr);
+    }
+    result
+}
+
 pub fn named_node_map_to_hashmap(named_node_map: NamedNodeMap) -> HashMap<String, String> {
     let mut result = HashMap::with_capacity(
         named_node_map
diff --git a/packages/dom/tests/aria_attributes.rs b/packages/dom/tests/aria_attributes.rs
new file mode 100644
index 0000000..07ac0fe
--- /dev/null
+++ b/packages/dom/tests/aria_attributes.rs
@@ -0,0 +1,225 @@
+// TODO: Enable `cfg`, disable `expect`.
+// #![cfg(target_arch = "wasm32")]
+#![allow(dead_code)]
+
+mod helpers;
+
+use indoc::indoc;
+use testing_library_dom::{AriaRole, ByRoleOptions, QueryError, SelectorMatcherOptions};
+use wasm_bindgen::JsCast;
+use wasm_bindgen_test::{wasm_bindgen_test, wasm_bindgen_test_configure};
+use web_sys::HtmlInputElement;
+
+use crate::helpers::test_utils::render_into_document_div;
+
+use self::helpers::test_utils::{RenderReturn, render};
+
+wasm_bindgen_test_configure!(run_in_browser);
+
+#[wasm_bindgen_test]
+fn selected_throws_on_unsupported_roles() {
+    let RenderReturn {
+        container_queries, ..
+    } = render("<input aria-selected=\"true\" type=\"text\">", None);
+
+    assert_eq!(
+        container_queries.get_by_role(AriaRole::Textbox, ByRoleOptions::default().selected(true)),
+        Err(QueryError::Unsupported(
+            "\"aria-selected\" is not supported on role \"textbox\".".to_owned()
+        ))
+    );
+}
+
+#[wasm_bindgen_test]
+fn pressed_throws_on_unsupported_roles() {
+    let RenderReturn {
+        container_queries, ..
+    } = render("<input aria-pressed=\"true\" type=\"text\">", None);
+
+    assert_eq!(
+        container_queries.get_by_role(AriaRole::Textbox, ByRoleOptions::default().pressed(true)),
+        Err(QueryError::Unsupported(
+            "\"aria-pressed\" is not supported on role \"textbox\".".to_owned()
+        ))
+    );
+}
+
+#[wasm_bindgen_test]
+fn checked_throws_on_unsupported_roles() {
+    let RenderReturn {
+        container_queries, ..
+    } = render("<input aria-checked=\"true\" type=\"text\">", None);
+
+    assert_eq!(
+        container_queries.get_by_role(AriaRole::Textbox, ByRoleOptions::default().checked(true)),
+        Err(QueryError::Unsupported(
+            "\"aria-checked\" is not supported on role \"textbox\".".to_owned()
+        ))
+    );
+}
+
+#[wasm_bindgen_test]
+fn expanded_throws_on_unsupported_roles() {
+    let RenderReturn {
+        container_queries, ..
+    } = render("<h1 aria-expanded=\"true\">Heading</h1>", None);
+
+    assert_eq!(
+        container_queries.get_by_role(AriaRole::Heading, ByRoleOptions::default().expanded(true)),
+        Err(QueryError::Unsupported(
+            "\"aria-expanded\" is not supported on role \"heading\".".to_owned()
+        ))
+    );
+}
+
+#[wasm_bindgen_test]
+fn busy_throws_on_unsupported_roles() {
+    let RenderReturn {
+        container_queries, ..
+    } = render(
+        "<div aria-busy=\"true\" role=\"none\">Hello, Dave!</div>",
+        None,
+    );
+
+    assert_eq!(
+        container_queries.get_by_role(AriaRole::None, ByRoleOptions::default().busy(true)),
+        Err(QueryError::Unsupported(
+            "\"aria-busy\" is not supported on role \"none\".".to_owned()
+        ))
+    );
+}
+
+#[wasm_bindgen_test]
+fn busy_true_false_matches_busy_regions() {
+    let RenderReturn {
+        container_queries, ..
+    } = render_into_document_div(indoc! {"
+      <div>
+        <div role=\"log\" aria-busy=\"true\" />
+        <div role=\"log\" aria-busy=\"false\" />
+      </div>
+    "});
+
+    assert!(
+        container_queries
+            .get_by_role(AriaRole::Log, ByRoleOptions::default().busy(true))
+            .expect("Get should succeed.")
+            .is_some(),
+    );
+    assert!(
+        container_queries
+            .get_by_role(AriaRole::Log, ByRoleOptions::default().busy(false))
+            .expect("Get should succeed.")
+            .is_some(),
+    );
+}
+
+#[wasm_bindgen_test]
+fn checked_true_false_matches_checked_checkboxes() {
+    let RenderReturn {
+        container_queries, ..
+    } = render_into_document_div(indoc! {"
+      <div>
+        <input type=\"checkbox\" checked />
+        <input type=\"checkbox\" />
+      </div>
+    "});
+
+    assert!(
+        container_queries
+            .get_by_role(AriaRole::Checkbox, ByRoleOptions::default().checked(true))
+            .expect("Get should succeed.")
+            .is_some(),
+    );
+    assert!(
+        container_queries
+            .get_by_role(AriaRole::Checkbox, ByRoleOptions::default().checked(false))
+            .expect("Get should succeed.")
+            .is_some(),
+    );
+}
+
+#[wasm_bindgen_test]
+fn checked_true_false_matches_checked_elements_with_proper_role() {
+    let RenderReturn {
+        container_queries, ..
+    } = render_into_document_div(indoc! {"
+      <div>
+        <span role=\"checkbox\" aria-checked=\"true\">✔</span>
+        <span role=\"checkbox\" aria-checked=\"false\">𝒙</span>
+      </div>
+    "});
+
+    assert!(
+        container_queries
+            .get_by_role(AriaRole::Checkbox, ByRoleOptions::default().checked(true))
+            .expect("Get should succeed.")
+            .is_some(),
+    );
+    assert!(
+        container_queries
+            .get_by_role(AriaRole::Checkbox, ByRoleOptions::default().checked(false))
+            .expect("Get should succeed.")
+            .is_some(),
+    );
+}
+
+#[wasm_bindgen_test]
+fn checked_true_false_does_not_match_element_in_indeterminate_state() {
+    let RenderReturn {
+        container_queries, ..
+    } = render_into_document_div(indoc! {"
+      <div>
+        <span role=\"checkbox\" aria-checked=\"mixed\">not so much</span>
+        <input type=\"checkbox\" checked aria-label=\"indeteminate yes\" />
+        <input type=\"checkbox\" aria-label=\"indeteminate no\" />
+      </div>
+    "});
+
+    container_queries
+        .get_by_label_text("indeteminate yes", SelectorMatcherOptions::default())
+        .expect("Get should succeed.")
+        .expect("Get should return a result.")
+        .unchecked_into::<HtmlInputElement>()
+        .set_indeterminate(true);
+    container_queries
+        .get_by_label_text("indeteminate no", SelectorMatcherOptions::default())
+        .expect("Get should succeed.")
+        .expect("Get should return a result.")
+        .unchecked_into::<HtmlInputElement>()
+        .set_indeterminate(true);
+
+    assert!(
+        container_queries
+            .query_by_role(
+                AriaRole::Checkbox,
+                ByRoleOptions::default()
+                    .checked(true)
+                    .name("indeteminate yes")
+            )
+            .expect("Get should succeed.")
+            .is_none(),
+    );
+    assert!(
+        container_queries
+            .query_by_role(
+                AriaRole::Checkbox,
+                ByRoleOptions::default()
+                    .checked(false)
+                    .name("indeteminate no")
+            )
+            .expect("Get should succeed.")
+            .is_none(),
+    );
+    assert!(
+        container_queries
+            .query_by_role(
+                AriaRole::Checkbox,
+                ByRoleOptions::default().checked(true).name("not so much")
+            )
+            .expect("Get should succeed.")
+            .is_none(),
+    );
+}
+
+// TODO: More tests.
diff --git a/packages/dom/tests/config.rs b/packages/dom/tests/config.rs
index cdaf947..185b0b1 100644
--- a/packages/dom/tests/config.rs
+++ b/packages/dom/tests/config.rs
@@ -61,7 +61,7 @@ fn configure_overrides_existing_values() {
     let lock = before_each();
 
     configure(ConfigFnOrPartial::Partial(
-        PartialConfig::default().test_id_attribute("new-id".into()),
+        PartialConfig::default().test_id_attribute("new-id".to_owned()),
     ));
 
     let config = get_config();
diff --git a/packages/dom/tests/element_queries.rs b/packages/dom/tests/element_queries.rs
index 04992f3..811b18c 100644
--- a/packages/dom/tests/element_queries.rs
+++ b/packages/dom/tests/element_queries.rs
@@ -1,16 +1,19 @@
-#![cfg(target_arch = "wasm32")]
+// TODO: Enable `cfg`, disable `expect`.
+// #![cfg(target_arch = "wasm32")]
+#![allow(dead_code)]
 
 mod helpers;
 
 use std::sync::{Arc, LazyLock, Mutex};
 
 use indoc::indoc;
+use regex::Regex;
 use testing_library_dom::{
     ConfigFnOrPartial, MatcherOptions, PartialConfig, QueryError, SelectorMatcherOptions, configure,
 };
 use wasm_bindgen_test::{wasm_bindgen_test, wasm_bindgen_test_configure};
 
-use self::helpers::test_utils::{RenderReturn, render};
+use self::helpers::test_utils::{RenderReturn, document, render};
 
 wasm_bindgen_test_configure!(run_in_browser);
 
@@ -156,7 +159,7 @@ fn get_throws_a_useful_error_message() -> Result<(), QueryError> {
             </div>"}
             .into()
         )),
-        container_queries.get_by_text("LucyRicardo", SelectorMatcherOptions::default().selector("span".into()))
+        container_queries.get_by_text("LucyRicardo", SelectorMatcherOptions::default().selector("span"))
     );
     assert_eq!(
         Err(QueryError::Element(
@@ -231,3 +234,532 @@ fn get_throws_a_useful_error_message() -> Result<(), QueryError> {
 
     Ok(())
 }
+
+#[wasm_bindgen_test]
+fn can_get_elements_by_matching_their_text_content() {
+    let RenderReturn {
+        container_queries, ..
+    } = render(
+        indoc! {"
+          <div>
+            <span>Currently showing</span>
+            <span>
+              Step
+              1
+                of 4
+            </span>
+          </div>
+        "},
+        None,
+    );
+
+    assert!(
+        container_queries
+            .query_by_text("Currently showing", SelectorMatcherOptions::default())
+            .ok()
+            .is_some()
+    );
+    assert!(
+        container_queries
+            .query_by_text("Step 1 of 4", SelectorMatcherOptions::default())
+            .ok()
+            .is_some()
+    );
+}
+
+#[wasm_bindgen_test]
+fn can_get_elements_by_matching_their_text_across_adjacent_text_nodes() {
+    let document = document();
+
+    let text_div = document
+        .create_element("div")
+        .expect("Element should be created.");
+    let text_node_content = ["£", "24", ".", "99"];
+
+    for text in text_node_content {
+        let text_node = document.create_text_node(text);
+        text_div
+            .append_child(&text_node)
+            .expect("Child should be appended.");
+    }
+
+    let RenderReturn {
+        container,
+        container_queries,
+        ..
+    } = render("<div />", None);
+
+    container
+        .append_child(&text_div)
+        .expect("Child should be appended.");
+
+    assert!(
+        container_queries
+            .query_by_text("£24.99", SelectorMatcherOptions::default())
+            .ok()
+            .is_some()
+    );
+}
+
+#[wasm_bindgen_test]
+fn can_get_input_elements_with_type_submit_or_button_or_reset() {
+    let RenderReturn {
+        container_queries, ..
+    } = render(
+        indoc! {"
+          <div>
+            <input type=\"submit\" value=\"Send data\"/>
+            <input type=\"reset\" value=\"Clear EVERYTHING\"/>
+            <input type=\"button\" value=\"Push me!\"/>
+            <input type=\"text\" value=\"user data\" />
+          </div>
+        "},
+        None,
+    );
+
+    assert!(
+        container_queries
+            .query_by_text("Send data", SelectorMatcherOptions::default())
+            .expect("Query should succeed.")
+            .is_some()
+    );
+    assert!(
+        container_queries
+            .query_by_text("Clear EVERYTHING", SelectorMatcherOptions::default())
+            .expect("Query should succeed.")
+            .is_some()
+    );
+    assert!(
+        container_queries
+            .query_by_text("Push me!", SelectorMatcherOptions::default())
+            .expect("Query should succeed.")
+            .is_some()
+    );
+    assert!(
+        container_queries
+            .query_by_text("user data", SelectorMatcherOptions::default())
+            .expect("Query should succeed.")
+            .is_none()
+    );
+}
+
+#[wasm_bindgen_test]
+fn matches_case_with_regexp_matcher() {
+    let RenderReturn {
+        container_queries, ..
+    } = render("<span>STEP 1 of 4</span>", None);
+
+    assert!(
+        container_queries
+            .query_by_text(
+                Regex::new("STEP 1 of 4").expect("Regex should be valid."),
+                SelectorMatcherOptions::default()
+            )
+            .expect("Query should succeed.")
+            .is_some()
+    );
+    assert!(
+        container_queries
+            .query_by_text(
+                Regex::new("Step 1 of 4").expect("Regex should be valid."),
+                SelectorMatcherOptions::default()
+            )
+            .expect("Query should succeed.")
+            .is_none()
+    );
+}
+
+#[wasm_bindgen_test]
+fn query_by_text_matches_case_with_non_string_matcher() {
+    let RenderReturn {
+        container_queries, ..
+    } = render("<span>1</span>", None);
+
+    assert!(
+        container_queries
+            .query_by_text(1_f64, SelectorMatcherOptions::default())
+            .expect("Query should succeed.")
+            .is_some()
+    );
+}
+
+#[ignore = "TODO: Fix failing test."]
+#[wasm_bindgen_test]
+fn can_get_form_controls_by_label_text() {
+    let RenderReturn {
+        container_queries, ..
+    } = render(
+        indoc! {"
+        <div>
+          <label>
+            1st<input id=\"first-id\" />
+          </label>
+          <div>
+            <label for=\"second-id\">2nd</label>
+            <input id=\"second-id\" />
+          </div>
+          <div>
+            <label id=\"third-label\">3rd</label>
+            <input aria-labelledby=\"third-label\" id=\"third-id\" />
+          </div>
+          <div>
+            <label for=\"fourth.id\">4th</label>
+            <input id=\"fourth.id\" />
+          </div>
+          <div>
+          <div>
+            <label id=\"fifth-label-one\">5th one</label>
+            <label id=\"fifth-label-two\">5th two</label>
+            <input aria-labelledby=\"fifth-label-one fifth-label-two\" id=\"fifth-id\" />
+          </div>
+          <div>
+            <input id=\"sixth-label-one\" value=\"6th one\"/>
+            <input id=\"sixth-label-two\" value=\"6th two\"/>
+            <label id=\"sixth-label-three\">6th three</label>
+            <input aria-labelledby=\"sixth-label-one sixth-label-two sixth-label-three\" id=\"sixth-id\" />
+          </div>
+          <div>
+            <span id=\"seventh-label-one\">7th one</span>
+            <input aria-labelledby=\"seventh-label-one\" id=\"seventh-id\" />
+          </div>
+          <div>
+            <label id=\"eighth.label\">8th one</label>
+            <input aria-labelledby=\"eighth.label\" id=\"eighth.id\" />
+          </div>
+        </div>
+      "},
+        None,
+    );
+
+    assert_eq!(
+        container_queries
+            .get_by_label_text("1st", SelectorMatcherOptions::default())
+            .expect("Get should succeed.")
+            .map(|element| element.id()),
+        Some("first-id".to_owned())
+    );
+    assert_eq!(
+        container_queries
+            .get_by_label_text("2nd", SelectorMatcherOptions::default())
+            .expect("Get should succeed.")
+            .map(|element| element.id()),
+        Some("second-id".to_owned())
+    );
+    assert_eq!(
+        container_queries
+            .get_by_label_text("3rd", SelectorMatcherOptions::default())
+            .expect("Get should succeed.")
+            .map(|element| element.id()),
+        Some("third-id".to_owned())
+    );
+    assert_eq!(
+        container_queries
+            .get_by_label_text("4th", SelectorMatcherOptions::default())
+            .expect("Get should succeed.")
+            .map(|element| element.id()),
+        Some("fourth-id".to_owned())
+    );
+    assert_eq!(
+        container_queries
+            .get_by_label_text("5th one", SelectorMatcherOptions::default())
+            .expect("Get should succeed.")
+            .map(|element| element.id()),
+        Some("fifth-id".to_owned())
+    );
+    assert_eq!(
+        container_queries
+            .get_by_label_text("5th two", SelectorMatcherOptions::default())
+            .expect("Get should succeed.")
+            .map(|element| element.id()),
+        Some("fifth-id".to_owned())
+    );
+    assert_eq!(
+        container_queries
+            .get_by_label_text("6th one", SelectorMatcherOptions::default())
+            .expect("Get should succeed.")
+            .map(|element| element.id()),
+        Some("sixth-id".to_owned())
+    );
+    assert_eq!(
+        container_queries
+            .get_by_label_text("6th two", SelectorMatcherOptions::default())
+            .expect("Get should succeed.")
+            .map(|element| element.id()),
+        Some("sixth-id".to_owned())
+    );
+    assert_eq!(
+        container_queries
+            .get_by_label_text("6th one 6th two", SelectorMatcherOptions::default())
+            .expect("Get should succeed.")
+            .map(|element| element.id()),
+        Some("sixth-id".to_owned())
+    );
+    assert_eq!(
+        container_queries
+            .get_by_label_text(
+                "6th one 6th two 6th three",
+                SelectorMatcherOptions::default()
+            )
+            .expect("Get should succeed.")
+            .map(|element| element.id()),
+        Some("sixth-id".to_owned())
+    );
+    assert_eq!(
+        container_queries
+            .get_by_label_text("7th one", SelectorMatcherOptions::default())
+            .expect("Get should succeed.")
+            .map(|element| element.id()),
+        Some("seventh-id".to_owned())
+    );
+    assert_eq!(
+        container_queries
+            .get_by_label_text("8th one", SelectorMatcherOptions::default())
+            .expect("Get should succeed.")
+            .map(|element| element.id()),
+        Some("eighth.id".to_owned())
+    );
+}
+
+#[wasm_bindgen_test]
+fn can_get_elements_labelled_with_aria_labelledby_attribute() {
+    let RenderReturn {
+        container_queries, ..
+    } = render(
+        indoc! {"
+          <div>
+            <h1 id=\"content-header\">The Gettysburg Address</h1>
+            <main id=\"sibling-of-content-header\" aria-labelledby=\"content-header\">
+              <section aria-labelledby=\"content-header section-one-header\" id=\"section-one\">
+                <h2 id=\"section-one-header\">Section One</h2>
+                <p>Four score and seven years ago, ...</p>
+              </section>
+            </main>
+            <p>The Gettysburg Address</p>
+          </div>
+        "},
+        None,
+    );
+
+    let result = container_queries
+        .get_all_by_label_text("The Gettysburg Address", SelectorMatcherOptions::default())
+        .expect("Get should succeed.")
+        .into_iter()
+        .map(|element| element.id())
+        .collect::<Vec<_>>();
+
+    assert_eq!(result.len(), 2);
+    assert_eq!(result, vec!["sibling-of-content-header", "section-one"]);
+    assert_eq!(
+        container_queries
+            .get_by_label_text("Section One", SelectorMatcherOptions::default())
+            .expect("Get should succeed.")
+            .map(|element| element.id()),
+        Some("section-one".to_owned())
+    );
+}
+
+#[wasm_bindgen_test]
+fn can_get_sibling_elements_with_aria_labelledby_attribute() {
+    let RenderReturn {
+        container_queries, ..
+    } = render(
+        indoc! {"
+          <div>
+            <svg id=\"icon\" aria-labelledby=\"icon-desc\"></svg>
+            <span id=\"icon-desc\">Tacos</span>
+          </div>
+        "},
+        None,
+    );
+
+    let result = container_queries
+        .get_all_by_label_text("Tacos", SelectorMatcherOptions::default())
+        .expect("Get should succeed.");
+
+    assert_eq!(result.len(), 1);
+    assert_eq!(
+        result.first().map(|element| element.id()),
+        Some("icon".to_owned())
+    );
+}
+
+#[ignore = "TODO: Fix failing test."]
+#[wasm_bindgen_test]
+fn can_filter_results_of_label_query_based_on_selector() {
+    let RenderReturn {
+        container_queries, ..
+    } = render(
+        indoc! {"
+          <div>
+            <label id=\"label1\" for=\"input1\">
+              Test Label
+              <input id=\"input2\" />
+            </label>
+            <input id=\"input1\" class=\"fancy-input\" />
+            <span aria-labelledby=\"label1\">Some hint text</span>
+          </div>
+        "},
+        None,
+    );
+
+    let result = container_queries
+        .get_all_by_label_text(
+            "Test Label",
+            SelectorMatcherOptions::default().selector(".fancy-input"),
+        )
+        .expect("Get should succeed.");
+
+    assert_eq!(result.len(), 1);
+    assert_eq!(
+        result.first().map(|element| element.id()),
+        Some("input1".to_owned())
+    );
+}
+
+#[ignore = "TODO: Fix failing test."]
+#[wasm_bindgen_test]
+fn can_find_any_labelable_element_when_label_text_is_inside_other_elements() {
+    let RenderReturn {
+        container_queries, ..
+    } = render(
+        indoc! {"
+          <label>
+            <span>Test</span>
+            <span>Label</span>
+            <button />
+            <input />
+            <meter />
+            <output />
+            <progress />
+            <select />
+            <textarea />
+          </label>
+        "},
+        None,
+    );
+
+    let node_types = [
+        "button", "input", "meter", "output", "progress", "select", "textarea",
+    ];
+    for node_type in node_types {
+        assert_eq!(
+            container_queries
+                .get_by_label_text(
+                    "Test Label",
+                    SelectorMatcherOptions::default().selector(node_type)
+                )
+                .expect("Get should succeed.")
+                .map(|element| element.node_name()),
+            Some(node_type.to_uppercase())
+        );
+    }
+}
+
+// According to the spec, the first descendant of a label that is a labelable element is the labeled control.
+// https://html.spec.whatwg.org/multipage/forms.html#the-label-element
+#[ignore = "TODO: Fix failing test."]
+#[wasm_bindgen_test]
+fn returns_the_labelable_element_control_inside_a_label() {
+    let RenderReturn {
+        container_queries, ..
+    } = render(
+        indoc! {"
+          <label>
+            <span>Test</span>
+            <span>Label</span>
+            <button />
+            <input />
+            <meter />
+            <output />
+            <progress />
+            <select />
+            <textarea ></textarea>
+          </label>
+        "},
+        None,
+    );
+
+    assert_eq!(
+        container_queries
+            .get_by_label_text("Test Label", SelectorMatcherOptions::default())
+            .expect("Get should succeed.")
+            .map(|element| element.node_name()),
+        Some("BUTTON".to_owned())
+    );
+}
+
+#[ignore = "TODO: Fix failing test."]
+#[wasm_bindgen_test]
+fn can_find_non_input_elements_when_aria_labelledby_a_label() {
+    let RenderReturn {
+        container_queries, ..
+    } = render(
+        indoc! {"
+          <div>
+            <label id=\"label1\">Test Label</label>
+            <ul aria-labelledby=\"label1\">
+              <li>Hello</li>
+            </ul
+          </div>
+        "},
+        None,
+    );
+
+    let result = container_queries
+        .get_all_by_label_text("Test Label", SelectorMatcherOptions::default())
+        .expect("Get should succeed.");
+
+    assert_eq!(result.len(), 1);
+    assert_eq!(
+        result.first().map(|element| element.node_name()),
+        Some("UL".to_owned())
+    );
+}
+
+#[ignore = "TODO: Fix failing test."]
+#[wasm_bindgen_test]
+fn can_find_the_correct_element_when_there_are_multiple_matching_labels() {
+    let RenderReturn {
+        container_queries, ..
+    } = render(
+        indoc! {"
+          <label>
+            Test Label
+            <input />
+          </label>
+          <label>
+            Test Label
+            <textarea></textarea>
+          </label>
+        "},
+        None,
+    );
+
+    let result = container_queries
+        .get_by_label_text(
+            "Test Label",
+            SelectorMatcherOptions::default().selector("input"),
+        )
+        .expect("Get should succeed.");
+
+    assert_eq!(
+        result.map(|element| element.node_name()),
+        Some("INPUT".to_owned())
+    );
+}
+
+#[wasm_bindgen_test]
+fn query_by_placeholder_text_matches_case_with_non_string_matcher() {
+    let RenderReturn {
+        container_queries, ..
+    } = render("<input placeholder=\"1\" />", None);
+
+    assert!(
+        container_queries
+            .query_by_placeholder_text(1_f64, MatcherOptions::default())
+            .expect("Query should succeed.")
+            .is_some()
+    );
+}
+
+// TODO: More tests.
diff --git a/packages/dom/tests/event_wrapper.rs b/packages/dom/tests/event_wrapper.rs
new file mode 100644
index 0000000..749d846
--- /dev/null
+++ b/packages/dom/tests/event_wrapper.rs
@@ -0,0 +1,75 @@
+#![cfg(target_arch = "wasm32")]
+
+mod helpers;
+
+use std::sync::{Arc, LazyLock, Mutex, MutexGuard};
+
+use mockall::automock;
+use testing_library_dom::{ConfigFnOrPartial, FireEvent, PartialConfig, configure};
+use wasm_bindgen_test::{wasm_bindgen_test, wasm_bindgen_test_configure};
+
+use self::helpers::test_utils::document;
+
+wasm_bindgen_test_configure!(run_in_browser);
+
+static CONFIG_LOCK: Mutex<()> = Mutex::new(());
+static ORIGINAL_CONFIG: LazyLock<Arc<Mutex<PartialConfig>>> =
+    LazyLock::new(|| Arc::new(Mutex::new(PartialConfig::default())));
+
+fn before_each() -> MutexGuard<'static, ()> {
+    // Ensure only one test modifies the config at the same time.
+    let lock = CONFIG_LOCK
+        .lock()
+        .expect("Config mutex should be acquired.");
+
+    configure(ConfigFnOrPartial::Fn(Box::new(|existing_config| {
+        // Grab the existing configuration so we can restore it at the end of the test.
+        let mut original_config = ORIGINAL_CONFIG
+            .lock()
+            .expect("Original config mutex should be acquired.");
+        *original_config = PartialConfig::from(existing_config);
+
+        // Don't change the existing config.
+        PartialConfig::default()
+    })));
+
+    lock
+}
+
+fn after_each(lock: MutexGuard<'_, ()>) {
+    let original_config = ORIGINAL_CONFIG
+        .lock()
+        .expect("Original config mutex should be acquired.");
+
+    configure(ConfigFnOrPartial::Partial((*original_config).clone()));
+
+    drop(lock);
+}
+
+#[wasm_bindgen_test]
+fn fire_event_calls_the_event_wrapper() {
+    let lock = before_each();
+
+    #[automock]
+    trait EventWrapper {
+        fn call(&self);
+    }
+
+    let mut mock = MockEventWrapper::new();
+    mock.expect_call().times(1).return_const(());
+
+    configure(ConfigFnOrPartial::Partial(
+        PartialConfig::default().event_wrapper(Arc::new(move |cb| {
+            mock.call();
+            cb()
+        })),
+    ));
+
+    let el = document()
+        .create_element("div")
+        .expect("Element should be created.");
+
+    FireEvent::click(&el).expect("Event should be fired.");
+
+    after_each(lock);
+}
diff --git a/packages/dom/tests/events.rs b/packages/dom/tests/events.rs
index aa2a9e6..d29b16c 100644
--- a/packages/dom/tests/events.rs
+++ b/packages/dom/tests/events.rs
@@ -9,7 +9,12 @@ use send_wrapper::SendWrapper;
 use testing_library_dom::{CreateEventOptions, FireEvent, create_event, fire_event};
 use wasm_bindgen::{JsCast, prelude::Closure};
 use wasm_bindgen_test::{wasm_bindgen_test, wasm_bindgen_test_configure};
-use web_sys::{Event, KeyboardEvent, KeyboardEventInit};
+use web_sys::{
+    AddEventListenerOptions, Event, KeyboardEvent, KeyboardEventInit, MessageEvent,
+    MessageEventInit, MouseEvent, PopStateEvent, PopStateEventInit,
+    js_sys::{Object, Reflect},
+    window,
+};
 
 use self::helpers::test_utils::document;
 
@@ -20,10 +25,120 @@ trait Spy {
     fn call_event(&self, event: SendWrapper<Event>);
 
     fn call_keyboard_event(&self, event: SendWrapper<KeyboardEvent>);
+
+    fn call_message_event(&self, event: SendWrapper<MessageEvent>);
+
+    fn call_mouse_event(&self, event: SendWrapper<MouseEvent>);
+
+    fn call_pop_state_event(&self, event: SendWrapper<PopStateEvent>);
+}
+
+// TODO: More tests.
+
+#[wasm_bindgen_test]
+fn fires_resize() {
+    let window = document()
+        .default_view()
+        .expect("Document should have default view.");
+
+    let mut mock = MockSpy::new();
+    mock.expect_call_event().times(1).return_const(());
+
+    let listener = Closure::<dyn Fn(Event)>::new(move |event| {
+        mock.call_event(SendWrapper::new(event));
+    });
+
+    let options = AddEventListenerOptions::new();
+    options.set_once(true);
+    window
+        .add_event_listener_with_callback_and_add_event_listener_options(
+            "resize",
+            listener.as_ref().unchecked_ref(),
+            &options,
+        )
+        .expect("Event listener should be added.");
+
+    FireEvent::resize(&window).expect("Event should be fired.");
 }
 
 // TODO: More tests.
 
+#[wasm_bindgen_test]
+fn fires_events_on_window() {
+    let window = window().expect("Window should exist.");
+
+    let mut mock = MockSpy::new();
+    mock.expect_call_message_event().times(1).return_const(());
+
+    let listener = Closure::<dyn Fn(MessageEvent)>::new(move |event| {
+        mock.call_message_event(SendWrapper::new(event));
+    });
+
+    window
+        .add_event_listener_with_callback("message", listener.as_ref().unchecked_ref())
+        .expect("Event listener should be added.");
+
+    let init = MessageEventInit::new();
+    init.set_data(&"hello".into());
+    let event = MessageEvent::new_with_event_init_dict("message", &init)
+        .expect("Event should be constructed.");
+
+    fire_event(&window, &event).expect("Event should be fired.");
+
+    window
+        .remove_event_listener_with_callback("message", listener.as_ref().unchecked_ref())
+        .expect("Event listener should be removed.");
+}
+
+#[wasm_bindgen_test]
+fn fires_history_popstate_event_on_window() {
+    let window = window().expect("Window should exist.");
+
+    let mut mock = MockSpy::new();
+    mock.expect_call_pop_state_event().times(1).return_const(());
+
+    let listener = Closure::<dyn Fn(PopStateEvent)>::new(move |event| {
+        mock.call_pop_state_event(SendWrapper::new(event));
+    });
+
+    window
+        .add_event_listener_with_callback("popstate", listener.as_ref().unchecked_ref())
+        .expect("Event listener should be added.");
+
+    let state = Object::new();
+    Reflect::set(&state, &"page".into(), &1.into()).expect("Propety should be set.");
+
+    let init = PopStateEventInit::new();
+    init.set_state(&state);
+    FireEvent::pop_state_with_init(&window, init).expect("Event should be fired.");
+
+    window
+        .remove_event_listener_with_callback("popstate", listener.as_ref().unchecked_ref())
+        .expect("Event listener should be removed.");
+}
+
+#[wasm_bindgen_test]
+fn fires_shortcut_events_on_window() {
+    let window = window().expect("Window should exist.");
+
+    let mut mock = MockSpy::new();
+    mock.expect_call_mouse_event().times(1).return_const(());
+
+    let listener = Closure::<dyn Fn(MouseEvent)>::new(move |event| {
+        mock.call_mouse_event(SendWrapper::new(event));
+    });
+
+    window
+        .add_event_listener_with_callback("click", listener.as_ref().unchecked_ref())
+        .expect("Event listener should be added.");
+
+    FireEvent::click(&window).expect("Event should be fired.");
+
+    window
+        .remove_event_listener_with_callback("click", listener.as_ref().unchecked_ref())
+        .expect("Event listener should be removed.");
+}
+
 #[wasm_bindgen_test]
 fn fires_events_on_document() {
     let document = document();
diff --git a/packages/dom/tests/helpers/mod.rs b/packages/dom/tests/helpers/mod.rs
index 681d26e..04e0e34 100644
--- a/packages/dom/tests/helpers/mod.rs
+++ b/packages/dom/tests/helpers/mod.rs
@@ -1 +1,4 @@
+// Test modules don't have to import all functions.
+#![allow(dead_code)]
+
 pub mod test_utils;
diff --git a/packages/dom/tests/helpers/test_utils.rs b/packages/dom/tests/helpers/test_utils.rs
index 41b6cb8..e15449b 100644
--- a/packages/dom/tests/helpers/test_utils.rs
+++ b/packages/dom/tests/helpers/test_utils.rs
@@ -1,9 +1,6 @@
-// TODO: remove
-#![allow(dead_code)]
-
 use testing_library_dom::{BoundFunctions, get_queries_for_element};
 use wasm_bindgen::JsCast;
-use web_sys::{Document, Element, HtmlElement, window};
+use web_sys::{Document, HtmlElement, window};
 
 pub fn document() -> Document {
     window()
@@ -13,22 +10,22 @@ pub fn document() -> Document {
 }
 
 pub struct RenderReturn {
-    pub container: Element,
+    pub container: HtmlElement,
     pub container_queries: BoundFunctions,
     pub rerender: Box<dyn Fn(&str) -> RenderReturn>,
 }
 
-pub fn render(html: &str, container: Option<Element>) -> RenderReturn {
+pub fn render(html: &str, container: Option<HtmlElement>) -> RenderReturn {
     let container = container.unwrap_or_else(|| {
         document()
             .create_element("div")
             .expect("Element should be created.")
+            .unchecked_into::<HtmlElement>()
     });
 
     container.set_inner_html(html);
 
-    let container_queries =
-        get_queries_for_element(container.clone().unchecked_into::<HtmlElement>());
+    let container_queries = get_queries_for_element(container.clone());
 
     RenderReturn {
         container: container.clone(),
@@ -38,10 +35,22 @@ pub fn render(html: &str, container: Option<Element>) -> RenderReturn {
 }
 
 pub fn render_into_document(html: &str) -> RenderReturn {
-    render(
-        html,
-        Some(document().body().expect("Body should exist.").into()),
-    )
+    render(html, Some(document().body().expect("Body should exist.")))
+}
+
+pub fn render_into_document_div(html: &str) -> RenderReturn {
+    // `wasm-pack test` crashes when its `pre` elements are overwritten, so use a `div` instead.
+    let container = document()
+        .create_element("div")
+        .expect("Element should be created.")
+        .unchecked_into::<HtmlElement>();
+    document()
+        .body()
+        .expect("Body should exist.")
+        .append_child(&container)
+        .expect("Child should be appended.");
+
+    render(html, Some(container))
 }
 
 pub fn cleanup() {
diff --git a/packages/dom/tests/misc.rs b/packages/dom/tests/misc.rs
new file mode 100644
index 0000000..a40d87f
--- /dev/null
+++ b/packages/dom/tests/misc.rs
@@ -0,0 +1,39 @@
+#![cfg(target_arch = "wasm32")]
+
+mod helpers;
+
+use regex::Regex;
+use testing_library_dom::{MatcherOptions, query_by_attribute};
+use wasm_bindgen_test::{wasm_bindgen_test, wasm_bindgen_test_configure};
+
+use self::helpers::test_utils::{RenderReturn, render};
+
+wasm_bindgen_test_configure!(run_in_browser);
+
+#[wasm_bindgen_test]
+fn test_query_by_attribute() {
+    let RenderReturn { container, .. } = render(
+        "<div data-foo=\"bar\"></div><div data-foo=\"rubar\"></div>",
+        None,
+    );
+
+    assert!(
+        query_by_attribute("data-foo", &container, "bar", MatcherOptions::default())
+            .expect("Query should succeed.")
+            .is_some()
+    );
+    assert!(
+        query_by_attribute("blah", &container, "sup", MatcherOptions::default())
+            .expect("Query should succeed.")
+            .is_none()
+    );
+    assert!(
+        query_by_attribute(
+            "data-foo",
+            &container,
+            Regex::new("bar").expect("Regex should be valid."),
+            MatcherOptions::default()
+        )
+        .is_err_and(|err| err.to_string().contains("multiple"))
+    );
+}
diff --git a/packages/dom/tests/query_helpers.rs b/packages/dom/tests/query_helpers.rs
index 78fcfc8..83e510e 100644
--- a/packages/dom/tests/query_helpers.rs
+++ b/packages/dom/tests/query_helpers.rs
@@ -18,7 +18,7 @@ trait GetElementError {
 
 #[wasm_bindgen_test]
 fn should_delegate_to_config_get_element_error() {
-    let message = Some("test Message".to_string());
+    let message = Some("test Message".to_owned());
     let container = Document::new()
         .expect("Document should be created.")
         .create_element("div")
@@ -32,7 +32,7 @@ fn should_delegate_to_config_get_element_error() {
 
             move |m, c| *m == message && *c == container
         })
-        .returning(|_, _| QueryError::Element("".into()));
+        .returning(|_, _| QueryError::Element("".to_owned()));
 
     configure(ConfigFnOrPartial::Partial(
         PartialConfig::default().get_element_error(Arc::new(|message, container| {
diff --git a/packages/dom/tests/role_helpers.rs b/packages/dom/tests/role_helpers.rs
new file mode 100644
index 0000000..b3d998e
--- /dev/null
+++ b/packages/dom/tests/role_helpers.rs
@@ -0,0 +1,489 @@
+#![cfg(target_arch = "wasm32")]
+
+mod helpers;
+
+use std::{collections::HashMap, hash::RandomState};
+
+use indoc::indoc;
+use log::Level;
+use ordered_hash_map::OrderedHashMap;
+use pretty_assertions::assert_eq;
+use testing_library_dom::{
+    AriaRoleDefinitionKey, GetRolesOptions, MatcherOptions, PrettyRolesOptions,
+    get_implicit_aria_roles, get_roles, is_inaccessible, log_roles,
+};
+use wasm_bindgen::JsCast;
+use wasm_bindgen_test::{wasm_bindgen_test, wasm_bindgen_test_configure};
+use web_sys::{Element, HtmlElement};
+
+use self::helpers::test_utils::{RenderReturn, document, render};
+
+wasm_bindgen_test_configure!(run_in_browser);
+
+struct Setup {
+    unnamed_section: Element,
+    named_section: Element,
+    anchor: Element,
+    h1: Element,
+    h2: Element,
+    h3: Element,
+    nav: Element,
+    article: Element,
+    a_ul: Element,
+    a_li1: Element,
+    a_li2: Element,
+    b_ul: Element,
+    b_li1: Element,
+    b_li2: Element,
+    table: Element,
+    tbody: Element,
+    tr: Element,
+    td1: Element,
+    td2: Element,
+    td3: Element,
+    unnamed_form: Element,
+    named_form: Element,
+    radio: Element,
+    radio2: Element,
+    input: Element,
+    input2: Element,
+    textarea: Element,
+    dt: Element,
+    dd: Element,
+    header: Element,
+    invalid_anchor: Element,
+    unnamed_img: Element,
+    presentation_img: Element,
+    named_img: Element,
+    footer: Element,
+}
+
+fn setup() -> Setup {
+    let RenderReturn {
+        container_queries, ..
+    } = render(
+        indoc! {"
+          <header data-testid=\"a-header\">Banner header</header>
+          <section aria-label=\"a region\" data-testid='named-section'>
+            <a href=\"http://whatever.com\" data-testid=\"a-link\">link</a>
+            <a data-testid=\"invalid-link\">invalid link</a>
+
+            <nav data-testid='a-nav' />
+
+            <h1 data-testid='a-h1'>Main Heading</h1>
+            <h2 data-testid='a-h2'>Sub Heading</h2>
+            <h3 data-testid='a-h3'>Tertiary Heading</h3>
+
+            <article data-testid='a-article'>
+              <ul data-testid='a-list'>
+                <li data-testid='a-list-item-1'>Item 1</li>
+                <li data-testid='a-list-item-2'>Item 2</li>
+              </ul>
+
+              <table data-testid='a-table'>
+                <tbody data-testid='a-tbody'>
+                  <tr data-testid='a-row'>
+                    <td data-testid='a-cell-1'>Cell 1</td>
+                    <td data-testid='a-cell-2'>Cell 2</td>
+                    <td data-testid='a-cell-3'>Cell 3</td>
+                  </tr>
+                </tbody>
+              </table>
+
+              <form aria-label=\"a form\" data-testid='named-form'>
+                <input type='radio' data-testid='a-radio-1' />
+                <input type='radio' data-testid='a-radio-2' />
+                <input type='text' data-testid='a-input-1' />
+                <input type='text' data-testid='a-input-2' />
+                <textarea data-testid='a-textarea'></textarea>
+              </form>
+
+              <ul data-testid='b-list'>
+                <li data-testid='b-list-item-1'>Item 1</li>
+                <li data-testid='b-list-item-2'>Item 2</li>
+              </ul>
+
+              <form data-testid=\"a-form\" />
+              <section data-testid=\"a-section\" />
+            </article>
+            <dl>
+              <dt data-testid=\"a-dt\">Term</dt>
+              <dd data-testid=\"a-dd\">Definition</dd>
+            </dl>
+
+            <img src=\"http://example.com/image.png\" data-testid='a-img-1'/>
+            <img alt=\"\" src=\"http://example.com/image.png\" data-testid='a-img-2'/>
+            <img alt=\"a meaningful description\" src=\"http://example.com/image.png\" data-testid='a-img-3'/>
+          </section>
+          <footer data-testid=\"a-footer\">Contentinfo footer</footer>
+        "},
+        None,
+    );
+
+    Setup {
+        unnamed_section: container_queries
+            .get_by_test_id("a-section", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        named_section: container_queries
+            .get_by_test_id("named-section", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        anchor: container_queries
+            .get_by_test_id("a-link", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        h1: container_queries
+            .get_by_test_id("a-h1", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        h2: container_queries
+            .get_by_test_id("a-h2", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        h3: container_queries
+            .get_by_test_id("a-h3", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        nav: container_queries
+            .get_by_test_id("a-nav", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        article: container_queries
+            .get_by_test_id("a-article", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        a_ul: container_queries
+            .get_by_test_id("a-list", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        a_li1: container_queries
+            .get_by_test_id("a-list-item-1", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        a_li2: container_queries
+            .get_by_test_id("a-list-item-2", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        b_ul: container_queries
+            .get_by_test_id("b-list", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        b_li1: container_queries
+            .get_by_test_id("b-list-item-1", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        b_li2: container_queries
+            .get_by_test_id("b-list-item-2", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        table: container_queries
+            .get_by_test_id("a-table", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        tbody: container_queries
+            .get_by_test_id("a-tbody", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        tr: container_queries
+            .get_by_test_id("a-row", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        td1: container_queries
+            .get_by_test_id("a-cell-1", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        td2: container_queries
+            .get_by_test_id("a-cell-2", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        td3: container_queries
+            .get_by_test_id("a-cell-3", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        unnamed_form: container_queries
+            .get_by_test_id("a-form", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        named_form: container_queries
+            .get_by_test_id("named-form", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        radio: container_queries
+            .get_by_test_id("a-radio-1", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        radio2: container_queries
+            .get_by_test_id("a-radio-2", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        input: container_queries
+            .get_by_test_id("a-input-1", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        input2: container_queries
+            .get_by_test_id("a-input-2", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        textarea: container_queries
+            .get_by_test_id("a-textarea", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        dt: container_queries
+            .get_by_test_id("a-dt", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        dd: container_queries
+            .get_by_test_id("a-dd", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        header: container_queries
+            .get_by_test_id("a-header", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        invalid_anchor: container_queries
+            .get_by_test_id("invalid-link", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        unnamed_img: container_queries
+            .get_by_test_id("a-img-1", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        presentation_img: container_queries
+            .get_by_test_id("a-img-2", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        named_img: container_queries
+            .get_by_test_id("a-img-3", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+        footer: container_queries
+            .get_by_test_id("a-footer", MatcherOptions::default())
+            .expect("Get should succeed.")
+            .expect("Query should return an element.")
+            .into(),
+    }
+}
+
+#[wasm_bindgen_test]
+fn get_roles_returns_expected_roles_for_various_dom_nodes() {
+    let Setup {
+        anchor,
+        h1,
+        h2,
+        h3,
+        nav,
+        article,
+        a_ul,
+        a_li1,
+        a_li2,
+        b_ul,
+        b_li1,
+        b_li2,
+        table,
+        tbody,
+        tr,
+        td1,
+        td2,
+        td3,
+        radio,
+        radio2,
+        input,
+        input2,
+        textarea,
+        named_section,
+        named_form,
+        dd,
+        dt,
+        header,
+        invalid_anchor,
+        unnamed_section,
+        unnamed_img,
+        presentation_img,
+        named_img,
+        footer,
+        ..
+    } = setup();
+
+    assert_eq!(
+        // Compare without ordering.
+        HashMap::<_, _, RandomState>::from_iter(get_roles(
+            named_section.clone(),
+            GetRolesOptions::default()
+        )),
+        HashMap::from_iter([
+            (AriaRoleDefinitionKey::Link, vec![anchor]),
+            (AriaRoleDefinitionKey::Heading, vec![h1, h2, h3]),
+            (AriaRoleDefinitionKey::Navigation, vec![nav]),
+            (AriaRoleDefinitionKey::Radio, vec![radio, radio2]),
+            (AriaRoleDefinitionKey::Article, vec![article]),
+            (AriaRoleDefinitionKey::List, vec![a_ul, b_ul]),
+            (
+                AriaRoleDefinitionKey::Listitem,
+                vec![a_li1, a_li2, b_li1, b_li2]
+            ),
+            (AriaRoleDefinitionKey::Table, vec![table]),
+            (AriaRoleDefinitionKey::Row, vec![tr]),
+            (AriaRoleDefinitionKey::Cell, vec![td1, td2, td3]),
+            (
+                AriaRoleDefinitionKey::Textbox,
+                vec![input, input2, textarea]
+            ),
+            (AriaRoleDefinitionKey::Rowgroup, vec![tbody]),
+            (AriaRoleDefinitionKey::Form, vec![named_form]),
+            (AriaRoleDefinitionKey::Region, vec![named_section]),
+            (AriaRoleDefinitionKey::Term, vec![dt]),
+            (AriaRoleDefinitionKey::Definition, vec![dd]),
+            (
+                AriaRoleDefinitionKey::Generic,
+                vec![invalid_anchor, unnamed_section]
+            ),
+            (AriaRoleDefinitionKey::Img, vec![unnamed_img, named_img]),
+            (AriaRoleDefinitionKey::Presentation, vec![presentation_img]),
+        ])
+    );
+
+    assert_eq!(
+        get_roles(header.clone(), GetRolesOptions::default()),
+        OrderedHashMap::from_iter([(AriaRoleDefinitionKey::Banner, vec![header])])
+    );
+    assert_eq!(
+        get_roles(footer.clone(), GetRolesOptions::default()),
+        OrderedHashMap::from_iter([(AriaRoleDefinitionKey::Contentinfo, vec![footer])])
+    );
+}
+
+#[ignore]
+#[wasm_bindgen_test]
+fn log_roles_calls_log_info_with_output_from_pretty_roles() {
+    let Setup { named_section, .. } = setup();
+
+    testing_logger::setup();
+
+    log_roles(named_section, PrettyRolesOptions::default());
+
+    testing_logger::validate(|captured_logs| {
+        assert_eq!(captured_logs.len(), 1);
+        assert_eq!(captured_logs[0].level, Level::Info);
+        assert_eq!(
+            captured_logs[0].body,
+            include_str!("./snapshots/role_helpers.snap")
+        );
+    });
+}
+
+#[wasm_bindgen_test]
+fn get_implicit_aria_roles_returns_expected_roles_for_various_dom_nodes() {
+    let Setup {
+        named_section,
+        h1,
+        unnamed_form,
+        radio,
+        input,
+        ..
+    } = setup();
+
+    assert_eq!(
+        get_implicit_aria_roles(&named_section),
+        vec![AriaRoleDefinitionKey::Region]
+    );
+    assert_eq!(
+        get_implicit_aria_roles(&h1),
+        vec![AriaRoleDefinitionKey::Heading]
+    );
+    assert_eq!(get_implicit_aria_roles(&unnamed_form), vec![]);
+    assert_eq!(
+        get_implicit_aria_roles(&radio),
+        vec![AriaRoleDefinitionKey::Radio]
+    );
+    assert_eq!(
+        get_implicit_aria_roles(&input),
+        vec![AriaRoleDefinitionKey::Textbox]
+    );
+}
+
+#[wasm_bindgen_test]
+fn is_inaccessible_should_return_expected() {
+    let document = document();
+    let cases = [
+        ("<div />", false),
+        ("<div aria-hidden=\"false\" />", false),
+        ("<div style=\"visibility: visible\" />", false),
+        ("<div hidden />", true),
+        ("<div style=\"display: none;\"/>", true),
+        ("<div style=\"visibility: hidden;\"/>", true),
+        ("<div aria-hidden=\"true\" />", true),
+    ];
+
+    for (html, expected) in cases {
+        // Chrome's `getComputedStyle` only works when appending the element to the document.
+        let container = document
+            .create_element("div")
+            .expect("Element should be created.")
+            .unchecked_into::<HtmlElement>();
+        document
+            .body()
+            .expect("Document should have body.")
+            .append_child(&container)
+            .expect("Child should be appended.");
+
+        let RenderReturn { container, .. } = render(html, Some(container));
+
+        container
+            .first_child()
+            .expect("Element should have one child.")
+            .append_child(
+                &document
+                    .create_element("button")
+                    .expect("Element should be created."),
+            )
+            .expect("Child should be appended.");
+
+        assert_eq!(
+            is_inaccessible(
+                &container
+                    .query_selector("button")
+                    .expect("Query should succeed.")
+                    .expect("Query should return an element."),
+            ),
+            expected,
+            "is_inaccessible for {html} returns {expected}",
+        );
+
+        container.remove();
+    }
+}
diff --git a/packages/dom/tests/snapshots/role_helpers.snap b/packages/dom/tests/snapshots/role_helpers.snap
new file mode 100644
index 0000000..b64838f
--- /dev/null
+++ b/packages/dom/tests/snapshots/role_helpers.snap
@@ -0,0 +1,216 @@
+region:
+
+Name "a region":
+<section
+  aria-label="a region"
+  data-testid="named-section"
+/>
+
+--------------------------------------------------
+link:
+
+Name "link":
+<a
+  data-testid="a-link"
+  href="http://whatever.com"
+/>
+
+--------------------------------------------------
+navigation:
+
+Name "":
+<nav
+  data-testid="a-nav"
+/>
+
+--------------------------------------------------
+heading:
+
+Name "Main Heading":
+<h1
+  data-testid="a-h1"
+/>
+
+Name "Sub Heading":
+<h2
+  data-testid="a-h2"
+/>
+
+Name "Tertiary Heading":
+<h3
+  data-testid="a-h3"
+/>
+
+--------------------------------------------------
+article:
+
+Name "":
+<article
+  data-testid="a-article"
+/>
+
+--------------------------------------------------
+list:
+
+Name "":
+<ul
+  data-testid="a-list"
+/>
+
+Name "":
+<ul
+  data-testid="b-list"
+/>
+
+--------------------------------------------------
+listitem:
+
+Name "":
+<li
+  data-testid="a-list-item-1"
+/>
+
+Name "":
+<li
+  data-testid="a-list-item-2"
+/>
+
+Name "":
+<li
+  data-testid="b-list-item-1"
+/>
+
+Name "":
+<li
+  data-testid="b-list-item-2"
+/>
+
+--------------------------------------------------
+table:
+
+Name "":
+<table
+  data-testid="a-table"
+/>
+
+--------------------------------------------------
+rowgroup:
+
+Name "":
+<tbody
+  data-testid="a-tbody"
+/>
+
+--------------------------------------------------
+row:
+
+Name "Cell 1 Cell 2 Cell 3":
+<tr
+  data-testid="a-row"
+/>
+
+--------------------------------------------------
+cell:
+
+Name "Cell 1":
+<td
+  data-testid="a-cell-1"
+/>
+
+Name "Cell 2":
+<td
+  data-testid="a-cell-2"
+/>
+
+Name "Cell 3":
+<td
+  data-testid="a-cell-3"
+/>
+
+--------------------------------------------------
+form:
+
+Name "a form":
+<form
+  aria-label="a form"
+  data-testid="named-form"
+/>
+
+--------------------------------------------------
+radio:
+
+Name "":
+<input
+  data-testid="a-radio-1"
+  type="radio"
+/>
+
+Name "":
+<input
+  data-testid="a-radio-2"
+  type="radio"
+/>
+
+--------------------------------------------------
+textbox:
+
+Name "":
+<input
+  data-testid="a-input-1"
+  type="text"
+/>
+
+Name "":
+<input
+  data-testid="a-input-2"
+  type="text"
+/>
+
+Name "":
+<textarea
+  data-testid="a-textarea"
+/>
+
+--------------------------------------------------
+term:
+
+Name "":
+<dt
+  data-testid="a-dt"
+/>
+
+--------------------------------------------------
+definition:
+
+Name "":
+<dd
+  data-testid="a-dd"
+/>
+
+--------------------------------------------------
+img:
+
+Name "":
+<img
+  data-testid="a-img-1"
+  src="http://example.com/image.png"
+/>
+
+Name "a meaningful description":
+<img
+  alt="a meaningful description"
+  data-testid="a-img-3"
+  src="http://example.com/image.png"
+/>
+
+--------------------------------------------------
+presentation:
+
+Name "":
+<img
+  alt=""
+  data-testid="a-img-2"
+  src="http://example.com/image.png"
+/>
+
+--------------------------------------------------
\ No newline at end of file
diff --git a/packages/pretty-format/src/lib.rs b/packages/pretty-format/src/lib.rs
index 52cff16..ed50ddf 100644
--- a/packages/pretty-format/src/lib.rs
+++ b/packages/pretty-format/src/lib.rs
@@ -13,7 +13,7 @@ use web_sys::js_sys::{BigInt, Number, Object};
 
 fn print_number(val: &Number) -> String {
     if Object::is(val, &JsValue::from_f64(-0.0)) {
-        "-0".into()
+        "-0".to_owned()
     } else {
         val.to_string(10)
             .expect("Number should be formatted as string.")
@@ -38,16 +38,16 @@ pub fn print_basic_value(
     escape_string: bool,
 ) -> Option<String> {
     if *val == JsValue::TRUE {
-        return Some("true".into());
+        return Some("true".to_owned());
     }
     if *val == JsValue::FALSE {
-        return Some("false".into());
+        return Some("false".to_owned());
     }
     if val.is_undefined() {
-        return Some("undefined".into());
+        return Some("undefined".to_owned());
     }
     if val.is_null() {
-        return Some("null".into());
+        return Some("null".to_owned());
     }
 
     let type_of = val.js_typeof();
@@ -60,12 +60,13 @@ pub fn print_basic_value(
     }
     if type_of == "string" {
         if escape_string {
-            return Some(
+            return Some(format!(
+                "\"{}\"",
                 val.as_string()
                     .expect("Value should be a string.")
                     .replace('"', "\\\"")
                     .replace('\\', "\\\\"),
-            );
+            ));
         }
         return Some(format!(
             "\"{}\"",
@@ -129,7 +130,7 @@ fn printer(
 fn validate_options(options: &PrettyFormatOptions) -> Result<(), PrettyFormatError> {
     if options.min.is_some() && options.indent.is_some_and(|indent| indent != 0) {
         Err(PrettyFormatError::Configuration(
-            "Options `min` and `indent` cannot be used togther.".into(),
+            "Options `min` and `indent` cannot be used togther.".to_owned(),
         ))
     } else {
         Ok(())
@@ -175,7 +176,7 @@ fn get_config(options: PrettyFormatOptions) -> Config {
         escape_regex: options.escape_regex.unwrap_or(false),
         escape_string: options.escape_string.unwrap_or(true),
         indent: match options.min {
-            Some(true) => "".into(),
+            Some(true) => "".to_owned(),
             _ => create_indent(options.indent.unwrap_or(2)),
         },
         max_depth: options.max_depth.unwrap_or(usize::MAX),
@@ -210,7 +211,7 @@ pub fn format(val: &JsValue, options: PrettyFormatOptions) -> Result<String, Pre
             plugin,
             val,
             &get_config(options),
-            "".into(),
+            "".to_owned(),
             0,
             vec![],
         ));
@@ -228,7 +229,7 @@ pub fn format(val: &JsValue, options: PrettyFormatOptions) -> Result<String, Pre
         Ok(print_complex_value(
             val,
             &get_config(options),
-            "".into(),
+            "".to_owned(),
             0,
             vec![],
             None,
diff --git a/packages/pretty-format/src/types.rs b/packages/pretty-format/src/types.rs
index c31bce7..bfaa195 100644
--- a/packages/pretty-format/src/types.rs
+++ b/packages/pretty-format/src/types.rs
@@ -55,8 +55,8 @@ impl Default for Theme {
             comment: ansi_style::Color::BlackBright.into(),
             content: Color {
                 // Reset
-                open: "\x1B[0m".into(),
-                close: "\x1B[0m".into(),
+                open: "\x1B[0m".to_owned(),
+                close: "\x1B[0m".to_owned(),
             },
             prop: ansi_style::Color::Yellow.into(),
             tag: ansi_style::Color::Cyan.into(),