Index: main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py	(revision 6633)
+++ main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py	(revision 6635)
@@ -72,9 +72,9 @@
 
 
-        # Add student
+        # Add student with subobjects (done by addStudent)
         student = Student()
         student.name = u'Anna Tester'
         student.student_id = u'Z654321'
-        self.app['students'][student.student_id] = student
+        self.app['students'].addStudent(student)
 
         self.container_path = 'http://localhost/app/students'
@@ -88,4 +88,8 @@
         self.edit_personal_student_path = self.student_path + '/edit_personal'
 
+        self.studycourse_student_path = self.student_path + '/studycourse'
+        self.payments_student_path = self.student_path + '/payments'
+        self.accommodation_student_path = self.student_path + '/accommodation'
+
         # Populate university
         certificate = createObject('waeup.Certificate')
@@ -188,23 +192,42 @@
         # and can perform actions
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+
         self.browser.open(self.student_path)
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.student_path)
-        self.browser.getLink("Edit base data").click()
+        self.browser.getLink("Edit").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.manage_student_path)
-        self.browser.open(self.student_path)
-        self.browser.getLink("View clearance data").click()
+
+        self.browser.open(self.student_path)
+        self.browser.getLink("Clearance Data").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.clearance_student_path)
-        self.browser.getLink("Edit clearance data").click()
+        self.browser.getLink("Edit").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.edit_clearance_student_path)
-        self.browser.open(self.student_path)
-        self.browser.getLink("View personal data").click()
+
+        self.browser.open(self.student_path)
+        self.browser.getLink("Personal Data").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.personal_student_path)
-        self.browser.getLink("Edit personal data").click()
+        self.browser.getLink("Edit").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.edit_personal_student_path)
+
+        self.browser.open(self.student_path)
+        self.browser.getLink("Study Course").click()
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertEqual(self.browser.url, self.studycourse_student_path)
+
+        self.browser.open(self.student_path)
+        self.browser.getLink("Payments").click()
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertEqual(self.browser.url, self.payments_student_path)
+
+        self.browser.open(self.student_path)
+        self.browser.getLink("Accommodation").click()
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertEqual(self.browser.url, self.accommodation_student_path)
+
         return
Index: main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_student.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_student.py	(revision 6633)
+++ main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_student.py	(revision 6635)
@@ -30,9 +30,9 @@
     Student, StudentFactory,
     )
-from waeup.sirp.students.studycourse import (
-    StudentStudyCourse,
-    )
+from waeup.sirp.students.studycourse import StudentStudyCourse
+from waeup.sirp.students.payments import StudentPayments
+from waeup.sirp.students.accommodation import StudentAccommodation
 from waeup.sirp.students.interfaces import (
-    IStudent, IStudentStudyCourse,
+    IStudent, IStudentStudyCourse, IStudentPayments, IStudentAccommodation,
     )
 from waeup.sirp.testing import FunctionalLayer
@@ -46,4 +46,6 @@
         self.student = Student()
         self.studycourse = StudentStudyCourse()
+        self.payments = StudentPayments()
+        self.accommodation = StudentAccommodation()
         return
 
@@ -57,4 +59,8 @@
         verify.verifyClass(IStudentStudyCourse, StudentStudyCourse)
         verify.verifyObject(IStudentStudyCourse, self.studycourse)
+        verify.verifyClass(IStudentPayments, StudentPayments)
+        verify.verifyObject(IStudentPayments, self.payments)
+        verify.verifyClass(IStudentAccommodation, StudentAccommodation)
+        verify.verifyObject(IStudentAccommodation, self.accommodation)
         return
 
