diff --git a/modoboa/calendars/handlers.py b/modoboa/calendars/handlers.py
index 7e6e719e6..7fb8bcf54 100644
--- a/modoboa/calendars/handlers.py
+++ b/modoboa/calendars/handlers.py
@@ -10,9 +10,7 @@ except ImportError:
 
 
 from django.db.models import signals
-from django.urls import reverse
 from django.dispatch import receiver
-from django.utils.translation import gettext as _
 
 from modoboa.core import signals as core_signals
 
@@ -45,20 +43,6 @@ def extra_permissions(sender, role, **kwargs):
     return ROLES_PERMISSIONS.get(role, [])
 
 
-@receiver(core_signals.extra_user_menu_entries)
-def top_menu(sender, location, user, **kwargs):
-    """Add extra menu entries."""
-    if location == "top_menu" and hasattr(user, "mailbox"):
-        return [
-            {
-                "name": "radicale",
-                "label": _("Calendars"),
-                "url": reverse("calendars:calendar_detail_view"),
-            }
-        ]
-    return []
-
-
 @receiver(signals.pre_save, sender=models.UserCalendar)
 def set_user_calendar_path(sender, instance, **kwargs):
     """Set path at creation."""
diff --git a/modoboa/calendars/tests.py b/modoboa/calendars/tests.py
index bf2b39728..55a85e92c 100644
--- a/modoboa/calendars/tests.py
+++ b/modoboa/calendars/tests.py
@@ -332,7 +332,7 @@ class AccessRuleViewSetTestCase(TestDataMixin, ModoAPITestCase):
         """Test access rule modification."""
         data = {
             "mailbox": {
-                "pk": self.admin_account.pk,
+                "pk": self.admin_account.mailbox.pk,
                 "full_address": self.admin_account.email,
             },
             "calendar": self.calendar.pk,
@@ -352,7 +352,7 @@ class AccessRuleViewSetTestCase(TestDataMixin, ModoAPITestCase):
             calendar=calendar, mailbox=self.account.mailbox, read=True, write=True
         )
         data = {
-            "mailbox": self.account.pk,
+            "mailbox": self.account.mailbox.pk,
             "calendar": calendar.pk,
             "read": False,
             "write": True,
diff --git a/modoboa/core/api/v2/tests.py b/modoboa/core/api/v2/tests.py
index 948cb1a32..d1fd83955 100644
--- a/modoboa/core/api/v2/tests.py
+++ b/modoboa/core/api/v2/tests.py
@@ -88,7 +88,7 @@ class ParametersAPITestCase(ModoAPITestCase):
         DOVEADM_LOOKUP_PATH=[DOVEADM_TEST_PATH], DOVECOT_USER=DOVECOT_USER
     )
     def test_update(self):
-        url = reverse("v2:parameter-detail", args=["core"])
+        url = reverse("v2:parameter-global-detail", args=["core"])
         data = copy.copy(CORE_SETTINGS)
         resp = self.client.put(url, data, format="json")
         self.assertEqual(resp.status_code, 200)
@@ -140,7 +140,7 @@ class ParametersAPITestCase(ModoAPITestCase):
         depending on the result of the doveadm command for the password scheme
         """
         # Test case where doveadm command fails
-        url = reverse("v2:parameter-detail", args=["core"])
+        url = reverse("v2:parameter-global-detail", args=["core"])
         data = copy.copy(CORE_SETTINGS)
         data["password_scheme"] = "plain"
 
diff --git a/modoboa/parameters/api/v2/tests.py b/modoboa/parameters/api/v2/tests.py
index 6cf783698..69b2b0288 100644
--- a/modoboa/parameters/api/v2/tests.py
+++ b/modoboa/parameters/api/v2/tests.py
@@ -7,14 +7,14 @@ from modoboa.lib.tests import ModoAPITestCase
 
 class ParametersAPITestCase(ModoAPITestCase):
     def test_applications(self):
-        url = reverse("v2:parameter-applications")
+        url = reverse("v2:parameter-global-applications")
         resp = self.client.get(url)
         self.assertEqual(resp.status_code, 200)
         # core, admin, limits, pdf credentials
-        self.assertEqual(len(resp.json()), 9)
+        self.assertEqual(len(resp.json()), 10)
 
     def test_get_structure(self):
-        url = reverse("v2:parameter-structure")
+        url = reverse("v2:parameter-global-structure")
         resp_full = self.client.get(url)
         self.assertEqual(resp_full.status_code, 200)
 
@@ -25,7 +25,7 @@ class ParametersAPITestCase(ModoAPITestCase):
 
     def test_retrieve(self):
         for app in ["core", "admin", "limits"]:
-            url = reverse("v2:parameter-detail", args=[app])
+            url = reverse("v2:parameter-global-detail", args=[app])
             resp = self.client.get(url)
             self.assertEqual(resp.status_code, 200)
 
@@ -44,7 +44,7 @@ class ParametersAPITestCase(ModoAPITestCase):
             "deflt_domain_mailboxes_limit": 0,
             "deflt_domain_mailbox_aliases_limit": 0,
         }
-        url = reverse("v2:parameter-detail", args=["limits"])
+        url = reverse("v2:parameter-global-detail", args=["limits"])
         resp = self.client.put(url, data, format="json")
         self.assertEqual(resp.status_code, 200)
 
@@ -56,7 +56,7 @@ class ParametersAPITestCase(ModoAPITestCase):
             "custom_dns_server": "",
             "dkim_keys_storage_dir": "/wrong",
         }
-        url = reverse("v2:parameter-detail", args=["admin"])
+        url = reverse("v2:parameter-global-detail", args=["admin"])
         resp = self.client.put(url, data, format="json")
         self.assertEqual(resp.status_code, 400)
         errors = resp.json()