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 13100)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_batching.py	(revision 13103)
@@ -224,5 +224,4 @@
         student.matric_number = u'234'
         student.adm_code = u'my adm code'
-        student.clearance_locked = False
         student.clr_code = u'my clr code'
         student.perm_address = u'Studentroad 21\nLagos 123456\n'
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 13100)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py	(revision 13103)
@@ -1876,5 +1876,4 @@
         self.browser.open(self.manage_clearance_path)
         self.assertFalse('Employer' in self.browser.contents)
-        self.student.clearance_locked = False
         self.browser.open(self.edit_clearance_path)
         self.assertFalse('Employer' in self.browser.contents)
@@ -1888,4 +1887,5 @@
         self.browser.open(self.manage_clearance_path)
         self.assertTrue('Employer' in self.browser.contents)
+        IWorkflowState(self.student).setState('clearance started')
         self.browser.open(self.edit_clearance_path)
         self.assertTrue('Employer' in self.browser.contents)
@@ -2619,5 +2619,4 @@
         self.browser.getControl(name="form.password").value = 'spwd'
         self.browser.getControl("Login").click()
-        self.student.clearance_locked = False
         self.browser.open(self.edit_clearance_path)
         self.browser.getControl(name="form.date_of_birth").value = '09/10/1961'
@@ -3416,5 +3415,5 @@
             self.browser.headers['content-disposition'])
         self.assertTrue(
-            'adm_code,clearance_locked,clr_code,date_of_birth,email,employer,'
+            'adm_code,clr_code,date_of_birth,email,employer,'
             'firstname,lastname,matric_number,middlename,nationality,'
             'officer_comment,perm_address,personal_updated,phone,reg_number,'
@@ -3422,5 +3421,5 @@
             'password,state,history,certcode,is_postgrad,current_level,'
             'current_session\r\n'
-            ',1,,1981-02-04#,aa@aa.ng,,Anna,Tester,234,,,,,,'
+            ',,1981-02-04#,aa@aa.ng,,Anna,Tester,234,,,,,,'
             '1234#,123,m,K1000000,0,,,{SSHA}' in self.browser.contents)
 
@@ -3516,5 +3515,5 @@
             self.browser.headers['content-disposition'])
         self.assertTrue(
-            'adm_code,clearance_locked,clr_code,date_of_birth,email,employer,'
+            'adm_code,clr_code,date_of_birth,email,employer,'
             'firstname,lastname,matric_number,middlename,nationality,'
             'officer_comment,perm_address,personal_updated,phone,reg_number,'
@@ -3522,5 +3521,5 @@
             'password,state,history,certcode,is_postgrad,current_level,'
             'current_session\r\n'
-            ',1,,1981-02-04#,aa@aa.ng,,Anna,Tester,234,,,,,,'
+            ',,1981-02-04#,aa@aa.ng,,Anna,Tester,234,,,,,,'
             '1234#,123,m,K1000000,0,,,{SSHA}' in self.browser.contents)
         self.assertEqual(len(self.app['datacenter'].running_exports), 1)
Index: main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_export.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_export.py	(revision 13100)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_export.py	(revision 13103)
@@ -125,5 +125,5 @@
 
     std_csv_entry = (
-        'my adm code,0,my clr code,1981-02-04#,anna@sample.com,,'
+        'my adm code,my clr code,1981-02-04#,anna@sample.com,,'
         'Anna,Tester,234,M.,NG,,"Studentroad 21\nLagos 123456\n",,'
         '+234-123-12345#,123,f,A111111,0,,,,created'
@@ -156,5 +156,5 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'adm_code,clearance_locked,clr_code,date_of_birth,email,'
+            'adm_code,clr_code,date_of_birth,email,'
             'employer,firstname,lastname,matric_number,middlename,'
             'nationality,officer_comment,perm_address,personal_updated,'
@@ -162,5 +162,5 @@
             'transcript_comment,password,state,history,certcode,is_postgrad,'
             'current_level,current_session\r\n'
-            'my adm code,0,my clr code,'
+            'my adm code,my clr code,'
             '1981-02-04#,anna@sample.com,,Anna,Tester,234,M.,NG,,'
             '"Studentroad 21\nLagos 123456\n",,+234-123-12345#,123,f,'
@@ -178,5 +178,5 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'adm_code,clearance_locked,clr_code,date_of_birth,email,'
+            'adm_code,clr_code,date_of_birth,email,'
             'employer,firstname,lastname,matric_number,middlename,'
             'nationality,officer_comment,perm_address,personal_updated,'
@@ -184,5 +184,5 @@
             'transcript_comment,password,state,history,certcode,'
             'is_postgrad,current_level,current_session\r\n'
-            'my adm code,0,my clr code,1981-02-04#,anna@sample.com,,'
+            'my adm code,my clr code,1981-02-04#,anna@sample.com,,'
             'Anna,Tester,234,M.,NG,,"Studentroad 21\nLagos 123456\n"'
             ',,+234-123-12345#,123,f,A111111,0,,,,created'
@@ -198,5 +198,5 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'adm_code,clearance_locked,clr_code,date_of_birth,email,'
+            'adm_code,clr_code,date_of_birth,email,'
             'employer,firstname,lastname,matric_number,middlename,'
             'nationality,officer_comment,perm_address,personal_updated,'
@@ -204,5 +204,5 @@
             'transcript_comment,password,state,history,certcode,'
             'is_postgrad,current_level,current_session\r\n'
-            'my adm code,0,my clr code,1981-02-04#,anna@sample.com,,'
+            'my adm code,my clr code,1981-02-04#,anna@sample.com,,'
             'Anna,Tester,234,M.,NG,,"Studentroad 21\nLagos 123456\n"'
             ',,+234-123-12345#,123,f,A111111,0,,,,created'
