diff --git a/src/test/java/seedu/address/logic/commands/PaymentCommandTest.java b/src/test/java/seedu/address/logic/commands/PaymentCommandTest.java
index caf19560ff4..c01432dd596 100644
--- a/src/test/java/seedu/address/logic/commands/PaymentCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/PaymentCommandTest.java
@@ -24,8 +24,8 @@
 import seedu.address.model.Model;
 import seedu.address.model.ModelManager;
 import seedu.address.model.UserPrefs;
-import seedu.address.model.person.*;
-
+import seedu.address.model.person.Payment;
+import seedu.address.model.person.PaymentFilterPredicate;
 
 /**
  * Contains integration tests (interaction with the Model) for {@code PaymentCommand}.
@@ -41,24 +41,24 @@ public void equals() {
         PaymentFilterPredicate secondPredicate =
                 new PaymentFilterPredicate(new Payment("Paid"));
 
-        PaymentCommand PaymentFirstCommand = new PaymentCommand(firstPredicate);
-        PaymentCommand PaymentSecondCommand = new PaymentCommand(secondPredicate);
+        PaymentCommand paymentFirstCommand = new PaymentCommand(firstPredicate);
+        PaymentCommand paymentSecondCommand = new PaymentCommand(secondPredicate);
 
         // same object -> returns true
-        assertTrue(PaymentFirstCommand.equals(PaymentFirstCommand));
+        assertTrue(paymentFirstCommand.equals(paymentFirstCommand));
 
         // same values -> returns true
         PaymentCommand findFirstCommandCopy = new PaymentCommand(firstPredicate);
-        assertTrue(PaymentFirstCommand.equals(findFirstCommandCopy));
+        assertTrue(paymentFirstCommand.equals(findFirstCommandCopy));
 
         // different types -> returns false
-        assertFalse(PaymentFirstCommand.equals(1));
+        assertFalse(paymentFirstCommand.equals(1));
 
         // null -> returns false
-        assertFalse(PaymentFirstCommand.equals(null));
+        assertFalse(paymentFirstCommand.equals(null));
 
         // different person -> returns false
-        assertFalse(PaymentFirstCommand.equals(PaymentSecondCommand));
+        assertFalse(paymentFirstCommand.equals(paymentSecondCommand));
     }
 
     @Test
diff --git a/src/test/java/seedu/address/model/person/PaymentPredicateTest.java b/src/test/java/seedu/address/model/person/PaymentPredicateTest.java
index 7f6ced54792..09bc557ac3e 100644
--- a/src/test/java/seedu/address/model/person/PaymentPredicateTest.java
+++ b/src/test/java/seedu/address/model/person/PaymentPredicateTest.java
@@ -1,10 +1,12 @@
 package seedu.address.model.person;
 
-import org.junit.jupiter.api.Test;
-import seedu.address.testutil.PersonBuilder;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
+import seedu.address.testutil.PersonBuilder;
 public class PaymentPredicateTest {
 
     @Test