diff --git a/src/test/java/seedu/address/logic/parser/AddCommandParserTest.java b/src/test/java/seedu/address/logic/parser/AddCommandParserTest.java
index 026285b0eb23..095979c49cb8 100644
--- a/src/test/java/seedu/address/logic/parser/AddCommandParserTest.java
+++ b/src/test/java/seedu/address/logic/parser/AddCommandParserTest.java
@@ -44,7 +44,6 @@
 import seedu.address.model.loan.Email;
 import seedu.address.model.loan.Loan;
 import seedu.address.model.loan.LoanRate;
-import seedu.address.model.loan.LoanTime;
 import seedu.address.model.loan.Name;
 import seedu.address.model.loan.Nric;
 import seedu.address.model.loan.Phone;
diff --git a/src/test/java/seedu/address/model/loan/LoanTest.java b/src/test/java/seedu/address/model/loan/LoanTest.java
index 1a8584beaa73..628a16955067 100644
--- a/src/test/java/seedu/address/model/loan/LoanTest.java
+++ b/src/test/java/seedu/address/model/loan/LoanTest.java
@@ -63,33 +63,40 @@ public void isSameLoan() {
         assertTrue(ALICE.isSame(editedAlice));
 
         // same identity fields, same email, different attributes -> returns true
-        editedAlice = new LoanBuilder(ALICE).withPhone(VALID_PHONE_BOB).withAddress(VALID_ADDRESS_BOB)
+        editedAlice = new LoanBuilder(ALICE).withPhone(VALID_PHONE_BOB)
+                .withAddress(VALID_ADDRESS_BOB)
                 .withTags(VALID_TAG_HUSBAND).build();
         assertTrue(ALICE.isSame(editedAlice));
 
         // same identity fields, same phone, same email, different attributes -> returns true
-        editedAlice = new LoanBuilder(ALICE).withAddress(VALID_ADDRESS_BOB).withTags(VALID_TAG_HUSBAND).build();
+        editedAlice = new LoanBuilder(ALICE).withAddress(VALID_ADDRESS_BOB)
+                .withTags(VALID_TAG_HUSBAND).build();
         assertTrue(ALICE.isSame(editedAlice));
 
         // same identity fields, different rate -> returns true
-        editedAlice = new LoanBuilder(ALICE).withLoanRate(VALID_LOANRATE_BOB).withTags(VALID_TAG_HUSBAND).build();
+        editedAlice = new LoanBuilder(ALICE).withLoanRate(VALID_LOANRATE_BOB)
+                .withTags(VALID_TAG_HUSBAND).build();
         assertTrue(ALICE.isSame(editedAlice));
 
         // same identity fields, different startTime -> returns true
-        editedAlice = new LoanBuilder(ALICE).withLoanStartTime(VALID_LOANSTARTTIME_BOB).withTags(VALID_TAG_HUSBAND).build();
+        editedAlice = new LoanBuilder(ALICE).withLoanStartTime(VALID_LOANSTARTTIME_BOB)
+                .withTags(VALID_TAG_HUSBAND).build();
         assertTrue(ALICE.isSame(editedAlice));
 
         // same identity fields, different endtime -> returns true
-        editedAlice = new LoanBuilder(ALICE).withLoanEndTime(VALID_LOANSTARTTIME_BOB).withTags(VALID_TAG_HUSBAND).build();
+        editedAlice = new LoanBuilder(ALICE).withLoanEndTime(VALID_LOANSTARTTIME_BOB)
+                .withTags(VALID_TAG_HUSBAND).build();
         assertTrue(ALICE.isSame(editedAlice));
 
         // same identity fields, different rate and startTime -> returns true
-        editedAlice = new LoanBuilder(ALICE).withLoanRate(VALID_LOANRATE_BOB).withLoanStartTime(VALID_LOANSTARTTIME_BOB)
+        editedAlice = new LoanBuilder(ALICE).withLoanRate(VALID_LOANRATE_BOB)
+                .withLoanStartTime(VALID_LOANSTARTTIME_BOB)
                 .withTags(VALID_TAG_HUSBAND).build();
         assertTrue(ALICE.isSame(editedAlice));
 
         // same identity fields, different rate and endTime -> returns true
-        editedAlice = new LoanBuilder(ALICE).withLoanRate(VALID_LOANRATE_BOB).withLoanEndTime(VALID_LOANSTARTTIME_BOB)
+        editedAlice = new LoanBuilder(ALICE).withLoanRate(VALID_LOANRATE_BOB)
+                .withLoanEndTime(VALID_LOANSTARTTIME_BOB)
                 .withTags(VALID_TAG_HUSBAND).build();
         assertTrue(ALICE.isSame(editedAlice));
     }
diff --git a/src/test/java/seedu/address/testutil/TypicalLoans.java b/src/test/java/seedu/address/testutil/TypicalLoans.java
index b30b74199edb..ae0cbb6f58c9 100644
--- a/src/test/java/seedu/address/testutil/TypicalLoans.java
+++ b/src/test/java/seedu/address/testutil/TypicalLoans.java
@@ -6,12 +6,12 @@
 import static seedu.address.logic.commands.CommandTestUtil.VALID_BIKE_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_EMAIL_BOB;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_LOANENDTIME_AMY;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_LOANENDTIME_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_LOANRATE_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_LOANRATE_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_LOANSTARTTIME_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_LOANSTARTTIME_BOB;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_LOANENDTIME_AMY;
-import static seedu.address.logic.commands.CommandTestUtil.VALID_LOANENDTIME_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_BOB;
 import static seedu.address.logic.commands.CommandTestUtil.VALID_NRIC_AMY;