diff --git a/tests/test_option.rs b/tests/test_option.rs
index 936f3e6..945e850 100644
--- a/tests/test_option.rs
+++ b/tests/test_option.rs
@@ -4,36 +4,98 @@
 use std::backtrace::Backtrace;
 use thiserror::Error;
 
-#[derive(Error, Debug)]
-#[error("...")]
-pub struct OptSourceNoBacktraceStruct {
-    #[source]
-    source: Option<anyhow::Error>,
-}
+pub mod structs {
+    use super::*;
 
-#[derive(Error, Debug)]
-#[error("...")]
-pub struct OptSourceAlwaysBacktraceStruct {
-    #[source]
-    source: Option<anyhow::Error>,
-    backtrace: Backtrace,
-}
-
-#[derive(Error, Debug)]
-pub enum OptSourceNoBacktraceEnum {
+    #[derive(Error, Debug)]
     #[error("...")]
-    Test {
+    pub struct OptSourceNoBacktrace {
         #[source]
         source: Option<anyhow::Error>,
-    },
-}
+    }
 
-#[derive(Error, Debug)]
-pub enum OptSourceAlwaysBacktraceEnum {
+    #[derive(Error, Debug)]
     #[error("...")]
-    Test {
+    pub struct OptSourceAlwaysBacktrace {
         #[source]
         source: Option<anyhow::Error>,
         backtrace: Backtrace,
-    },
+    }
+
+    #[derive(Error, Debug)]
+    #[error("...")]
+    pub struct NoSourceOptBacktrace {
+        #[backtrace]
+        backtrace: Option<Backtrace>,
+    }
+
+    #[derive(Error, Debug)]
+    #[error("...")]
+    pub struct AlwaysSourceOptBacktrace {
+        source: anyhow::Error,
+        #[backtrace]
+        backtrace: Option<Backtrace>,
+    }
+
+    #[derive(Error, Debug)]
+    #[error("...")]
+    pub struct OptSourceOptBacktrace {
+        #[source]
+        source: Option<anyhow::Error>,
+        #[backtrace]
+        backtrace: Option<Backtrace>,
+    }
+}
+
+pub mod enums {
+    use super::*;
+
+    #[derive(Error, Debug)]
+    pub enum OptSourceNoBacktrace {
+        #[error("...")]
+        Test {
+            #[source]
+            source: Option<anyhow::Error>,
+        },
+    }
+
+    #[derive(Error, Debug)]
+    pub enum OptSourceAlwaysBacktrace {
+        #[error("...")]
+        Test {
+            #[source]
+            source: Option<anyhow::Error>,
+            backtrace: Backtrace,
+        },
+    }
+
+    #[derive(Error, Debug)]
+    pub enum NoSourceOptBacktrace {
+        #[error("...")]
+        Test {
+            #[backtrace]
+            backtrace: Option<Backtrace>,
+        },
+    }
+
+    #[derive(Error, Debug)]
+    pub enum AlwaysSourceOptBacktrace {
+        #[error("...")]
+        Test {
+            source: anyhow::Error,
+            #[backtrace]
+            backtrace: Option<Backtrace>,
+        },
+    }
+
+    #[derive(Error, Debug)]
+    pub enum OptSourceOptBacktrace {
+        #[error("...")]
+        Test {
+            #[source]
+            source: Option<anyhow::Error>,
+            #[backtrace]
+            backtrace: Option<Backtrace>,
+        },
+    }
 }