Index: main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/sample_customer_data.csv
===================================================================
--- main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/sample_customer_data.csv	(revision 11962)
+++ main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/sample_customer_data.csv	(revision 11964)
@@ -1,10 +1,10 @@
 customer_id,firstname,lastname,reg_number,date_of_birth,,phone,sex,state
-X666666,Aaren,Pieri,1,1990-01-02,aa@aa.ng,1234,M,courses validated
-Y777777,Claus,Finau,2,1990-01-03,aa@aa.ng,1234,m,courses validated
-,Susann,Berson,3,1990-01-04,aa@aa.ng,1234,F,courses validated
-,Else,Mueller,4,1990-01-05,aa@aa.ng,1234,f,school fee paid
-X888888,Alfons,Meier,5,1990-01-02,aa@aa.ng,1234,m,courses validated
-X999999,Herbert,Mueller,6,1990-01-02,aa@aa.ng,1234,m,courses registered
-X111111,Fabian,Riester,7,1990-01-02,aa@aa.ng,1234,m,courses validated
-X222222,Thomas,Kinderman,8,1990-01-02,aa@aa.ng,1234,m,courses validated
-X333333,Paula,Schall,9,1990-01-02,aa@aa.ng,1234,m,courses registered
+X666666,Aaren,Pieri,1,1990-01-02,aa@aa.ng,1234,M,requested
+Y777777,Claus,Finau,2,1990-01-03,aa@aa.ng,1234,m,requested
+,Susann,Berson,3,1990-01-04,aa@aa.ng,1234,F,requested
+,Else,Mueller,4,1990-01-05,aa@aa.ng,1234,f,approved
+X888888,Alfons,Meier,5,1990-01-02,aa@aa.ng,1234,m,requested
+X999999,Herbert,Mueller,6,1990-01-02,aa@aa.ng,1234,m,approved
+X111111,Fabian,Riester,7,1990-01-02,aa@aa.ng,1234,m,requested
+X222222,Thomas,Kinderman,8,1990-01-02,aa@aa.ng,1234,m,requested
+X333333,Paula,Schall,9,1990-01-02,aa@aa.ng,1234,m,approved
Index: main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/sample_customer_data_duplicates.csv
===================================================================
--- main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/sample_customer_data_duplicates.csv	(revision 11962)
+++ main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/sample_customer_data_duplicates.csv	(revision 11964)
@@ -1,5 +1,5 @@
 customer_id,firstname,lastname,reg_number,date_of_birth,email,phone,password,sex,state
-A123456,Aaren,Pieri,1,1990-01-02#,aa@aa.ng,1234,mypw1,m,clearance started
-C123456,Aaren,Berson,2,1990-01-04,aa@aa.ng,1234,mypw1,m,admitted
+A123456,Aaren,Pieri,1,1990-01-02#,aa@aa.ng,1234,mypw1,m,requested
+C123456,Aaren,Berson,2,1990-01-04,aa@aa.ng,1234,mypw1,m,approved
 F123456,Frank,Meyer,1,1990-01-06,aa@aa.ng,1234,,m,
 A123456,Uli,Schulz,3,1990-01-07,aa@aa.ng,1234,,m,
Index: main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/sample_customer_data_update.csv
===================================================================
--- main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/sample_customer_data_update.csv	(revision 11962)
+++ main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/sample_customer_data_update.csv	(revision 11964)
@@ -1,4 +1,4 @@
 reg_number,date_of_birth,state
-1,1980-01-02,admitted
+1,1980-01-02,approved
 2,1980-01-03,
 3,1980-01-04,
Index: main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_batching.py
===================================================================
--- main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_batching.py	(revision 11962)
+++ main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_batching.py	(revision 11964)
@@ -171,5 +171,5 @@
         initial_cust_id = self.app['customers']._curr_cust_id
         errs, inv_errs, conv_dict = self.processor.checkConversion(
-            dict(reg_number='1', state='admitted'))
+            dict(reg_number='1', state='approved'))
         self.assertEqual(len(errs),0)
         # Empty state is allowed
@@ -206,5 +206,5 @@
         self.assertEqual(self.app['customers']['X666666'].reg_number,'1')
         self.assertEqual(
-            self.app['customers']['X666666'].state, 'courses validated')
+            self.app['customers']['X666666'].state, 'requested')
         # Two new customer_ids have been created.
         self.assertEqual(self.app['customers']._curr_cust_id, 1000003)
@@ -219,8 +219,7 @@
         self.assertEqual(num_warns,0)
         # state has changed
-        self.assertEqual(self.app['customers']['X666666'].state,'admitted')
+        self.assertEqual(self.app['customers']['X666666'].state,'approved')
         # state has not changed
-        self.assertEqual(self.app['customers']['Y777777'].state,
-                         'courses validated')
+        self.assertEqual(self.app['customers']['Y777777'].state, 'requested')
         shutil.rmtree(os.path.dirname(fin_file))
 
