Index: main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_browser.py
===================================================================
--- main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_browser.py	(revision 12051)
+++ main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_browser.py	(revision 12053)
@@ -812,7 +812,7 @@
         self.browser.getLink("Documents").click()
         self.browser.getLink("Add document").click()
-        self.browser.getControl(name="doctype").value = ['sample']
+        self.browser.getControl(name="doctype").value = ['CustomerPDFDocument']
         self.browser.getControl("Create document").click()
-        self.assertTrue('Sample Document created.' in self.browser.contents)
+        self.assertTrue('PDF Document created.' in self.browser.contents)
         document = self.customer['documents']['d102']
 
@@ -853,5 +853,5 @@
         self.assertTrue(
             'INFO - zope.mgr - customers.browser.DocumentAddFormPage '
-            '- K1000000 - added: Sample Document %s'
+            '- K1000000 - added: PDF Document %s'
             % document.document_id in logcontent)
 
@@ -871,5 +871,5 @@
         self.browser.getLink("Documents").click()
         self.browser.getLink("Add document").click()
-        self.browser.getControl(name="doctype").value = ['sample']
+        self.browser.getControl(name="doctype").value = ['CustomerDocument']
         self.browser.getControl("Create document").click()
         self.assertTrue('Sample Document created.' in self.browser.contents)
Index: main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_document.py
===================================================================
--- main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_document.py	(revision 12051)
+++ main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_document.py	(revision 12053)
@@ -61,4 +61,5 @@
         self.assertEqual(container[id], document)
         self.assertRaises(TypeError, container.addDocument, object())
+        self.assertEqual(document.classname, 'CustomerDocument')
         return
 
Index: main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_export.py
===================================================================
--- main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_export.py	(revision 12051)
+++ main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_export.py	(revision 12053)
@@ -138,6 +138,6 @@
         self.assertEqual(
             result,
-            'document_id,history,state,title,customer_id\r\n'
-            'd101,[],,,\r\n'
+            'classname,document_id,history,last_transition_date,state,title,customer_id\r\n'
+            'CustomerDocument,d101,[],,,,\r\n'
             )
         return
@@ -152,10 +152,12 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'document_id,history,state,title,customer_id\r\n'
+            'classname,document_id,history,last_transition_date,state,title,customer_id\r\n'
             in result
             )
-        self.assertTrue(
-            'Document created by system\'],created,My Document,A111111\r\n'
-            in result
+        self.assertMatches(
+            '...CustomerDocument,d101,[u\'2014-11-25 06:57:24 UTC - '
+            'Document created by system\'],2014-11-25 06:57:24.990308#,'
+            'created,My Document,A111111...',
+            result
             )
         return
@@ -169,9 +171,12 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'document_id,history,state,title,customer_id\r\n'
+            'classname,document_id,history,last_transition_date,state,title,customer_id\r\n'
             in result)
-        self.assertTrue(
-            ' Document created by system\'],created,My Document,A111111\r\n'
-            in result)
+        self.assertMatches(
+            '...CustomerDocument,d101,[u\'2014-11-25 06:57:24 UTC - '
+            'Document created by system\'],2014-11-25 06:57:24.990308#,'
+            'created,My Document,A111111...',
+            result
+            )
         return
 
@@ -184,8 +189,11 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'document_id,history,state,title,customer_id\r\n'
+            'classname,document_id,history,last_transition_date,state,title,customer_id\r\n'
             in result)
-        self.assertTrue(
-            ' Document created by system\'],created,My Document,A111111\r\n'
-            in result)
+        self.assertMatches(
+            '...CustomerDocument,d101,[u\'2014-11-25 06:57:24 UTC - '
+            'Document created by system\'],2014-11-25 06:57:24.990308#,'
+            'created,My Document,A111111...',
+            result
+            )
         return
