diff --git a/Tests/test-davacl.py b/Tests/test-davacl.py
index 8e2674373..932572487 100755
--- a/Tests/test-davacl.py
+++ b/Tests/test-davacl.py
@@ -62,18 +62,6 @@ class DAVAclTest(unittest.TestCase):
 
         return versitStruct
 
-# Calendar:
-#   rights:
-#     v: view all
-#     d: view date and time
-#     m: modify
-#     r: respond
-#   short rights notation: { "c": create,
-#                            "d": delete,
-#                            "pu": public,
-#                            "pr": private,
-#                            "co": confidential }
-
 event_template = """BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//Inverse//Event Generator//EN
@@ -103,7 +91,7 @@ class DAVCalendarAclTest(DAVAclTest):
 
     def setUp(self):
         DAVAclTest.setUp(self)
-        self.user_email = self.acl_utility.fetchUserInfo(username)[0]
+        self.user_email = self.acl_utility.fetchUserInfo(username)[1]
         self.classToICSClass = { "pu": "PUBLIC",
                                  "pr": "PRIVATE",
                                  "co": "CONFIDENTIAL" }
@@ -406,12 +394,6 @@ class DAVCalendarAclTest(DAVAclTest):
                               "'respond to' event does not match:\nreceived:\n"
                               "/%s/\nexpected:\n/%s/" % (event, exp_event))
 
-# Addressbook:
-#   short rights notation: { "c": create,
-#                            "d": delete,
-#                            "e": edit,
-#                            "v": view }
-
 class DAVAddressBookAclTest(DAVAclTest):
     resource = '/SOGo/dav/%s/Contacts/test-dav-acl/' % username
     cards = { "new.vcf": """BEGIN:VCARD
diff --git a/Tests/utilities.py b/Tests/utilities.py
index 83581129b..32bd76fb9 100644
--- a/Tests/utilities.py
+++ b/Tests/utilities.py
@@ -49,6 +49,18 @@ class TestACLUtility(TestUtility):
                           "rights modification: failure to set '%s' (status: %d)"
                           % (rights_str, post.response["status"]))
 
+# Calendar:
+#   rights:
+#     v: view all
+#     d: view date and time
+#     m: modify
+#     r: respond
+#   short rights notation: { "c": create,
+#                            "d": delete,
+#                            "pu": public,
+#                            "pr": private,
+#                            "co": confidential }
+
 class TestCalendarACLUtility(TestACLUtility):
     def rightsToSOGoRights(self, rights):
         sogoRights = []
@@ -72,6 +84,12 @@ class TestCalendarACLUtility(TestACLUtility):
 
         return sogoRights
 
+# Addressbook:
+#   short rights notation: { "c": create,
+#                            "d": delete,
+#                            "e": edit,
+#                            "v": view }
+
 class TestAddressBookACLUtility(TestACLUtility):
     def rightsToSOGoRights(self, rights):
         sogoRightsTable = { "c": "ObjectCreator",