Index: /main/kofacustom.skeleton/trunk/src/kofacustom/skeleton/applicants/tests/test_browser.py
===================================================================
--- /main/kofacustom.skeleton/trunk/src/kofacustom/skeleton/applicants/tests/test_browser.py	(revision 16589)
+++ /main/kofacustom.skeleton/trunk/src/kofacustom/skeleton/applicants/tests/test_browser.py	(revision 16590)
@@ -83,5 +83,5 @@
         self.browser.getControl("Save").click()
         IWorkflowState(self.applicant).setState('submitted')
-        self.browser.open(self.manage_path)
+        self.browser.open(self.view_path)
         self.browser.getLink("Download application slip").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
Index: /main/kofacustom.skeleton/trunk/src/kofacustom/skeleton/interswitch/tests.py
===================================================================
--- /main/kofacustom.skeleton/trunk/src/kofacustom/skeleton/interswitch/tests.py	(revision 16589)
+++ /main/kofacustom.skeleton/trunk/src/kofacustom/skeleton/interswitch/tests.py	(revision 16590)
@@ -50,4 +50,5 @@
     def setUp(self):
         super(InterswitchTestsStudents, self).setUp()
+        self.app['configuration']['2004'].interswitch_enabled = True
 
     def test_interswitch_form(self):
@@ -62,4 +63,5 @@
         self.assertMatches('...ticket created...',
                            self.browser.contents)
+        self.browser.open(self.payments_path)
         ctrl = self.browser.getControl(name='val_id')
         self.value = ctrl.options[0]
Index: /main/kofacustom.skeleton/trunk/src/kofacustom/skeleton/students/tests/test_export.py
===================================================================
--- /main/kofacustom.skeleton/trunk/src/kofacustom/skeleton/students/tests/test_export.py	(revision 16589)
+++ /main/kofacustom.skeleton/trunk/src/kofacustom/skeleton/students/tests/test_export.py	(revision 16590)
@@ -105,10 +105,10 @@
             'ac,amount_auth,creation_date,gateway_amt,net_amt,'
             'p_category,p_combi,p_current,'
-            'p_id,p_item,p_level,p_session,p_state,payment_date,provider_amt,'
+            'p_id,p_item,p_level,p_option,p_session,p_state,payment_date,provider_amt,'
             'r_amount_approved,r_card_num,r_code,r_company,r_desc,'
             'r_pay_reference,thirdparty_amt,student_id,state,'
             'current_session\r\n'
             '666,12.12,%s-04-01 13:12:01#,,,schoolfee,[],1,my-id,p-item,'
-            '100,%s,paid,%s-04-01 14:12:01#,,12.12,'
+            '100,,%s,paid,%s-04-01 14:12:01#,,12.12,'
             '789,r-code,interswatch,,,,A111111,created,2012\r\n'
             % (curr_year-6, curr_year-6, curr_year-6), result
