diff --git a/hypha/apply/projects/models/payment.py b/hypha/apply/projects/models/payment.py
index e1b76047de3ca883d2dfaa2f9fa62241c423f551..ffbf79f448dfa0b8bfba2a9bcc9b9ae1a6954f2a 100644
--- a/hypha/apply/projects/models/payment.py
+++ b/hypha/apply/projects/models/payment.py
@@ -254,7 +254,7 @@ class Invoice(models.Model):
 
     @property
     def value(self):
-        return self.paid_value or self.amount
+        return self.paid_value
 
     def get_absolute_url(self):
         return reverse(
diff --git a/hypha/apply/projects/tests/test_forms.py b/hypha/apply/projects/tests/test_forms.py
index 57c9c14ade594241369434b29708d4c9845ee0da..769a3d6619da6349ee70d3531e1fe057f9f6c151 100644
--- a/hypha/apply/projects/tests/test_forms.py
+++ b/hypha/apply/projects/tests/test_forms.py
@@ -329,32 +329,6 @@ class TestCreateInvoiceForm(TestCase):
 
         self.assertEqual(invoice.supporting_documents.count(), 0)
 
-    def test_invoice_dates_are_correct(self):
-        invoice = SimpleUploadedFile('invoice.pdf', BytesIO(b'somebinarydata').read())
-        files = {
-            'document': invoice,
-        }
-
-        form = CreateInvoiceForm(
-            files=files,
-            data={
-                'paid_value': '10',
-                'comment': 'test comment',
-
-            }
-        )
-        self.assertTrue(form.is_valid(), msg=form.errors)
-
-        form = CreateInvoiceForm(
-            files=files,
-            data={
-                'paid_value': '10',
-                'comment': 'test comment',
-
-            }
-        )
-        self.assertFalse(form.is_valid())
-
 
 class TestEditInvoiceForm(TestCase):
 
diff --git a/hypha/apply/projects/tests/test_models.py b/hypha/apply/projects/tests/test_models.py
index 4ee923a46858a851ad445591e24d494a107e88a0..92c442a376833643d27142f0fa71c6da12c18ccb 100644
--- a/hypha/apply/projects/tests/test_models.py
+++ b/hypha/apply/projects/tests/test_models.py
@@ -19,6 +19,7 @@ from ..models.payment import (
     CHANGES_REQUESTED_BY_FINANCE_1,
     CHANGES_REQUESTED_BY_FINANCE_2,
     CHANGES_REQUESTED_BY_STAFF,
+    CONVERTED,
     DECLINED,
     INVOICE_STATUS_FINANCE_1_CHOICES,
     INVOICE_STATUS_FINANCE_2_CHOICES,
@@ -236,7 +237,7 @@ class TestInvoiceModel(TestCase):
             self.assertFalse(invoice.can_user_change_status(user))
 
     def test_finance2_can_change_status(self):
-        statuses = [APPROVED_BY_FINANCE_1]
+        statuses = [APPROVED_BY_FINANCE_1, APPROVED_BY_FINANCE_2, CONVERTED]
         user = Finance2Factory()
         for status in statuses:
             invoice = InvoiceFactory(status=status)
@@ -244,7 +245,7 @@ class TestInvoiceModel(TestCase):
 
     def test_finance2_cant_change_status(self):
         statuses = [
-            APPROVED_BY_STAFF, APPROVED_BY_FINANCE_2, CHANGES_REQUESTED_BY_FINANCE_1, CHANGES_REQUESTED_BY_FINANCE_2,
+            APPROVED_BY_STAFF, CHANGES_REQUESTED_BY_FINANCE_1, CHANGES_REQUESTED_BY_FINANCE_2,
             CHANGES_REQUESTED_BY_STAFF, DECLINED, PAID, RESUBMITTED, SUBMITTED
         ]
         user = Finance2Factory()