diff --git a/golem_activity_queue/__manifest__.py b/golem_activity_queue/__manifest__.py
index 45822e7..03e8f7d 100644
--- a/golem_activity_queue/__manifest__.py
+++ b/golem_activity_queue/__manifest__.py
@@ -19,6 +19,7 @@
 {
     'name': 'GOLEM activities queue',
     'summary': 'GOLEM activities queue',
+    'description': ''' GOLEM resources management ''',
     'version': '10.0.2.1.0',
     'category': 'GOLEM',
     'author': 'Youssef El Ouahby, Fabien Bourgeois',
@@ -27,6 +28,7 @@
     'installable': True,
     'depends': ['golem_activity', 'golem_activity_registration'],
     'data': [
+        'security/ir.model.access.csv',
         'views/golem_activity_queue_views.xml',
         'views/golem_activity_views.xml',
         'views/golem_member_views.xml',
diff --git a/golem_activity_queue/tests/test_golem_activity.py b/golem_activity_queue/tests/test_golem_activity.py
index 027b078..8492f27 100644
--- a/golem_activity_queue/tests/test_golem_activity.py
+++ b/golem_activity_queue/tests/test_golem_activity.py
@@ -24,25 +24,20 @@ class TestGolemActivity(TransactionCase):
 
     def setUp(self):
         super(TestGolemActivity, self).setUp()
-
-        self.season_model = self.env['golem.season'].sudo()
-        season_data = {'name': u'Current', 'date_start': '2010-01-01',
-                       'date_end': '2010-12-31'}
-        self.season_current = self.season_model.create(season_data)
-        self.activity_model = self.env['golem.activity'].sudo()
-
+        self.season = self.env['golem.season'].sudo().create({'name': u'Season 1'})
+        type_id = self.ref("golem_activity.golem_activity_type_activity")
+        #self.activity = self.env['golem.activity'].create({'name': u'Activity 1',
+        #                                                   'season_id': self.season,
+        #                                                   'categ_id': categ})
+        self.data = {
+            'name': u'Activity 1',
+            'season_id': self.season.id,
+            'type_id': type_id
+        }
+        self.activity_obj = self.env['golem.activity']
     def test_activity_creation(self):
-        """ Test creation of activity and periods """
-        categ = self.ref('golem_activity.golem_product_category_activities')
-        adata = {'name': 'a1', 'season_id': self.season_current.id,
-                 'categ_id': categ}
-        a1 = self.activity_model.create(adata)
-        a1.onchange_season_dates()
-        self.assertEqual(a1.name, 'a1')
-        self.assertEqual(a1.date_start, self.season_current.date_start)
-        self.assertEqual(a1.date_end, self.season_current.date_end)
-        self.assertTrue(a1.is_current)
-        adata.update({'name': 'a2', 'date_start': '2010-01-01',
-                      'date_end': '2009-12-01'})
-        with self.assertRaises(ValidationError):
-            self.activity_model.create(adata)
+        """ Test creation of activity """
+        activity = self.activity_obj.create(self.data)
+        self.assertTrue(activity.queue_allowed)
+        self.assertTrue(activity.auto_registration_from_queue)
+        self.assertEqual(activity.queue_activity_number, 0)
diff --git a/golem_activity_queue/tests/test_golem_activity_queue.py b/golem_activity_queue/tests/test_golem_activity_queue.py
index 5363a3c..1c0449b 100644
--- a/golem_activity_queue/tests/test_golem_activity_queue.py
+++ b/golem_activity_queue/tests/test_golem_activity_queue.py
@@ -30,10 +30,13 @@ class TestGolemActivityQueue(TransactionCase):
         super(TestGolemActivityQueue, self).setUp(*args, **kwargs)
 
         self.season = self.env['golem.season'].sudo().create({'name': u'Season 1'})
-        categ = self.ref('golem_activity.golem_product_category_activities')
+        type_id = self.ref("golem_activity.golem_activity_type_activity")
+        print "_______________________"
+        print self.season
+        print type_id
         self.activity = self.env['golem.activity'].create({'name': u'Activity 1',
-                                                           'season_id': self.season,
-                                                           'categ_id': categ})
+                                                           'season_id': self.season.id,
+                                                           'type_id': type_id})
         self.member = self.env['golem.member'].create({
             'lastname': u'LAST',
             'firstname': u'First'