diff --git a/nevmes-core/src/contact.rs b/nevmes-core/src/contact.rs
index f0dc211..add3168 100644
--- a/nevmes-core/src/contact.rs
+++ b/nevmes-core/src/contact.rs
@@ -212,7 +212,6 @@ mod tests {
         tokio::spawn(async move {
             let test_contact = create(&j_contact).await;
             let expected: Contact = Default::default();
-            // validation should fail
             assert_eq!(test_contact.xmr_address, expected.xmr_address);
         });
         Runtime::shutdown_background(rt);
@@ -228,17 +227,16 @@ mod tests {
             "73a4nWuvkYoYoksGurDjKZQcZkmaxLaKbbeiKzHnMmqKivrCzq5Q2JtJG1UZNZFqLPbQ3MiXCk2Q5bdwdUNSr7X9QrPubkn"
         );
         let k = "c123";
-        let contact = Contact {
+        let expected_contact = Contact {
             xmr_address: address,
             ..Default::default()
         };
         tokio::spawn(async move {
             let s = db::Interface::async_open().await;
-            db::Interface::async_write(&s.env, &s.handle, k, &Contact::to_db(&contact)).await;
-            let r = db::Interface::async_read(&s.env, &s.handle, k).await;
-            let actual_contact: Contact = Contact::from_db(String::from(k), r);
-            // validation should fail
-            assert_eq!(contact.xmr_address, actual_contact.xmr_address);
+            db::Interface::async_write(&s.env, &s.handle, k, &Contact::to_db(&expected_contact))
+                .await;
+            let actual_contact: Contact = find(&String::from(k));
+            assert_eq!(expected_contact.xmr_address, actual_contact.xmr_address);
             cleanup(&String::from(k)).await;
         });
         Runtime::shutdown_background(rt);
diff --git a/nevmes-core/src/message.rs b/nevmes-core/src/message.rs
index 593d07e..6990385 100644
--- a/nevmes-core/src/message.rs
+++ b/nevmes-core/src/message.rs
@@ -338,3 +338,82 @@ fn is_fts_clear(r: String) -> bool {
     debug!("fts contents: {:#?}", v);
     v.len() >= 2 && v[v.len() - 1] == utils::empty_string() && v[0] == utils::empty_string()
 }
+
+// Tests
+//-------------------------------------------------------------------------------
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    async fn cleanup(k: &String) {
+        tokio::time::sleep(std::time::Duration::from_secs(1)).await;
+        let s = db::Interface::async_open().await;
+        db::Interface::async_delete(&s.env, &s.handle, k).await;
+    }
+
+    #[test]
+    fn create_test() {
+        // run and async cleanup so the test doesn't fail when deleting test data
+        use tokio::runtime::Runtime;
+        let rt = Runtime::new().expect("Unable to create Runtime for test");
+        let _enter = rt.enter();
+        let body: String = String::from("test body");
+        let message = Message {
+            body: body.into_bytes(),
+            ..Default::default()
+        };
+        let j_message = utils::message_to_json(&message);
+        let jwp = String::from("test-jwp");
+        tokio::spawn(async move {
+            let test_message = create(j_message, jwp).await;
+            let expected: Message = Default::default();
+            assert_eq!(test_message.body, expected.body);
+            cleanup(&test_message.mid).await;
+        });
+        Runtime::shutdown_background(rt);
+    }
+
+    #[test]
+    fn find_test() {
+        // run and async cleanup so the test doesn't fail when deleting test data
+        use tokio::runtime::Runtime;
+        let rt = Runtime::new().expect("Unable to create Runtime for test");
+        let _enter = rt.enter();
+        let body: String = String::from("test body");
+        let expected_message = Message {
+            body: body.into_bytes(),
+            ..Default::default()
+        };
+        let k = "test-key";
+        tokio::spawn(async move {
+            let s = db::Interface::async_open().await;
+            db::Interface::async_write(&s.env, &s.handle, k, &Message::to_db(&expected_message))
+                .await;
+            let actual_message: Message = find(&String::from(k));
+            assert_eq!(expected_message.body, actual_message.body);
+            cleanup(&String::from(k)).await;
+        });
+        Runtime::shutdown_background(rt);
+    }
+
+    #[test]
+    fn validate_test() {
+        // run and async cleanup so the test doesn't fail when deleting test data
+        use tokio::runtime::Runtime;
+        let rt = Runtime::new().expect("Unable to create Runtime for test");
+        let _enter = rt.enter();
+        let body: String = String::from("test body");
+        let message = Message {
+            body: body.into_bytes(),
+            ..Default::default()
+        };
+        let j_message = utils::message_to_json(&message);
+        tokio::spawn(async move {
+            // validation should fail
+            let is_valid = validate_message(&j_message);
+            assert_eq!(is_valid, false);
+        });
+        Runtime::shutdown_background(rt);
+    }
+}