diff --git a/rhodecode/tests/models/common.py b/rhodecode/tests/models/common.py
--- a/rhodecode/tests/models/common.py
+++ b/rhodecode/tests/models/common.py
@@ -1,7 +1,7 @@
 from rhodecode.tests import *
 from rhodecode.tests.fixture import Fixture
 
-from rhodecode.model.repos_group import ReposGroupModel
+from rhodecode.model.repo_group import RepoGroupModel
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.db import RepoGroup, Repository, User
 from rhodecode.model.user import UserModel
@@ -15,12 +15,12 @@ fixture = Fixture()
 
 def _destroy_project_tree(test_u1_id):
     Session.remove()
-    repos_group = RepoGroup.get_by_group_name(group_name='g0')
-    for el in reversed(repos_group.recursive_groups_and_repos()):
+    repo_group = RepoGroup.get_by_group_name(group_name='g0')
+    for el in reversed(repo_group.recursive_groups_and_repos()):
         if isinstance(el, Repository):
             RepoModel().delete(el)
         elif isinstance(el, RepoGroup):
-            ReposGroupModel().delete(el, force_delete=True)
+            RepoGroupModel().delete(el, force_delete=True)
 
     u = User.get(test_u1_id)
     Session().delete(u)
@@ -56,25 +56,25 @@ def _create_project_tree():
         username=u'test_u1', password=u'qweqwe',
         email=u'test_u1@rhodecode.org', firstname=u'test_u1', lastname=u'test_u1'
     )
-    g0 = fixture.create_group('g0')
-    g0_1 = fixture.create_group('g0_1', group_parent_id=g0)
-    g0_1_1 = fixture.create_group('g0_1_1', group_parent_id=g0_1)
-    g0_1_1_r1 = fixture.create_repo('g0/g0_1/g0_1_1/g0_1_1_r1', repos_group=g0_1_1)
-    g0_1_1_r2 = fixture.create_repo('g0/g0_1/g0_1_1/g0_1_1_r2', repos_group=g0_1_1)
-    g0_1_r1 = fixture.create_repo('g0/g0_1/g0_1_r1', repos_group=g0_1)
-    g0_2 = fixture.create_group('g0_2', group_parent_id=g0)
-    g0_2_r1 = fixture.create_repo('g0/g0_2/g0_2_r1', repos_group=g0_2)
-    g0_2_r2 = fixture.create_repo('g0/g0_2/g0_2_r2', repos_group=g0_2)
-    g0_3 = fixture.create_group('g0_3', group_parent_id=g0)
-    g0_3_r1 = fixture.create_repo('g0/g0_3/g0_3_r1', repos_group=g0_3)
+    g0 = fixture.create_repo_group('g0')
+    g0_1 = fixture.create_repo_group('g0_1', group_parent_id=g0)
+    g0_1_1 = fixture.create_repo_group('g0_1_1', group_parent_id=g0_1)
+    g0_1_1_r1 = fixture.create_repo('g0/g0_1/g0_1_1/g0_1_1_r1', repo_group=g0_1_1)
+    g0_1_1_r2 = fixture.create_repo('g0/g0_1/g0_1_1/g0_1_1_r2', repo_group=g0_1_1)
+    g0_1_r1 = fixture.create_repo('g0/g0_1/g0_1_r1', repo_group=g0_1)
+    g0_2 = fixture.create_repo_group('g0_2', group_parent_id=g0)
+    g0_2_r1 = fixture.create_repo('g0/g0_2/g0_2_r1', repo_group=g0_2)
+    g0_2_r2 = fixture.create_repo('g0/g0_2/g0_2_r2', repo_group=g0_2)
+    g0_3 = fixture.create_repo_group('g0_3', group_parent_id=g0)
+    g0_3_r1 = fixture.create_repo('g0/g0_3/g0_3_r1', repo_group=g0_3)
     g0_3_r2_private = fixture.create_repo('g0/g0_3/g0_3_r1_private',
-                                          repos_group=g0_3, repo_private=True)
+                                          repo_group=g0_3, repo_private=True)
     return test_u1
 
 
 def expected_count(group_name, objects=False):
-    repos_group = RepoGroup.get_by_group_name(group_name=group_name)
-    objs = repos_group.recursive_groups_and_repos()
+    repo_group = RepoGroup.get_by_group_name(group_name=group_name)
+    objs = repo_group.recursive_groups_and_repos()
     if objects:
         return objs
     return len(objs)
@@ -83,7 +83,7 @@ def expected_count(group_name, objects=F
 def _check_expected_count(items, repo_items, expected):
     should_be = len(items + repo_items)
     there_are = len(expected)
-    assert  should_be == there_are, ('%s != %s' % ((items + repo_items), expected))
+    assert should_be == there_are, ('%s != %s' % ((items + repo_items), expected))
 
 
 def check_tree_perms(obj_name, repo_perm, prefix, expected_perm):
@@ -91,11 +91,11 @@ def check_tree_perms(obj_name, repo_perm
                                     % (obj_name, repo_perm, expected_perm))
 
 
-def _get_perms(filter_='', recursive=True, key=None, test_u1_id=None):
+def _get_perms(filter_='', recursive=None, key=None, test_u1_id=None):
     test_u1 = AuthUser(user_id=test_u1_id)
     for k, v in test_u1.permissions[key].items():
-        if recursive and k.startswith(filter_):
+        if recursive in ['all', 'repos', 'groups'] and k.startswith(filter_):
             yield k, v
-        elif not recursive:
+        elif recursive in ['none']:
             if k == filter_:
                 yield k, v