Index: /main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_utils.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_utils.py	(revision 15713)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_utils.py	(revision 15714)
@@ -74,6 +74,5 @@
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
-        # 20000 Naira non-indigenous fee added
-        self.assertEqual(payment.amount_auth, 26666.0)
+        self.assertEqual(payment.amount_auth, 6666.0)
         self.assertEqual(payment.p_item, u'CERT1')
         self.assertEqual(error, None)
Index: /main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py	(revision 15713)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py	(revision 15714)
@@ -455,29 +455,11 @@
                     and student.state == CLEARED:
                     amount += gateway_net_amt(academic_session.id_card_fee)
-            # Add non-indigenous fee and session specific penalty fees
+                if student.entry_session >= 2019:
+                    amount += gateway_net_amt(academic_session.ict_fee)
+            # Add session specific penalty fees
             if student.is_postgrad:
                 amount += academic_session.penalty_pg
-                if student.lga and not student.lga.startswith('edo'):
-                    amount += 20000.0
             else:
                 amount += academic_session.penalty_ug
-                if student.lga and not student.lga.startswith('edo') \
-                    and category in ('schoolfee_incl', 'schoolfee_1') \
-                    and student.entry_session > 2018:
-                    if certificate.code == 'MBBS':
-                        amount +=100000
-                    elif certificate.code == 'BSCNSG':
-                        amount += 100000
-                    elif certificate.code in ('BMLS',
-                            'BMLSMMCB', 'BMLSHIST',
-                            'BMLSHBTS', 'BMLSCHMP'):
-                        amount += 80000
-                    elif certificate.code == 'LLB':
-                        amount += 75000
-                    elif certificate.code in ('BENGAGE',
-                            'BENGCIE', 'BENGELE',
-                            'BENGIPE', 'BENGMPE',
-                            'BENGPE', 'BENGMEE', 'BENGMME'):
-                        amount += 75000
         elif not student.is_postgrad:
             fee_name = category + '_fee'
