Index: main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_batching.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_batching.py	(revision 8903)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_batching.py	(revision 8920)
@@ -218,5 +218,5 @@
         ticket.passmark = 100
         ticket.semester = 2
-        study_level.addCourseTicket(ticket)
+        study_level[ticket.code] = ticket
         self.add_payment(student)
         return student
@@ -688,5 +688,5 @@
         shutil.rmtree(os.path.dirname(fin_file))
 
-        # Add course and course referrer
+        # Add course and certificate course
         self.course = createObject('waeup.Course')
         self.course.code = 'COURSE1'
@@ -696,5 +696,5 @@
         self.app['faculties']['fac1']['dep1'].courses.addCourse(
             self.course)
-        self.app['faculties']['fac1']['dep1'].certificates['CERT1'].addCourseRef(
+        self.app['faculties']['fac1']['dep1'].certificates['CERT1'].addCertCourse(
             self.course, level=100)
 
Index: main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py	(revision 8903)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py	(revision 8920)
@@ -171,5 +171,5 @@
         self.app['faculties']['fac1']['dep1'].courses.addCourse(
             self.course)
-        self.app['faculties']['fac1']['dep1'].certificates['CERT1'].addCourseRef(
+        self.app['faculties']['fac1']['dep1'].certificates['CERT1'].addCertCourse(
             self.course, level=100)
 
@@ -1240,5 +1240,5 @@
         self.browser.getControl("Create course list now").click()
         self.browser.getLink("100").click()
-        self.browser.getLink("Add and remove courses").click()
+        self.browser.getLink("Edit course list").click()
         self.browser.getControl("Add course ticket").click()
         self.browser.getControl(name="form.course").value = ['COURSE1']
@@ -1253,5 +1253,5 @@
         self.browser.getControl("Create course list now").click()
         self.browser.getLink("200").click()
-        self.browser.getLink("Add and remove courses").click()
+        self.browser.getLink("Edit course list").click()
         self.browser.getControl("Add course ticket").click()
         self.browser.getControl(name="form.course").value = ['COURSE1']
@@ -1521,5 +1521,5 @@
         # The new SFE-0 pin can be used for starting new session
         self.browser.open(self.studycourse_path)
-        self.browser.getLink('Start session').click()
+        self.browser.getLink('Start new session').click()
         pin = self.app['accesscodes']['SFE-0'].keys()[0]
         parts = pin.split('-')[1:]
@@ -1570,5 +1570,5 @@
         # The new SFE-0 pin can be used for starting session
         self.browser.open(self.studycourse_path)
-        self.browser.getLink('Start session').click()
+        self.browser.getLink('Start new session').click()
         pin = self.app['accesscodes']['SFE-0'].keys()[0]
         parts = pin.split('-')[1:]
@@ -1610,5 +1610,5 @@
         # The new SFE-1 pin can be used for starting new session
         self.browser.open(self.studycourse_path)
-        self.browser.getLink('Start session').click()
+        self.browser.getLink('Start new session').click()
         self.browser.getControl(name="ac_series").value = sfeseries
         self.browser.getControl(name="ac_number").value = sfenumber
Index: main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_student.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_student.py	(revision 8903)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_student.py	(revision 8920)
@@ -129,5 +129,5 @@
         studylevel = StudentStudyLevel()
         self.assertRaises(
-            TypeError, studylevel.addCourseTicket, department)
+            TypeError, studylevel.addCourseTicket, department, department)
 
     def test_booking_date(self):
