Index: /main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_catalog.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_catalog.py	(revision 9263)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_catalog.py	(revision 9264)
@@ -36,4 +36,14 @@
     layer = FunctionalLayer
 
+    def create_cert(self, facname, deptname, certname):
+        # helper: create faculty, dept, and cert
+        self.app['faculties'][facname] = Faculty(code=facname)
+        self.app['faculties'][facname][deptname] = Department(code=deptname)
+        cert = createObject('waeup.Certificate')
+        cert.code = certname
+        self.app['faculties'][facname][deptname].certificates.addCertificate(
+            cert)
+        return cert
+
     def setUp(self):
         super(CatalogTestSetup, self).setUp()
@@ -48,10 +58,5 @@
         self.app = self.getRootFolder()['app']
         setSite(self.app)
-        self.certificate = createObject('waeup.Certificate')
-        self.certificate.code = u'CERT1'
-        self.app['faculties']['fac1'] = Faculty(code=u'fac1')
-        self.app['faculties']['fac1']['dep1'] = Department(code=u'dep1')
-        self.app['faculties']['fac1']['dep1'].certificates.addCertificate(
-            self.certificate)
+        self.certificate = self.create_cert(u'fac1', u'dep1', u'CERT1')
 
         # Create student with subobjects
@@ -99,5 +104,6 @@
         # We can find a certain student id
         cat = queryUtility(ICatalog, name='students_catalog')
-        results = cat.searchResults(student_id=(self.student_id, self.student_id))
+        results = cat.searchResults(student_id=(self.student_id,
+                                                self.student_id))
         results = [x for x in results] # Turn results generator into list
         assert len(results) == 1
