Index: main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_export.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_export.py	(revision 13077)
+++ main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_export.py	(revision 13080)
@@ -139,14 +139,13 @@
         # into two parts.
         self.assertTrue(
-            'applicant_id,application_date,application_number,course1,course2,'
-            'course_admitted,date_of_birth,display_fullname,email,firstname,'
-            'history,lastname,locked,middlename,notice,password,phone,'
-            'reg_number,sex,special_application,state,'
-            'student_id,suspended,container_code\r\n'
-            'dp2011_654321,,654321,,,,,Anna Tester,,Anna,'
-            in result)
-        self.assertTrue(
-            'Application initialized by system\'],Tester,'
-            '0,,,,,,,,initialized,,0,dp2011\r\n'
+            'applicant_id,course1,course2,course_admitted,date_of_birth,'
+            'email,firstname,lastname,locked,middlename,notice,phone,'
+            'reg_number,sex,special_application,student_id,suspended,'
+            'password,state,history,container_code,application_number,'
+            'display_fullname,application_date\r\n'
+            'dp2011_654321,,,,,,Anna,Tester,0'
+            in result)
+        self.assertTrue(
+            'Application initialized by system\'],dp2011,654321,Anna Tester'
             in result)
         return
@@ -163,16 +162,15 @@
         # into two parts.
         self.assertTrue(
-            'applicant_id,application_date,application_number,course1,course2,'
-            'course_admitted,date_of_birth,display_fullname,email,firstname,'
-            'history,lastname,locked,middlename,notice,password,phone,'
-            'reg_number,sex,special_application,state,'
-            'student_id,suspended,container_code\r\n'
-            'dp2011_654321,,654321,CERT1,CERT1,CERT1,1981-02-04#,'
-            'Anna M. Tester,anna@sample.com,Anna,'
-            in result)
-        self.assertTrue(
-            'Application initialized by system\'],'
-            'Tester,0,M.,"Some notice\nin lines.",any password,'
-            '+234-123-12345#,123456,f,,initialized,,0,dp2011\r\n'
+            'applicant_id,course1,course2,course_admitted,date_of_birth,'
+            'email,firstname,lastname,locked,middlename,notice,phone,'
+            'reg_number,sex,special_application,student_id,suspended,'
+            'password,state,history,container_code,application_number,'
+            'display_fullname,application_date\r\n'
+            'dp2011_654321,CERT1,CERT1,CERT1,1981-02-04#,'
+            'anna@sample.com,Anna,Tester,'
+            in result)
+        self.assertTrue(
+            'Application initialized by system\'],dp2011,654321,'
+            'Anna M. Tester,\r\n'
             in result)
 
@@ -187,16 +185,15 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'applicant_id,application_date,application_number,course1,course2,'
-            'course_admitted,date_of_birth,display_fullname,email,firstname,'
-            'history,lastname,locked,middlename,notice,password,phone,'
-            'reg_number,sex,special_application,state,'
-            'student_id,suspended,container_code\r\n'
-            'dp2011_654321,,654321,CERT1,CERT1,CERT1,1981-02-04#,'
-            'Anna M. Tester,anna@sample.com,Anna,'
-            in result)
-        self.assertTrue(
-            'Application initialized by system\'],'
-            'Tester,0,M.,"Some notice\nin lines.",any password,'
-            '+234-123-12345#,123456,f,,initialized,,0,dp2011\r\n'
+            'applicant_id,course1,course2,course_admitted,date_of_birth,'
+            'email,firstname,lastname,locked,middlename,notice,phone,'
+            'reg_number,sex,special_application,student_id,suspended,'
+            'password,state,history,container_code,application_number,'
+            'display_fullname,application_date\r\n'
+            'dp2011_654321,CERT1,CERT1,CERT1,1981-02-04#,'
+            'anna@sample.com,Anna,Tester,'
+            in result)
+        self.assertTrue(
+            'Application initialized by system\'],dp2011,654321,'
+            'Anna M. Tester,\r\n'
             in result)
         return
@@ -209,16 +206,15 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'applicant_id,application_date,application_number,course1,course2,'
-            'course_admitted,date_of_birth,display_fullname,email,firstname,'
-            'history,lastname,locked,middlename,notice,password,phone,'
-            'reg_number,sex,special_application,state,'
-            'student_id,suspended,container_code\r\n'
-            'dp2011_654321,,654321,CERT1,CERT1,CERT1,1981-02-04#,'
-            'Anna M. Tester,anna@sample.com,Anna,'
-            in result)
-        self.assertTrue(
-            'Application initialized by system\'],'
-            'Tester,0,M.,"Some notice\nin lines.",any password,'
-            '+234-123-12345#,123456,f,,initialized,,0,dp2011\r\n'
+            'applicant_id,course1,course2,course_admitted,date_of_birth,'
+            'email,firstname,lastname,locked,middlename,notice,phone,'
+            'reg_number,sex,special_application,student_id,suspended,'
+            'password,state,history,container_code,application_number,'
+            'display_fullname,application_date\r\n'
+            'dp2011_654321,CERT1,CERT1,CERT1,1981-02-04#,'
+            'anna@sample.com,Anna,Tester,'
+            in result)
+        self.assertTrue(
+            'Application initialized by system\'],dp2011,654321,'
+            'Anna M. Tester,\r\n'
             in result)
         # In empty container no applicants are exported
@@ -230,9 +226,9 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'applicant_id,application_date,application_number,course1,'
-            'course2,course_admitted,date_of_birth,display_fullname,email,'
-            'firstname,history,lastname,locked,middlename,notice,password,'
-            'phone,reg_number,sex,special_application,state,student_id,'
-            'suspended,container_code\r\n'
-            in result)
-        return
+            'applicant_id,course1,course2,course_admitted,date_of_birth,'
+            'email,firstname,lastname,locked,middlename,notice,phone,'
+            'reg_number,sex,special_application,student_id,suspended,'
+            'password,state,history,container_code,application_number,'
+            'display_fullname,application_date\r\n'
+            in result)
+        return
