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 12634)
+++ main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_browser.py	(revision 12663)
@@ -1417,11 +1417,12 @@
         # The form is also saved.
         self.browser.getLink("Edit").click()
-        self.browser.getControl("Apply").click()
+        self.browser.getControl("Proceed to checkout").click()
         self.assertTrue('confirm your acceptance of these by ticking' in self.browser.contents)
         self.assertEqual(contract.state, 'created')
         self.browser.getControl(name="confirm_tc").value = True
-        self.browser.getControl("Apply").click()
-        self.assertEqual(contract.state, 'submitted')
-        self.assertTrue('Contract State: submitted for approval' in self.browser.contents)
+        self.browser.getControl("Proceed to checkout").click()
+        self.assertEqual(contract.state, 'created')
+        self.browser.getControl("Select payment method").click()
+        self.assertEqual(contract.state, 'awaiting')
         # Customer can't edit the contract once it has been submitted
         self.browser.open(self.contracts_path + '/%s/edit' % conid)
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 12634)
+++ main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_export.py	(revision 12663)
@@ -256,9 +256,9 @@
             result,
             'class_name,comment,contract_category,contract_id,document_object,'
-            'history,last_product_id,'
-            'product_object,product_options,state,tc_dict,title,user_id,'
-            'valid_from,valid_to\r\n'
-
-            'SampleContract,,sample,CON1,,[],,,[],,{},,,,\r\n'
+            'fee_based,history,last_product_id,'
+            'product_object,product_options,state,tc_dict,title,'
+            'user_id,valid_from,valid_to\r\n'
+
+            'SampleContract,,sample,CON1,,0,[],,,[],,{},,,,\r\n'
             )
         return
@@ -273,9 +273,9 @@
         self.assertMatches(
             'class_name,comment,contract_category,contract_id,document_object,'
-            'history,last_product_id,'
-            'product_object,product_options,state,tc_dict,title,user_id,'
-            'valid_from,valid_to\r\n'
-
-            'SampleContract,,sample,CON1,DOC1,[u\'2014-12-04 12:10:46 UTC - '
+            'fee_based,history,last_product_id,'
+            'product_object,product_options,state,tc_dict,title,'
+            'user_id,valid_from,valid_to\r\n'
+
+            'SampleContract,,sample,CON1,DOC1,1,[u\'2014-12-04 12:10:46 UTC - '
             'Contract created by system\'],,'
             'SAM,"[(u\'Base Fee\', u\'800.6\', u\'USD\')]",'
@@ -295,9 +295,9 @@
         self.assertMatches(
             'class_name,comment,contract_category,contract_id,document_object,'
-            'history,last_product_id,'
-            'product_object,product_options,state,tc_dict,title,user_id,'
-            'valid_from,valid_to\r\n'
-
-            'SampleContract,,sample,CON1,DOC1,[u\'2014-12-04 12:10:46 UTC - '
+            'fee_based,history,last_product_id,'
+            'product_object,product_options,state,tc_dict,title,'
+            'user_id,valid_from,valid_to\r\n'
+
+            'SampleContract,,sample,CON1,DOC1,1,[u\'2014-12-04 12:10:46 UTC - '
             'Contract created by system\'],,'
             'SAM,"[(u\'Base Fee\', u\'800.6\', u\'USD\')]",'
@@ -317,9 +317,9 @@
         self.assertMatches(
             'class_name,comment,contract_category,contract_id,document_object,'
-            'history,last_product_id,'
-            'product_object,product_options,state,tc_dict,title,user_id,'
-            'valid_from,valid_to\r\n'
-
-            'SampleContract,,sample,CON1,DOC1,[u\'2014-12-04 12:10:46 UTC - '
+            'fee_based,history,last_product_id,'
+            'product_object,product_options,state,tc_dict,title,'
+            'user_id,valid_from,valid_to\r\n'
+
+            'SampleContract,,sample,CON1,DOC1,1,[u\'2014-12-04 12:10:46 UTC - '
             'Contract created by system\'],,'
             'SAM,"[(u\'Base Fee\', u\'800.6\', u\'USD\')]",'
