diff --git a/app/models/perm.rb b/app/models/perm.rb
index 0db316b..fd27926 100644
--- a/app/models/perm.rb
+++ b/app/models/perm.rb
@@ -12,12 +12,12 @@
 
   ##
   # Constant perms
-  ADD_ORGS            = Perm.where(name: 'add_organisations').first.freeze
-  CHANGE_AFFILIATION  = Perm.where(name: 'change_org_affiliation').first.freeze
-  GRANT_PERMISSIONS   = Perm.where(name: 'grant_permissions').first.freeze
-  MODIFY_TEMPLATES    = Perm.where(name: 'modify_templates').first.freeze
-  MODIFY_GUIDANCE     = Perm.where(name: 'modify_guidance').first.freeze
-  USE_API             = Perm.where(name: 'use_api').first.freeze
-  CHANGE_ORG_DETAILS  = Perm.where(name: 'change_org_details').first.freeze
-  GRANT_API           = Perm.where(name: 'grant_api_to_orgs').first.freeze
+  ADD_ORGS            = Perm.where(name: 'add_organisations').first#.freeze
+  CHANGE_AFFILIATION  = Perm.where(name: 'change_org_affiliation').first#.freeze
+  GRANT_PERMISSIONS   = Perm.where(name: 'grant_permissions').first#.freeze
+  MODIFY_TEMPLATES    = Perm.where(name: 'modify_templates').first#.freeze
+  MODIFY_GUIDANCE     = Perm.where(name: 'modify_guidance').first#.freeze
+  USE_API             = Perm.where(name: 'use_api').first#.freeze
+  CHANGE_ORG_DETAILS  = Perm.where(name: 'change_org_details').first#.freeze
+  GRANT_API           = Perm.where(name: 'grant_api_to_orgs').first#.freeze
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index bfe37e2..c80f390 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -31,7 +31,8 @@
                          language: Language.find_by(abbreviation: FastGettext.locale),
                          password: "password123", password_confirmation: "password123", 
                          org: org, accept_terms: true, confirmed_at: Time.zone.now,
-                         perms: [Perm::GRANT_PERMISSIONS, Perm::MODIFY_TEMPLATES, Perm::MODIFY_GUIDANCE, Perm::CHANGE_ORG_DETAILS])
+                         perms: Perm.where.not(name: ['admin', 'add_organisations', 'change_org_affiliation', 'grant_api_to_orgs'])
+                         #perms: [Perm::GRANT_PERMISSIONS, Perm::MODIFY_TEMPLATES, Perm::MODIFY_GUIDANCE, Perm::CHANGE_ORG_DETAILS])
   end