Index: /main/waeup.sirp/trunk/src/waeup/sirp/hostels/tests.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/hostels/tests.py	(revision 7076)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/hostels/tests.py	(revision 7077)
@@ -36,4 +36,5 @@
 from waeup.sirp.students.student import Student
 from waeup.sirp.students.accommodation import BedTicket
+from waeup.sirp.university.department import Department
 
 class HostelsContainerTestCase(FunctionalTestCase):
@@ -72,8 +73,15 @@
         # We cannot call the fundamental methods of a base in that case
         container = HostelsContainer()
+        hostel = Hostel()
         self.assertRaises(
             NotImplementedError, container.archive)
         self.assertRaises(
             NotImplementedError, container.clear)
+        # We cannot add arbitrary objects
+        department = Department()
+        self.assertRaises(
+            TypeError, container.addHostel, department)
+        self.assertRaises(
+            TypeError, hostel.addBed, department)
 
 class HostelsFullSetup(FunctionalTestCase):
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/container.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/container.py	(revision 7076)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/container.py	(revision 7077)
@@ -53,8 +53,5 @@
         """
         user = get_current_principal()
-        if user is None:
-            user = 'system'
-        else:
-            user = user.id
+        user = user.id
         self.logger.info('%s - %s - %s - %s' % (
                 user, ob_class, target, comment))
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_container.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_container.py	(revision 7076)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_container.py	(revision 7077)
@@ -24,4 +24,5 @@
 from zope.component.hooks import setSite, clearSite
 from waeup.sirp.app import University
+from waeup.sirp.university.department import Department
 from waeup.sirp.students.interfaces import (
     IStudentsContainer,
@@ -76,4 +77,9 @@
         self.assertRaises(
             NotImplementedError, container.clear)
+        # We cannot add arbitrary objects
+        department = Department()
+        self.assertRaises(
+            TypeError, container.addStudent, department)
+
 
     def test_logger(self):
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 7076)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_student.py	(revision 7077)
@@ -27,4 +27,5 @@
     IStudentStudyLevel, ICourseTicket, IBedTicket)
 from waeup.sirp.testing import FunctionalLayer, FunctionalTestCase
+from waeup.sirp.university.department import Department
 
 class StudentTest(FunctionalTestCase):
@@ -62,4 +63,13 @@
         return
 
+    def test_base(self):
+        department = Department()
+        studycourse = StudentStudyCourse()
+        self.assertRaises(
+            TypeError, studycourse.addStudentStudyLevel, department)
+        studylevel = StudentStudyLevel()
+        self.assertRaises(
+            TypeError, studylevel.addCourseTicket, department)
+
 class StudentFactoryTest(FunctionalTestCase):
 
