diff --git a/tests/test.py b/tests/test.py
index a0653c2..de5a4da 100755
--- a/tests/test.py
+++ b/tests/test.py
@@ -33,11 +33,12 @@ class TestBasic(unittest.TestCase):
     def new_event(self):
         event = self.misp.new_event(0, 1, 0, "This is a test")
         event_id = self._clean_event(event)
-        self.assertEqual(event, {u'Event': {u'info': u'This is a test', u'locked': False,
-                                            u'attribute_count': u'0', u'analysis': u'0',
-                                            u'ShadowAttribute': [], u'published': False,
-                                            u'distribution': u'0', u'Attribute': [], u'proposal_email_lock': False,
-                                            u'threat_level_id': u'1'}})
+        to_check = {u'Event': {u'info': u'This is a test', u'locked': False,
+                               u'attribute_count': u'0', u'analysis': u'0',
+                               u'ShadowAttribute': [], u'published': False,
+                               u'distribution': u'0', u'Attribute': [], u'proposal_email_lock': False,
+                               u'threat_level_id': u'1'}},
+        self.assertEqual(event, to_check, 'Failed at creating a new Event')
         return int(event_id)
 
     def add_hashes(self, eventid):
@@ -59,7 +60,7 @@ class TestBasic(unittest.TestCase):
                                     u'to_ids': False, u'value': u'dll_installer.dll|003315b0aea2fcb9f77d29223dd8947d0e6792b3a0227e054be8eb2a11f443d9',
                                     u'ShadowAttribute': [], u'distribution': u'2', u'type': u'filename|sha256'}],
                                u'proposal_email_lock': False, u'threat_level_id': u'1'}}
-        self.assertEqual(event, to_check)
+        self.assertEqual(event, to_check, 'Failed at adding hashes')
 
     def publish(self, eventid):
         r = self.misp.get_event(eventid)
@@ -80,19 +81,62 @@ class TestBasic(unittest.TestCase):
                                     u'to_ids': False, u'value': u'dll_installer.dll|003315b0aea2fcb9f77d29223dd8947d0e6792b3a0227e054be8eb2a11f443d9',
                                     u'ShadowAttribute': [], u'distribution': u'2', u'type': u'filename|sha256'}],
                                u'proposal_email_lock': False, u'threat_level_id': u'1'}}
-        self.assertEqual(event, to_check)
+        self.assertEqual(event, to_check, 'Failed at publishing event')
 
     def delete(self, eventid):
         event = self.misp.delete_event(eventid)
-        event.json()
+        print event.json()
 
-    def test_all(self):
+    def delete_attr(self, attrid):
+        event = self.misp.delete_attribute(attrid)
+        print event.json()
+
+    def get(self, eventid):
+        event = self.misp.get_event(eventid)
+        print event.json()
+
+    def add(self):
+        event = {u'Event': {u'info': u'This is a test', u'locked': False,
+                            u'attribute_count': u'3', u'analysis': u'0',
+                            u'ShadowAttribute': [], u'published': False, u'distribution': u'0',
+                            u'Attribute': [
+                                {u'category': u'Payload installation', u'comment': u'Fanny modules',
+                                 u'to_ids': False, u'value': u'dll_installer.dll|0a209ac0de4ac033f31d6ba9191a8f7a',
+                                 u'ShadowAttribute': [], u'distribution': u'2', u'type': u'filename|md5'},
+                                {u'category': u'Payload installation', u'comment': u'Fanny modules',
+                                 u'to_ids': False, u'value': u'dll_installer.dll|1f0ae54ac3f10d533013f74f48849de4e65817a7',
+                                 u'ShadowAttribute': [], u'distribution': u'2', u'type': u'filename|sha1'},
+                                {u'category': u'Payload installation', u'comment': u'Fanny modules',
+                                 u'to_ids': False, u'value': u'dll_installer.dll|003315b0aea2fcb9f77d29223dd8947d0e6792b3a0227e054be8eb2a11f443d9',
+                                 u'ShadowAttribute': [], u'distribution': u'2', u'type': u'filename|sha256'}],
+                            u'proposal_email_lock': False, u'threat_level_id': u'1'}}
+        event = self.misp.add_event(event)
+        print event.json()
+
+    def test_create_event(self):
         eventid = self.new_event()
         time.sleep(1)
-        self.add_hashes(eventid)
-        time.sleep(1)
-        self.publish(eventid)
         self.delete(eventid)
 
+    def test_get_event(self):
+        eventid = self.new_event()
+        time.sleep(1)
+        self.get(eventid)
+        time.sleep(1)
+        self.delete(eventid)
+
+    def test_add_event(self):
+        self.add()
+        time.sleep(1)
+        self.delete(1)
+
+    def test_del_attr(self):
+        eventid = self.new_event()
+        time.sleep(1)
+        self.delete_attr(1)
+        time.sleep(1)
+        self.delete(eventid)
+
+
 if __name__ == '__main__':
     unittest.main()