Index: postman/tests/__init__.py
===================================================================
--- postman/tests/__init__.py	(revision 2)
+++ postman/tests/__init__.py	(revision 5)
@@ -3,3 +3,3 @@
 from models import *
 from mta import *
-
+from daemon import *
Index: postman/tests/daemon.py
===================================================================
--- postman/tests/daemon.py	(revision 5)
+++ postman/tests/daemon.py	(revision 5)
@@ -0,0 +1,122 @@
+# -*- coding: utf-8 -*-
+
+import os
+from unittest import TestCase
+from postman.daemon import Postman
+from postman.models import Member, MailingList
+from postman.storage import JsonStorage as Storage
+
+
+class TestPostman(TestCase):
+    """
+    postman.daemon.Postman tests.
+
+    Remember to call the .clear() method of postman after each test, so
+    the temp storage files are deleted
+    """
+    def setUp(self):
+        config = {'private': False, 'archive': '/tmp/postman-tests/archive',
+                  'storage': '/tmp/postman-tests/storage'}
+        self.mailing_list = MailingList('test_list', 'test_list@example.com',
+                                        members={}, config=config)
+        self.member =  Member('test@example.com')
+
+    def test___init__(self):
+        postman = Postman()
+        self.assertIsInstance(postman, Postman)
+        self.assertEqual(postman.mailings, {})
+        self.assertEqual(postman.mailings_addresses, [])
+        self.assertIsInstance(postman.dbs, dict)
+        self.assertTrue('mailings' in postman.dbs.keys())
+        self.assertTrue('members' in postman.dbs.keys())
+        self.assertIsInstance(postman.dbs['mailings'], Storage)
+        self.assertIsInstance(postman.dbs['members'], Storage)
+
+    def test_save(self):
+        postman = Postman()
+        self.assertFalse(postman.save())
+        postman.add_mailing_list(self.mailing_list.info())
+        self.assertTrue(postman.save())
+        # FIXME: We have to test here that the generated json file
+        # contains the data it should contain
+
+        # Clear the files created by the tests
+        postman.clear()
+
+    def test_load(self):
+        postman = Postman()
+        self.assertFalse(postman.mailings)
+        self.assertFalse(postman.mailings_addresses)
+        self.assertFalse(postman.load())
+        postman.add_mailing_list(self.mailing_list.info())
+        self.assertTrue(postman.load())
+
+        # Check that another postman instance is able to load the saved data
+        postman_load = Postman()
+        self.assertFalse(postman_load.mailings)
+        self.assertFalse(postman_load.mailings_addresses)
+        postman_load.load()
+        self.assertTrue(postman_load.mailings)
+        self.assertIsInstance(postman_load.mailings, dict)
+        self.assertTrue(postman_load.mailings_addresses)
+        self.assertIsInstance(postman_load.mailings_addresses, list)        
+
+        # Clear the files created by the tests
+        postman.clear()
+
+    def test_clear(self):
+        postman = Postman()
+        self.assertFalse(postman.clear())
+        postman.add_mailing_list(self.mailing_list.info())
+        self.assertTrue(postman.clear())
+
+    def test_add_mailing_list(self):
+        postman = Postman()
+        with self.assertRaises(TypeError):
+            # test improper info values
+            postman.add_mailing_list(['a list', 'is an', 'invalid parameter'])
+            postman.add_mailing_list(self.mailing_list)
+        with self.assertRaises(ValueError):
+            #test incomplete/missing info values
+            postman.add_mailing_list()
+            postman.add_mailing_list({'name': 'missing info'})
+            postman.add_mailing_list({'address': 'missing info'})
+            postman.add_mailing_list({'name': 'missing info',
+                                      'address': 'missing info'})
+        # test mailing lists can be added
+        self.assertTrue(postman.add_mailing_list(self.mailing_list.info()))
+        self.assertTrue(postman.mailings)
+        self.assertIsInstance(postman.mailings, dict)
+        self.assertTrue(postman.mailings_addresses)
+        self.assertIsInstance(postman.mailings_addresses, list)
+        with self.assertRaises(IndexError):
+            # test what happens when the mailing has been already added
+            postman.add_mailing_list(self.mailing_list.info())
+
+        # Clear the files created by the tests
+        postman.clear()
+
+    def test_add_mailing_member(self):
+        postman = Postman()
+        postman.add_mailing_list(self.mailing_list.info())
+        with self.assertRaises(ValueError):
+            # test what happens if we call the method without proper
+            # parameters
+            postman.add_mailing_member()
+            postman.add_mailing_member(None, None)
+            postman.add_mailing_member(None, 'test_list@example.net')
+            postman.add_mailing_member('test@example.net', None)
+            postman.add_mailing_member('test@example', 'test_list@example.net')
+        with self.assertRaises(IndexError):
+            # test if we try to add a member to a non-existing mailing list
+            postman.add_mailing_member('test@example.net',
+                                       'test_list_b@example.net')
+        # Test adding a member
+        self.assertTrue(postman.add_mailing_member('test@example.net',
+                                                   self.mailing_list.address))
+        # Test trying to re-add that user
+        self.assertFalse(postman.add_mailing_member('test@example.net',
+                                                    self.mailing_list.address))
+
+        # Clear the files created by the tests
+        postman.clear()
Index: postman/tests/mta.py
===================================================================
--- postman/tests/mta.py	(revision 2)
+++ postman/tests/mta.py	(revision 5)
@@ -3,7 +3,6 @@
 import os, sys
 from unittest import TestCase
-
+from postman.mta import Sendmail
 from postman.models import Member, MailingList
-from postman.mta import Sendmail