Index: main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/interswitch/tests.py
===================================================================
--- main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/interswitch/tests.py	(revision 18043)
+++ main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/interswitch/tests.py	(revision 18131)
@@ -76,8 +76,8 @@
         # 250 gateway charge have been added
         payment = self.student['payments'][self.value]
-        self.assertEqual(payment.amount_auth, 7250)
+        self.assertEqual(payment.amount_auth, 7800)
         self.assertEqual(payment.net_amt, 7000)
         self.assertTrue(
-            '<input type="hidden" name="amount" value="725000" />' in
+            '<input type="hidden" name="amount" value="780000" />' in
             self.browser.contents)
         # WAeAC charge have been substracted
@@ -90,6 +90,11 @@
 
     def test_interswitch_required_combi(self):
+        configuration = createObject('waeup.SessionConfiguration')
+        configuration.academic_session = 2025
+        self.app['configuration'].addSessionConfiguration(configuration)
         # Student is a fresh non-science student
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.student['studycourse'].current_session = 2025
+        self.student['studycourse'].entry_session = 2025
         self.browser.open(self.payments_path)
         IWorkflowState(self.student).setState('cleared')
@@ -102,16 +107,16 @@
         self.browser.getControl(name="form.p_category").value = ['required_combi']
         self.browser.getControl("Create payment").click()
-        self.assertTrue('Student Health Insurance undefined.' in self.browser.contents)
-        self.app['configuration']['2004'].registration_fresh_fee = 10000.0
-        self.app['configuration']['2004'].book_fee = 10000.0
-        self.app['configuration']['2004'].develop_fee = 10000.0
-        self.app['configuration']['2004'].parentsconsult_fee = 10000.0
-        self.app['configuration']['2004'].municipal_fresh_fee = 10000.0
-        self.app['configuration']['2004'].matric_fee = 10000.0
-        self.app['configuration']['2004'].waecneco_fee = 10000.0
-        self.app['configuration']['2004'].jambver_fee = 10000.0
-        self.app['configuration']['2004'].health_insurance_fee = 10000.0
-        self.app['configuration']['2004'].id_card_fee = 10000.0
-        self.app['configuration']['2004'].medical_screening_fee = 10000.0
+        self.assertTrue('undefined.' in self.browser.contents)
+        self.app['configuration']['2025'].registration_fresh_fee = 10000.0
+        self.app['configuration']['2025'].book_fee = 10000.0
+        self.app['configuration']['2025'].develop_fee = 10000.0
+        self.app['configuration']['2025'].parentsconsult_fee = 10000.0
+        self.app['configuration']['2025'].municipal_fresh_fee = 10000.0
+        self.app['configuration']['2025'].matric_fee = 10000.0
+        self.app['configuration']['2025'].waecneco_fee = 10000.0
+        self.app['configuration']['2025'].jambver_fee = 10000.0
+        self.app['configuration']['2025'].health_insurance_fee = 10000.0
+        self.app['configuration']['2025'].id_card_fee = 10000.0
+        self.app['configuration']['2025'].medical_screening_fee = 10000.0
         self.browser.getControl(name="form.p_category").value = ['required_combi']
         self.browser.getControl("Create payment").click()
@@ -130,8 +135,8 @@
         # 250 gateway charge have been added
         payment = self.student['payments'][self.value]
-        self.assertEqual(payment.amount_auth, 110250)
+        self.assertEqual(payment.amount_auth, 110800)
         self.assertEqual(payment.net_amt, 110000)
         self.assertTrue(
-            '<input type="hidden" name="amount" value="11025000" />' in
+            '<input type="hidden" name="amount" value="11080000" />' in
             self.browser.contents)
         self.assertTrue(
@@ -139,5 +144,5 @@
             self.browser.contents)
         self.assertTrue(
-            'item_id="12" item_name="parentsconsult" item_amt="1000000" bank_id="117" acct_num="1228747029"' in
+            'item_id="12" item_name="parentsconsult" item_amt="1000000" bank_id="117" acct_num="1012355544"' in
             self.browser.contents)
 
@@ -160,7 +165,7 @@
         # 250 gateway charge have been added
         self.assertTrue(
-            '<input type="hidden" name="amount" value="125000" />' in
-            self.browser.contents)
-        self.assertEqual(acc_payment.amount_auth, 1250)
+            '<input type="hidden" name="amount" value="180000" />' in
+            self.browser.contents)
+        self.assertEqual(acc_payment.amount_auth, 1800)
         self.assertEqual(acc_payment.net_amt, 1000)
         delta = timedelta(days=8)
