diff --git a/src/lib.rs b/src/lib.rs
index ed9a1ab..cb44440 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -82,22 +82,22 @@
 #![deny(warnings)]
 #![cfg_attr(not(feature = "use_std"), no_std)]
 
+// ## extern crate statements
 extern crate cobs;
 extern crate ref_slice;
+
 #[cfg(feature = "typed")]
 extern crate serde;
+
+#[macro_use]
+#[cfg(test)]
+extern crate serde_derive;
+
 #[cfg(feature = "typed")]
 extern crate ssmarshal;
 
-#[cfg(feature = "use_std")]
-use ref_slice::ref_slice_mut;
-
-#[cfg(feature = "use_std")]
-use std::io::{self, Read, Write};
-
-#[cfg(feature = "use_std")]
-use std::ops::Deref;
 
+// ## Sub-modules
 #[cfg(feature = "use_std")]
 pub mod channel;
 
@@ -108,6 +108,17 @@ use error::{Error, Result};
 #[cfg(feature = "typed")]
 pub mod typed;
 
+// ## use statements
+#[cfg(feature = "use_std")]
+use ref_slice::ref_slice_mut;
+
+#[cfg(feature = "use_std")]
+use std::io::{self, Read, Write};
+
+#[cfg(feature = "use_std")]
+use std::ops::Deref;
+
+
 /// Arbitrary user data.
 pub type Payload = [u8];
 
diff --git a/src/typed.rs b/src/typed.rs
index 1f15dab..656c0de 100644
--- a/src/typed.rs
+++ b/src/typed.rs
@@ -87,3 +87,73 @@ impl<R: Read, T: DeserializeOwned> Receiver<R, T> {
         unimplemented!()
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use channel::Channel;
+    use error::Error;
+    use std::io::{Read, Write};
+    use super::*;
+
+    #[derive(Debug, Deserialize, Eq, PartialEq, Serialize)]
+    struct Test {
+        i8: i8,
+        i16: i16,
+        i32: i32,
+        i64: i64,
+
+        u8: u8,
+        u16: u16,
+        u32: u32,
+        u64: u64,
+
+        some: Option<u8>,
+        none: Option<u8>,
+
+        a: [u8; 3],
+    }
+
+    #[test]
+    fn one() {
+        let (mut tx, mut rx) = pair();
+        let v = val();
+        tx.send(&v).unwrap();
+        let r = rx.recv().unwrap();
+        assert_eq!(v, r);
+    }
+
+    #[test]
+    fn empty_input() {
+        let (mut _tx, mut rx) = pair();
+        match rx.recv() {
+            Err(Error::EofDuringFrame) => (),
+            e @ _ => panic!("Bad value: {:?}", e)
+        }
+    }
+
+    fn val() -> Test {
+        Test {
+            i8: 1,
+            i16: 2,
+            i32: 3,
+            i64: 4,
+
+            u8: 10,
+            u16: 11,
+            u32: 12,
+            u64: 13,
+
+            some: Some(17),
+            none: None,
+
+            a: [1, 2, 3],
+        }
+    }
+
+    fn pair() -> (Sender<Box<Write>, Test>, Receiver<Box<Read>, Test>) {
+        let c = Channel::new();
+        let tx = Sender::new(Box::new(c.writer()) as Box<Write>);
+        let rx = Receiver::new(Box::new(c.reader()) as Box<Read>);
+        (tx, rx)
+    }
+}