diff --git a/fineract-core/src/main/java/org/apache/fineract/commands/domain/CommandSource.java b/fineract-core/src/main/java/org/apache/fineract/commands/domain/CommandSource.java
index 7cdfa0623..e9c0d9f89 100644
--- a/fineract-core/src/main/java/org/apache/fineract/commands/domain/CommandSource.java
+++ b/fineract-core/src/main/java/org/apache/fineract/commands/domain/CommandSource.java
@@ -143,7 +143,7 @@ public class CommandSource extends AbstractPersistableCustom {
         this.subResourceId = subResourceId;
         this.commandAsJson = commandSerializedAsJson;
         this.maker = maker;
-        this.madeOnDate = DateUtils.getOffsetDateTimeOfTenant();
+        this.madeOnDate = DateUtils.getOffsetDateTimeOfTenantWithMostPrecision();
         this.status = status;
         this.idempotencyKey = idempotencyKey;
     }
@@ -170,13 +170,13 @@ public class CommandSource extends AbstractPersistableCustom {
 
     public void markAsChecked(final AppUser checker) {
         this.checker = checker;
-        this.checkedOnDate = DateUtils.getOffsetDateTimeOfTenant();
+        this.checkedOnDate = DateUtils.getOffsetDateTimeOfTenantWithMostPrecision();
         this.status = CommandProcessingResultType.PROCESSED.getValue();
     }
 
     public void markAsRejected(final AppUser checker) {
         this.checker = checker;
-        this.checkedOnDate = DateUtils.getOffsetDateTimeOfTenant();
+        this.checkedOnDate = DateUtils.getOffsetDateTimeOfTenantWithMostPrecision();
         this.status = CommandProcessingResultType.REJECTED.getValue();
     }
 
diff --git a/fineract-investor/src/main/resources/db/changelog/tenant/module/investor/module-changelog-master.xml b/fineract-investor/src/main/resources/db/changelog/tenant/module/investor/module-changelog-master.xml
index 30a63050e..4bf40d012 100644
--- a/fineract-investor/src/main/resources/db/changelog/tenant/module/investor/module-changelog-master.xml
+++ b/fineract-investor/src/main/resources/db/changelog/tenant/module/investor/module-changelog-master.xml
@@ -32,4 +32,5 @@
   <include relativeToChangelogFile="true" file="parts/0008_add_mappings.xml"/>
   <include relativeToChangelogFile="true" file="parts/0009_add_loan_ownership_transfer_events.xml"/>
   <include relativeToChangelogFile="true" file="parts/0010_external_transafer_status_external_transfer_id_constraints.xml"/>
+  <include relativeToChangelogFile="true" file="parts/0011_set_datetime_precision.xml"/>
 </databaseChangeLog>
diff --git a/fineract-investor/src/main/resources/db/changelog/tenant/module/investor/parts/0010_external_transafer_status_external_transfer_id_constraints.xml b/fineract-investor/src/main/resources/db/changelog/tenant/module/investor/parts/0010_external_transafer_status_external_transfer_id_constraints.xml
index 0bd4fc839..c4ea7dbe3 100644
--- a/fineract-investor/src/main/resources/db/changelog/tenant/module/investor/parts/0010_external_transafer_status_external_transfer_id_constraints.xml
+++ b/fineract-investor/src/main/resources/db/changelog/tenant/module/investor/parts/0010_external_transafer_status_external_transfer_id_constraints.xml
@@ -22,7 +22,7 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.3.xsd">
-    <changeSet author="fineract" id="1">
+    <changeSet author="fineract" id="1" context="mysql">
         <addUniqueConstraint tableName="m_external_asset_owner_transfer" columnNames="status, external_id" constraintName="external_transfer_status_external_id"/>
     </changeSet>
 </databaseChangeLog>
diff --git a/fineract-investor/src/main/resources/db/changelog/tenant/module/investor/parts/0011_set_datetime_precision.xml b/fineract-investor/src/main/resources/db/changelog/tenant/module/investor/parts/0011_set_datetime_precision.xml
new file mode 100644
index 000000000..02b188e4e
--- /dev/null
+++ b/fineract-investor/src/main/resources/db/changelog/tenant/module/investor/parts/0011_set_datetime_precision.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership. The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.3.xsd">
+    <changeSet author="fineract" id="1" context="mysql">
+        <modifyDataType tableName="m_external_asset_owner" columnName="created_on_utc" newDataType="datetime(6)"/>
+        <modifyDataType tableName="m_external_asset_owner" columnName="last_modified_on_utc" newDataType="datetime(6)"/>
+        <modifyDataType tableName="m_external_asset_owner_journal_entry_mapping" columnName="created_on_utc" newDataType="datetime(6)"/>
+        <modifyDataType tableName="m_external_asset_owner_journal_entry_mapping" columnName="last_modified_on_utc" newDataType="datetime(6)"/>
+        <modifyDataType tableName="m_external_asset_owner_transfer" columnName="created_on_utc" newDataType="datetime(6)"/>
+        <modifyDataType tableName="m_external_asset_owner_transfer" columnName="last_modified_on_utc" newDataType="datetime(6)"/>
+        <modifyDataType tableName="m_external_asset_owner_transfer_details" columnName="created_on_utc" newDataType="datetime(6)"/>
+        <modifyDataType tableName="m_external_asset_owner_transfer_details" columnName="last_modified_on_utc" newDataType="datetime(6)"/>
+        <modifyDataType tableName="m_external_asset_owner_transfer_journal_entry_mapping" columnName="created_on_utc" newDataType="datetime(6)"/>
+        <modifyDataType tableName="m_external_asset_owner_transfer_journal_entry_mapping" columnName="last_modified_on_utc" newDataType="datetime(6)"/>
+        <modifyDataType tableName="m_external_asset_owner_transfer_loan_mapping" columnName="created_on_utc" newDataType="datetime(6)"/>
+        <modifyDataType tableName="m_external_asset_owner_transfer_loan_mapping" columnName="last_modified_on_utc" newDataType="datetime(6)"/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
index bc3964152..9c62a71a1 100644
--- a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
+++ b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
@@ -345,7 +345,7 @@ public class Loan extends AbstractAuditableWithUTCDateTimeCustom {
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "loan", orphanRemoval = true, fetch = FetchType.LAZY)
     private List<LoanRepaymentScheduleInstallment> repaymentScheduleInstallments = new ArrayList<>();
 
-    @OrderBy(value = "dateOf, id")
+    @OrderBy(value = "dateOf, createdDate, id")
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "loan", orphanRemoval = true, fetch = FetchType.LAZY)
     private List<LoanTransaction> loanTransactions = new ArrayList<>();
 
diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTransaction.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTransaction.java
index 1a9835b8c..9a2116c56 100644
--- a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTransaction.java
+++ b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTransaction.java
@@ -841,7 +841,7 @@ public class LoanTransaction extends AbstractAuditableWithUTCDateTimeCustom {
     }
 
     public OffsetDateTime getCreatedDateTime() {
-        return (this.getCreatedDate().isPresent() ? this.getCreatedDate().get() : DateUtils.getOffsetDateTimeOfTenant());
+        return (this.getCreatedDate().isPresent() ? this.getCreatedDate().get() : DateUtils.getOffsetDateTimeOfTenantWithMostPrecision());
     }
 
     public boolean isLastTransaction(final LoanTransaction loanTransaction) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryRunningBalanceUpdateServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryRunningBalanceUpdateServiceImpl.java
index f890b3a7d..0d7db6d92 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryRunningBalanceUpdateServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryRunningBalanceUpdateServiceImpl.java
@@ -175,7 +175,8 @@ public class JournalEntryRunningBalanceUpdateServiceImpl implements JournalEntry
                 BigDecimal runningBalance = calculateRunningBalance(entryData, runningBalanceMap);
 
                 params.add(new Object[] { Boolean.TRUE, runningBalance, officeRunningBalance,
-                        platformSecurityContext.authenticatedUser().getId(), DateUtils.getOffsetDateTimeOfTenant(), entryData.getId() });
+                        platformSecurityContext.authenticatedUser().getId(), DateUtils.getOffsetDateTimeOfTenantWithMostPrecision(),
+                        entryData.getId() });
                 batchIndex++;
                 if (batchIndex == batchUpdateSize || index == entryDataList.size() - 1) {
                     this.jdbcTemplate.batchUpdate(sql, params);
@@ -212,7 +213,7 @@ public class JournalEntryRunningBalanceUpdateServiceImpl implements JournalEntry
         for (JournalEntryData entryData : entryDataList) {
             BigDecimal runningBalance = calculateRunningBalance(entryData, runningBalanceMap);
             params.add(new Object[] { runningBalance, platformSecurityContext.authenticatedUser().getId(),
-                    DateUtils.getOffsetDateTimeOfTenant(), entryData.getId() });
+                    DateUtils.getOffsetDateTimeOfTenantWithMostPrecision(), entryData.getId() });
         }
         this.jdbcTemplate.batchUpdate(sql, params);
     }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/cob/domain/LoanAccountLock.java b/fineract-provider/src/main/java/org/apache/fineract/cob/domain/LoanAccountLock.java
index e1861fbb5..ce151a272 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/cob/domain/LoanAccountLock.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/cob/domain/LoanAccountLock.java
@@ -64,7 +64,7 @@ public class LoanAccountLock {
     public LoanAccountLock(Long loanId, LockOwner lockOwner, LocalDate lockPlacedOnCobBusinessDate) {
         this.loanId = loanId;
         this.lockOwner = lockOwner;
-        this.lockPlacedOn = DateUtils.getOffsetDateTimeOfTenant();
+        this.lockPlacedOn = DateUtils.getOffsetDateTimeOfTenantWithMostPrecision();
         this.lockPlacedOnCobBusinessDate = lockPlacedOnCobBusinessDate;
     }
 
@@ -75,6 +75,6 @@ public class LoanAccountLock {
 
     public void setNewLockOwner(LockOwner newLockOwner) {
         this.lockOwner = newLockOwner;
-        this.lockPlacedOn = DateUtils.getOffsetDateTimeOfTenant();
+        this.lockPlacedOn = DateUtils.getOffsetDateTimeOfTenantWithMostPrecision();
     }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/cob/loan/LoanLockingServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/cob/loan/LoanLockingServiceImpl.java
index c3758b0f5..25c661ac2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/cob/loan/LoanLockingServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/cob/loan/LoanLockingServiceImpl.java
@@ -67,7 +67,7 @@ public class LoanLockingServiceImpl implements LoanLockingService {
                     UPDATE m_loan_account_locks SET version= version + 1, lock_owner = ?, lock_placed_on = ? WHERE loan_id = ?
                 """, accountsToLock, getInClauseParameterSizeLimit(), (ps, id) -> {
             ps.setString(1, lockOwner.name());
-            ps.setObject(2, DateUtils.getOffsetDateTimeOfTenant());
+            ps.setObject(2, DateUtils.getOffsetDateTimeOfTenantWithMostPrecision());
             ps.setLong(3, id);
         });
     }
@@ -97,7 +97,7 @@ public class LoanLockingServiceImpl implements LoanLockingService {
             ps.setLong(1, loanId);
             ps.setLong(2, 1);
             ps.setString(3, lockOwner.name());
-            ps.setObject(4, DateUtils.getOffsetDateTimeOfTenant());
+            ps.setObject(4, DateUtils.getOffsetDateTimeOfTenantWithMostPrecision());
             ps.setObject(5, cobBusinessDate);
         });
     }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/updatenpa/UpdateNpaTasklet.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/updatenpa/UpdateNpaTasklet.java
index f969abe46..08f22b158 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/updatenpa/UpdateNpaTasklet.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/updatenpa/UpdateNpaTasklet.java
@@ -63,7 +63,7 @@ public class UpdateNpaTasklet implements Tasklet {
             resetNPASqlBuilder.append("set is_npa = false").append(", last_modified_by = ?, last_modified_on_utc = ? ").append(" FROM ")
                     .append(fromPart).append(wherePart);
         }
-        jdbcTemplate.update(resetNPASqlBuilder.toString(), user.getId(), DateUtils.getOffsetDateTimeOfTenant());
+        jdbcTemplate.update(resetNPASqlBuilder.toString(), user.getId(), DateUtils.getOffsetDateTimeOfTenantWithMostPrecision());
 
         final StringBuilder updateSqlBuilder = new StringBuilder(900);
 
@@ -82,7 +82,8 @@ public class UpdateNpaTasklet implements Tasklet {
                     .append(fromPart).append(wherePart);
         }
 
-        final int result = jdbcTemplate.update(updateSqlBuilder.toString(), user.getId(), DateUtils.getOffsetDateTimeOfTenant());
+        final int result = jdbcTemplate.update(updateSqlBuilder.toString(), user.getId(),
+                DateUtils.getOffsetDateTimeOfTenantWithMostPrecision());
 
         log.debug("{}: Records affected by updateNPA: {}", ThreadLocalContextUtil.getTenant().getName(), result);
         return RepeatStatus.FINISHED;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleHistoryWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleHistoryWritePlatformServiceImpl.java
index ea75aee9b..9ed49e01e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleHistoryWritePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleHistoryWritePlatformServiceImpl.java
@@ -73,7 +73,7 @@ public class LoanScheduleHistoryWritePlatformServiceImpl implements LoanSchedule
             final BigDecimal penaltyCharges = repaymentScheduleInstallment.getPenaltyChargesCharged(currency).getAmount();
 
             Map<String, Object> oldDates = null;
-            OffsetDateTime createdOnDate = DateUtils.getOffsetDateTimeOfTenant();
+            OffsetDateTime createdOnDate = DateUtils.getOffsetDateTimeOfTenantWithMostPrecision();
             LocalDateTime oldCreatedOnDate = null;
             LocalDateTime oldLastModifiedOnDate = null;
             if (repaymentScheduleInstallment.getCreatedDate().isPresent()) {
@@ -89,7 +89,7 @@ public class LoanScheduleHistoryWritePlatformServiceImpl implements LoanSchedule
             final Long lastModifiedByUser = repaymentScheduleInstallment.getLastModifiedBy()
                     .orElse(platformSecurityContext.authenticatedUser().getId());
 
-            OffsetDateTime lastModifiedOnDate = DateUtils.getOffsetDateTimeOfTenant();
+            OffsetDateTime lastModifiedOnDate = DateUtils.getOffsetDateTimeOfTenantWithMostPrecision();
             if (repaymentScheduleInstallment.getLastModifiedDate().isPresent()) {
                 lastModifiedOnDate = repaymentScheduleInstallment.getLastModifiedDate().get();
             } else if (repaymentScheduleInstallment.getId() != null && oldDates == null) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/serialization/LoanApplicationCommandFromApiJsonHelper.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/serialization/LoanApplicationCommandFromApiJsonHelper.java
index 50b2fabf2..e0d48ea3b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/serialization/LoanApplicationCommandFromApiJsonHelper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/serialization/LoanApplicationCommandFromApiJsonHelper.java
@@ -318,7 +318,7 @@ public final class LoanApplicationCommandFromApiJsonHelper {
         baseDataValidator.reset().parameter(LoanApiConstants.amortizationTypeParameterName).value(amortizationType).notNull()
                 .inMinMaxRange(0, 1);
 
-        if (!amortizationType.equals(AmortizationMethod.EQUAL_PRINCIPAL.getValue()) && fixedPrincipalPercentagePerInstallment != null) {
+        if (!AmortizationMethod.EQUAL_PRINCIPAL.getValue().equals(amortizationType) && fixedPrincipalPercentagePerInstallment != null) {
             baseDataValidator.reset().parameter(LoanApiConstants.fixedPrincipalPercentagePerInstallmentParamName).failWithCode(
                     "not.supported.principal.fixing.not.allowed.with.equal.installments",
                     "Principal fixing cannot be done with equal installment amortization");
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualWritePlatformServiceImpl.java
index 06df20322..c96c5e4cf 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualWritePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualWritePlatformServiceImpl.java
@@ -271,7 +271,7 @@ public class LoanAccrualWritePlatformServiceImpl implements LoanAccrualWritePlat
         this.jdbcTemplate.update(transactionSql, scheduleAccrualData.getLoanId(), scheduleAccrualData.getOfficeId(),
                 externalIdFactory.create().getValue(), LoanTransactionType.ACCRUAL.getValue(), accruedTill, amount, interestPortion,
                 feePortion, penaltyPortion, DateUtils.getBusinessLocalDate(), user.getId(), user.getId(),
-                DateUtils.getOffsetDateTimeOfTenant(), DateUtils.getOffsetDateTimeOfTenant());
+                DateUtils.getOffsetDateTimeOfTenantWithMostPrecision(), DateUtils.getOffsetDateTimeOfTenantWithMostPrecision());
         final Long transactionId = this.jdbcTemplate.queryForObject("SELECT " + sqlGenerator.lastInsertId(), Long.class); // NOSONAR
 
         Map<LoanChargeData, BigDecimal> applicableCharges = scheduleAccrualData.getApplicableCharges();
@@ -291,7 +291,7 @@ public class LoanAccrualWritePlatformServiceImpl implements LoanAccrualWritePlat
                 scheduleAccrualData.getRepaymentScheduleId());
 
         String updateLoan = "UPDATE m_loan  SET accrued_till=?, last_modified_by=?, last_modified_on_utc=?  WHERE  id=?";
-        this.jdbcTemplate.update(updateLoan, accruedTill, user.getId(), DateUtils.getOffsetDateTimeOfTenant(),
+        this.jdbcTemplate.update(updateLoan, accruedTill, user.getId(), DateUtils.getOffsetDateTimeOfTenantWithMostPrecision(),
                 scheduleAccrualData.getLoanId());
 
         Optional<LoanTransaction> loanAccrualTransaction = loanTransactionRepository.findByIdAndLoanId(transactionId,
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java
index ef0b1a2cf..6c0f35c6a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java
@@ -280,7 +280,7 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService, Loa
              * TODO Vishwas: Remove references to "Contra" from the codebase
              ***/
             final String sql = "select " + rm.loanPaymentsSchema() + " where tr.loan_id = ? and tr.transaction_type_enum not in (0, 3) "
-                    + " and (tr.is_reversed=false or tr.manually_adjusted_or_reversed = true)  order by tr.transaction_date ASC,id ";
+                    + " and (tr.is_reversed=false or tr.manually_adjusted_or_reversed = true)  order by tr.transaction_date, tr.created_on_utc, tr.id ";
             Collection<LoanTransactionData> loanTransactionData = this.jdbcTemplate.query(sql, rm, loanId); // NOSONAR
             // TODO: would worth to rework in the future. It is not nice to fetch relations one by one... might worth to
             // give a try to get rid of native queries
@@ -2140,7 +2140,7 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService, Loa
             final LoanTransactionDerivedComponentMapper rm = new LoanTransactionDerivedComponentMapper(sqlGenerator);
 
             final String sql = "select " + rm.schema()
-                    + " where tr.loan_id = ? and tr.transaction_type_enum = ? and tr.is_reversed=false order by tr.transaction_date ASC,id ";
+                    + " where tr.loan_id = ? and tr.transaction_type_enum = ? and tr.is_reversed=false order by tr.transaction_date, tr.created_on_utc, tr.id ";
             return this.jdbcTemplate.query(sql, rm, loanId, LoanTransactionType.WAIVE_INTEREST.getValue()); // NOSONAR
         } catch (final EmptyResultDataAccessException e) {
             return null;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
index 79eb8005c..ae2f6c9b7 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
@@ -493,8 +493,8 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf
                 AppUser user = context.authenticatedUser();
                 jdbcTemplate.update(transactionSql, loanId, loan.getOfficeId(), externalIdFactory.create().getValue(),
                         LoanTransactionType.ACCRUAL.getValue(), actualDisbursementDate, loanCharge.amount(), loanCharge.amount(),
-                        DateUtils.getBusinessLocalDate(), user.getId(), user.getId(), DateUtils.getOffsetDateTimeOfTenant(),
-                        DateUtils.getOffsetDateTimeOfTenant());
+                        DateUtils.getBusinessLocalDate(), user.getId(), user.getId(),
+                        DateUtils.getOffsetDateTimeOfTenantWithMostPrecision(), DateUtils.getOffsetDateTimeOfTenantWithMostPrecision());
             }
         }
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsSchedularInterestPoster.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsSchedularInterestPoster.java
index 557e9247e..310de4992 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsSchedularInterestPoster.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsSchedularInterestPoster.java
@@ -120,8 +120,8 @@ public class SavingsSchedularInterestPoster {
                                     savingsAccountTransactionData.getId(), null, false, null, false,
                                     savingsAccountTransactionData.getTransactionDate(), JournalEntryType.CREDIT.getValue().longValue(),
                                     savingsAccountTransactionData.getAmount(), null, JournalEntryType.CREDIT.getValue().longValue(),
-                                    savingsAccountData.getId(), DateUtils.getOffsetDateTimeOfTenant(),
-                                    DateUtils.getOffsetDateTimeOfTenant(), false, BigDecimal.ZERO, BigDecimal.ZERO, null,
+                                    savingsAccountData.getId(), DateUtils.getOffsetDateTimeOfTenantWithMostPrecision(),
+                                    DateUtils.getOffsetDateTimeOfTenantWithMostPrecision(), false, BigDecimal.ZERO, BigDecimal.ZERO, null,
                                     savingsAccountTransactionData.getTransactionDate(), null, userId, userId,
                                     DateUtils.getBusinessLocalDate() });
 
@@ -131,8 +131,8 @@ public class SavingsSchedularInterestPoster {
                                     savingsAccountTransactionData.getId(), null, false, null, false,
                                     savingsAccountTransactionData.getTransactionDate(), JournalEntryType.DEBIT.getValue().longValue(),
                                     savingsAccountTransactionData.getAmount(), null, JournalEntryType.DEBIT.getValue().longValue(),
-                                    savingsAccountData.getId(), DateUtils.getOffsetDateTimeOfTenant(),
-                                    DateUtils.getOffsetDateTimeOfTenant(), false, BigDecimal.ZERO, BigDecimal.ZERO, null,
+                                    savingsAccountData.getId(), DateUtils.getOffsetDateTimeOfTenantWithMostPrecision(),
+                                    DateUtils.getOffsetDateTimeOfTenantWithMostPrecision(), false, BigDecimal.ZERO, BigDecimal.ZERO, null,
                                     savingsAccountTransactionData.getTransactionDate(), null, userId, userId,
                                     DateUtils.getBusinessLocalDate() });
                         }
diff --git a/fineract-provider/src/main/resources/db/changelog/tenant-store/changelog-tenant-store.xml b/fineract-provider/src/main/resources/db/changelog/tenant-store/changelog-tenant-store.xml
index e0efb45cf..de38521da 100644
--- a/fineract-provider/src/main/resources/db/changelog/tenant-store/changelog-tenant-store.xml
+++ b/fineract-provider/src/main/resources/db/changelog/tenant-store/changelog-tenant-store.xml
@@ -30,4 +30,5 @@
      <include file="parts/0007_x_extend_tenant_ro_passwords.xml" relativeToChangelogFile="true"/>
      <include file="parts/0008_encrypt_existing_ro_tenant_passwords.xml" relativeToChangelogFile="true"/>
      <include file="parts/0009_set_and_encrypt_ro_if_not_exists.xml" relativeToChangelogFile="true"/>
+     <include file="parts/0010_set_datetime_precision.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>
diff --git a/fineract-provider/src/main/resources/db/changelog/tenant-store/parts/0010_set_datetime_precision.xml b/fineract-provider/src/main/resources/db/changelog/tenant-store/parts/0010_set_datetime_precision.xml
new file mode 100644
index 000000000..ce4955221
--- /dev/null
+++ b/fineract-provider/src/main/resources/db/changelog/tenant-store/parts/0010_set_datetime_precision.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership. The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd">
+    <changeSet author="fineract" id="1" context="tenant_store_db">
+        <modifyDataType tableName="tenants" columnName="created_date" newDataType="datetime(6)"/>
+        <modifyDataType tableName="tenants" columnName="lastmodified_date" newDataType="datetime(6)"/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml b/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml
index 0578e15a4..d8a9f8a1b 100644
--- a/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml
@@ -136,4 +136,5 @@
     <include file="parts/0114_create_cob_indices.xml" relativeToChangelogFile="true" />
     <include file="parts/0115_create_index_from_loan_transaction_id.xml" relativeToChangelogFile="true" />
     <include file="parts/0116_add_configuration_asset_externalization_of_non_active_loans.xml" relativeToChangelogFile="true" />
+    <include file="parts/0117_set_datetime_precision.xml" relativeToChangelogFile="true" />
 </databaseChangeLog>
diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/parts/0117_set_datetime_precision.xml b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0117_set_datetime_precision.xml
new file mode 100644
index 000000000..75f961b0d
--- /dev/null
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0117_set_datetime_precision.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership. The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.3.xsd">
+    <changeSet author="fineract" id="1" context="mysql">
+        <modifyDataType tableName="acc_gl_closure" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="acc_gl_closure" columnName="lastmodified_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="acc_gl_journal_entry" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="acc_gl_journal_entry" columnName="lastmodified_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="acc_gl_journal_entry" columnName="created_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="acc_gl_journal_entry" columnName="last_modified_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="client_device_registration" columnName="updatedon_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="interop_identifier" columnName="created_on" newDataType="timestamp(6)" />
+        <modifyDataType tableName="interop_identifier" columnName="modified_on" newDataType="timestamp(6)" />
+        <modifyDataType tableName="job" columnName="create_time" newDataType="datetime(6)" />
+        <modifyDataType tableName="job" columnName="previous_run_start_time" newDataType="datetime(6)" />
+        <modifyDataType tableName="job" columnName="next_run_time" newDataType="datetime(6)" />
+        <modifyDataType tableName="job_run_history" columnName="start_time" newDataType="datetime(6)" />
+        <modifyDataType tableName="job_run_history" columnName="end_time" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_account_transfer_standing_instructions_history" columnName="execution_time" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_adhoc" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_adhoc" columnName="lastmodified_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_adhoc" columnName="last_run" newDataType="timestamp(6)" />
+        <modifyDataType tableName="m_business_date" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_business_date" columnName="lastmodified_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_business_date" columnName="created_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_business_date" columnName="last_modified_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_calendar" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_calendar" columnName="lastmodified_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_calendar" columnName="created_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_calendar" columnName="last_modified_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_cashier_transactions" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_client" columnName="created_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_client" columnName="last_modified_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_client_identifier" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_client_identifier" columnName="lastmodified_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_client_identifier" columnName="created_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_client_identifier" columnName="last_modified_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_client_transaction" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_client_transaction" columnName="created_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_client_transaction" columnName="last_modified_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_delinquency_bucket" columnName="created_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_delinquency_bucket" columnName="last_modified_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_delinquency_bucket_mappings" columnName="created_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_delinquency_bucket_mappings" columnName="last_modified_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_delinquency_range" columnName="created_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_delinquency_range" columnName="last_modified_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_deposit_account_on_hold_transaction" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_floating_rates" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_floating_rates" columnName="lastmodified_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_floating_rates" columnName="created_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_floating_rates" columnName="last_modified_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_floating_rates_periods" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_floating_rates_periods" columnName="lastmodified_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_floating_rates_periods" columnName="created_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_floating_rates_periods" columnName="last_modified_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_hook" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_hook" columnName="lastmodified_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_import_document" columnName="import_time" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_import_document" columnName="end_time" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_loan" columnName="created_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_loan" columnName="last_modified_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_loan_account_locks" columnName="lock_placed_on" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_loan_delinquency_tag_history" columnName="created_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_loan_delinquency_tag_history" columnName="last_modified_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_loan_officer_assignment_history" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_loan_officer_assignment_history" columnName="lastmodified_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_loan_repayment_schedule" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_loan_repayment_schedule" columnName="lastmodified_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_loan_repayment_schedule" columnName="created_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_loan_repayment_schedule" columnName="last_modified_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_loan_repayment_schedule_history" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_loan_repayment_schedule_history" columnName="lastmodified_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_loan_repayment_schedule_history" columnName="created_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_loan_repayment_schedule_history" columnName="last_modified_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_loan_transaction" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_loan_transaction" columnName="created_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_loan_transaction" columnName="last_modified_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_loan_transaction_relation" columnName="created_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_loan_transaction_relation" columnName="last_modified_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_mandatory_savings_schedule" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_mandatory_savings_schedule" columnName="lastmodified_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_note" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_note" columnName="lastmodified_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_note" columnName="created_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_note" columnName="last_modified_on_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_portfolio_command_source" columnName="made_on_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_portfolio_command_source" columnName="checked_on_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_portfolio_command_source" columnName="made_on_date_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_portfolio_command_source" columnName="checked_on_date_utc" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_provisioning_criteria" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_provisioning_criteria" columnName="lastmodified_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_rate" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_rate" columnName="lastmodified_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_report_mailing_job" columnName="start_datetime" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_report_mailing_job" columnName="previous_run_datetime" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_report_mailing_job" columnName="next_run_datetime" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_report_mailing_job_run_history" columnName="start_datetime" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_report_mailing_job_run_history" columnName="end_datetime" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_savings_officer_assignment_history" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_savings_officer_assignment_history" columnName="lastmodified_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_share_account" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_share_account" columnName="lastmodified_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_share_product" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_share_product" columnName="lastmodified_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_share_product_dividend_pay_out" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_share_product_dividend_pay_out" columnName="lastmodified_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_staff_assignment_history" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_staff_assignment_history" columnName="lastmodified_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_survey_scorecards" columnName="created_on" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_tax_component" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_tax_component" columnName="lastmodified_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_tax_component_history" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_tax_component_history" columnName="lastmodified_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_tax_group" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_tax_group" columnName="lastmodified_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_tax_group_mappings" columnName="created_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="m_tax_group_mappings" columnName="lastmodified_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="mix_taxonomy_mapping" columnName="last_update_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="notification_generator" columnName="created_at" newDataType="datetime(6)" />
+        <modifyDataType tableName="notification_mapper" columnName="created_at" newDataType="datetime(6)" />
+        <modifyDataType tableName="scheduled_email_campaign" columnName="next_trigger_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="scheduled_email_campaign" columnName="last_trigger_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="scheduled_email_campaign" columnName="recurrence_start_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="sms_campaign" columnName="next_trigger_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="sms_campaign" columnName="last_trigger_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="sms_campaign" columnName="recurrence_start_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="sms_messages_outbound" columnName="delivered_on_date" newDataType="datetime(6)" />
+        <modifyDataType tableName="twofactor_access_token" columnName="valid_from" newDataType="datetime(6)" />
+        <modifyDataType tableName="twofactor_access_token" columnName="valid_to" newDataType="datetime(6)" />
+    </changeSet>
+</databaseChangeLog>
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java
index b4980aa8a..77c2ece77 100644
--- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java
@@ -44,6 +44,7 @@ import java.time.format.DateTimeFormatterBuilder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -53,6 +54,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import org.apache.fineract.accounting.glaccount.domain.GLAccountType;
+import org.apache.fineract.client.models.AllowAttributeOverrides;
 import org.apache.fineract.client.models.BusinessDateRequest;
 import org.apache.fineract.client.models.GetJournalEntriesTransactionIdResponse;
 import org.apache.fineract.client.models.GetLoanTransactionRelation;
@@ -65,15 +67,23 @@ import org.apache.fineract.client.models.GetLoansLoanIdTransactionsTransactionId
 import org.apache.fineract.client.models.JournalEntryTransactionItem;
 import org.apache.fineract.client.models.PostChargesRequest;
 import org.apache.fineract.client.models.PostChargesResponse;
+import org.apache.fineract.client.models.PostClientsRequest;
 import org.apache.fineract.client.models.PostClientsResponse;
 import org.apache.fineract.client.models.PostGLAccountsRequest;
 import org.apache.fineract.client.models.PostGLAccountsResponse;
+import org.apache.fineract.client.models.PostLoanProductsRequest;
+import org.apache.fineract.client.models.PostLoanProductsResponse;
 import org.apache.fineract.client.models.PostLoansLoanIdChargesChargeIdRequest;
 import org.apache.fineract.client.models.PostLoansLoanIdChargesChargeIdResponse;
+import org.apache.fineract.client.models.PostLoansLoanIdChargesRequest;
+import org.apache.fineract.client.models.PostLoansLoanIdChargesResponse;
 import org.apache.fineract.client.models.PostLoansLoanIdRequest;
+import org.apache.fineract.client.models.PostLoansLoanIdResponse;
 import org.apache.fineract.client.models.PostLoansLoanIdTransactionsRequest;
 import org.apache.fineract.client.models.PostLoansLoanIdTransactionsResponse;
 import org.apache.fineract.client.models.PostLoansLoanIdTransactionsTransactionIdRequest;
+import org.apache.fineract.client.models.PostLoansRequest;
+import org.apache.fineract.client.models.PostLoansResponse;
 import org.apache.fineract.client.models.PutChargeTransactionChangesRequest;
 import org.apache.fineract.client.util.CallFailedRuntimeException;
 import org.apache.fineract.infrastructure.businessdate.domain.BusinessDateType;
@@ -90,6 +100,7 @@ import org.apache.fineract.integrationtests.common.accounting.JournalEntryHelper
 import org.apache.fineract.integrationtests.common.accounting.PeriodicAccrualAccountingHelper;
 import org.apache.fineract.integrationtests.common.charges.ChargesHelper;
 import org.apache.fineract.integrationtests.common.loans.LoanApplicationTestBuilder;
+import org.apache.fineract.integrationtests.common.loans.LoanProductHelper;
 import org.apache.fineract.integrationtests.common.loans.LoanProductTestBuilder;
 import org.apache.fineract.integrationtests.common.loans.LoanStatusChecker;
 import org.apache.fineract.integrationtests.common.loans.LoanTestLifecycleExtension;
@@ -103,7 +114,6 @@ import org.apache.fineract.portfolio.charge.domain.ChargeCalculationType;
 import org.apache.fineract.portfolio.charge.domain.ChargePaymentMode;
 import org.apache.fineract.portfolio.charge.domain.ChargeTimeType;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.platform.commons.util.StringUtils;
@@ -118,149 +128,163 @@ import org.slf4j.LoggerFactory;
 @ExtendWith(LoanTestLifecycleExtension.class)
 public class ClientLoanIntegrationTest {
 
-    public static final String MINIMUM_OPENING_BALANCE = "1000.0";
-    public static final String ACCOUNT_TYPE_INDIVIDUAL = "INDIVIDUAL";
+    private static final String MINIMUM_OPENING_BALANCE = "1000.0";
+    private static final String ACCOUNT_TYPE_INDIVIDUAL = "INDIVIDUAL";
     private static final Logger LOG = LoggerFactory.getLogger(ClientLoanIntegrationTest.class);
     private static final String NONE = "1";
     private static final String CASH_BASED = "2";
     private static final String ACCRUAL_PERIODIC = "3";
     private static final String ACCRUAL_UPFRONT = "4";
 
-    private ResponseSpecification responseSpec;
-    private RequestSpecification requestSpec;
-    private LoanTransactionHelper loanTransactionHelper;
-    private JournalEntryHelper journalEntryHelper;
-    private AccountHelper accountHelper;
-    private SchedulerJobHelper schedulerJobHelper;
-    private PeriodicAccrualAccountingHelper periodicAccrualAccountingHelper;
-    private SavingsAccountHelper savingsAccountHelper;
-    private AccountTransferHelper accountTransferHelper;
+    private static final ResponseSpecification RESPONSE_SPEC = createResponseSpecification(200);
+    private static final RequestSpecification REQUEST_SPEC = createRequestSpecification();
+    private static final LoanTransactionHelper LOAN_TRANSACTION_HELPER = new LoanTransactionHelper(REQUEST_SPEC, RESPONSE_SPEC);
+    private static final JournalEntryHelper JOURNAL_ENTRY_HELPER = new JournalEntryHelper(REQUEST_SPEC, RESPONSE_SPEC);
+    private static final AccountHelper ACCOUNT_HELPER = new AccountHelper(REQUEST_SPEC, RESPONSE_SPEC);
+    // asset
+    private static final Account LOANS_RECEIVABLE_ACCOUNT = ACCOUNT_HELPER.createAssetAccount();
+    private static final Account INTEREST_FEE_RECEIVABLE_ACCOUNT = ACCOUNT_HELPER.createAssetAccount();
+    private static final Account SUSPENSE_ACCOUNT = ACCOUNT_HELPER.createAssetAccount();
+    // liability
+    private static final Account SUSPENSE_CLEARING_ACCOUNT = ACCOUNT_HELPER.createLiabilityAccount();
+    private static final Account OVERPAYMENT_ACCOUNT = ACCOUNT_HELPER.createLiabilityAccount();
+    // income
+    private static final Account INTEREST_INCOME_ACCOUNT = ACCOUNT_HELPER.createIncomeAccount();
+    private static final Account FEE_INCOME_ACCOUNT = ACCOUNT_HELPER.createIncomeAccount();
+    private static final Account FEE_CHARGE_OFF_ACCOUNT = ACCOUNT_HELPER.createIncomeAccount();
+    private static final Account RECOVERIES_ACCOUNT = ACCOUNT_HELPER.createIncomeAccount();
+    private static final Account INTEREST_INCOME_CHARGE_OFF_ACCOUNT = ACCOUNT_HELPER.createIncomeAccount();
+    // expense
+    private static final Account CREDIT_LOSS_BAD_DEBT_ACCOUNT = ACCOUNT_HELPER.createExpenseAccount();
+    private static final Account CREDIT_LOSS_BAD_DEBT_FRAUD_ACCOUNT = ACCOUNT_HELPER.createExpenseAccount();
+    private static final Account WRITTEN_OFF_ACCOUNT = ACCOUNT_HELPER.createExpenseAccount();
+    private static final Account GOODWILL_EXPENSE_ACCOUNT = ACCOUNT_HELPER.createExpenseAccount();
+    private static final SchedulerJobHelper SCHEDULER_JOB_HELPER = new SchedulerJobHelper(REQUEST_SPEC);
+    private static final PeriodicAccrualAccountingHelper PERIODIC_ACCRUAL_ACCOUNTING_HELPER = new PeriodicAccrualAccountingHelper(
+            REQUEST_SPEC, RESPONSE_SPEC);
+    private static final SavingsAccountHelper SAVINGS_ACCOUNT_HELPER = new SavingsAccountHelper(REQUEST_SPEC, RESPONSE_SPEC);
+    private static final AccountTransferHelper ACCOUNT_TRANSFER_HELPER = new AccountTransferHelper(REQUEST_SPEC, RESPONSE_SPEC);
+    private static final LoanProductHelper LOAN_PRODUCT_HELPER = new LoanProductHelper();
+    private static final String DATETIME_PATTERN = "dd MMMM yyyy";
+    private static final DateTimeFormatter DATE_TIME_FORMATTER = new DateTimeFormatterBuilder().appendPattern(DATETIME_PATTERN)
+            .toFormatter();
+    private static final BusinessDateHelper BUSINESS_DATE_HELPER = new BusinessDateHelper();
+    private static final ChargesHelper CHARGES_HELPER = new ChargesHelper();
+    private static final ClientHelper CLIENT_HELPER = new ClientHelper(REQUEST_SPEC, RESPONSE_SPEC);
 
-    private DateTimeFormatter dateFormatter = new DateTimeFormatterBuilder().appendPattern("dd MMMM yyyy").toFormatter();
-    private BusinessDateHelper businessDateHelper;
-    private ChargesHelper chargesHelper;
-    private ClientHelper clientHelper;
-
-    @BeforeEach
-    public void setup() {
+    static {
         Utils.initializeRESTAssured();
-        this.requestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build();
-        this.requestSpec.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey());
-        this.responseSpec = new ResponseSpecBuilder().expectStatusCode(200).build();
-        this.requestSpec.header("Fineract-Platform-TenantId", "default");
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-        this.accountHelper = new AccountHelper(this.requestSpec, this.responseSpec);
-        this.schedulerJobHelper = new SchedulerJobHelper(this.requestSpec);
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-        this.periodicAccrualAccountingHelper = new PeriodicAccrualAccountingHelper(this.requestSpec, this.responseSpec);
-        this.journalEntryHelper = new JournalEntryHelper(this.requestSpec, this.responseSpec);
-        this.businessDateHelper = new BusinessDateHelper();
-        this.chargesHelper = new ChargesHelper();
-        this.clientHelper = new ClientHelper(this.requestSpec, this.responseSpec);
+    }
+
+    private static RequestSpecification createRequestSpecification() {
+        RequestSpecification request = new RequestSpecBuilder().setContentType(ContentType.JSON).build();
+
+        request.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey());
+        request.header("Fineract-Platform-TenantId", "default");
+        return request;
+    }
+
+    private static ResponseSpecification createResponseSpecification(int statusCode) {
+        return new ResponseSpecBuilder().expectStatusCode(statusCode).build();
     }
 
     @Test
     public void checkClientLoanCreateAndDisburseFlow() {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
         List<HashMap> collaterals = new ArrayList<>();
 
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
 
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
 
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
                 String.valueOf(clientID), collateralId);
         addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
 
         final Integer loanProductID = createLoanProduct(false, NONE);
         final Integer loanID = applyForLoanApplication(clientID, loanProductID, null, null, "12,000.00", collaterals);
-        final ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec,
-                loanID);
+        final ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         verifyLoanRepaymentSchedule(loanSchedule);
     }
 
     @Test
     public void validateClientLoanWithUniqueExternalId() {
         // Given
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
         final ResponseSpecification responseSpec403 = new ResponseSpecBuilder().expectStatusCode(403).build();
 
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
         final Integer loanProductID = createLoanProduct(false, NONE);
 
         final String externalId = UUID.randomUUID().toString();
 
         // When
-        final Integer loanID = applyForLoanApplicationWithExternalId(this.requestSpec, this.responseSpec, clientID, loanProductID,
-                "12,000.00", externalId);
+        final Integer loanID = applyForLoanApplicationWithExternalId(REQUEST_SPEC, RESPONSE_SPEC, clientID, loanProductID, "12,000.00",
+                externalId);
 
         // Then
         assertNotNull(loanID);
-        applyForLoanApplicationWithExternalId(this.requestSpec, responseSpec403, clientID, loanProductID, "12,000.00", externalId);
+        applyForLoanApplicationWithExternalId(REQUEST_SPEC, responseSpec403, clientID, loanProductID, "12,000.00", externalId);
     }
 
     @Test
     public void testAddingLoanChargeIncludesLoanIdInTheResponse() {
         // given
-        loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-        Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec);
+        Integer clientId = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
         Integer loanProductId = createLoanProduct(false, NONE);
-        Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
-        Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
+        Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
+        Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
                 String.valueOf(clientId), collateralId);
         List<HashMap> collaterals = List.of(collaterals(clientCollateralId, BigDecimal.ONE));
 
-        Integer chargeId = ChargesHelper.createCharges(requestSpec, responseSpec,
+        Integer chargeId = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
                 ChargesHelper.getLoanDisbursementJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1"));
         List<HashMap> charges = List.of(charges(chargeId, "1", null));
         // when
         Integer loanId = applyForLoanApplication(clientId, loanProductId, charges, null, "12,000.00", collaterals);
         // then
-        List<HashMap> loanCharges = loanTransactionHelper.getLoanCharges(loanId);
+        List<HashMap> loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanId);
         Integer loanChargeId = (Integer) loanCharges.get(0).get("id");
-        HashMap loanChargeDetail = loanTransactionHelper.getLoanCharge(loanId, loanChargeId);
+        HashMap loanChargeDetail = LOAN_TRANSACTION_HELPER.getLoanCharge(loanId, loanChargeId);
         assertEquals(loanId, loanChargeDetail.get("loanId"));
     }
 
     @Test
     public void testLoanCharges_DISBURSEMENT_FEE() {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
         final Integer loanProductID = createLoanProduct(false, NONE);
 
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
         Assertions.assertNotNull(collateralId);
         List<HashMap> collaterals = new ArrayList<>();
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
                 String.valueOf(clientID), collateralId);
         Assertions.assertNotNull(clientCollateralId);
         addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
 
         List<HashMap> charges = new ArrayList<>();
-        Integer flatDisbursement = ChargesHelper.createCharges(requestSpec, responseSpec, ChargesHelper.getLoanDisbursementJSON());
+        Integer flatDisbursement = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC, ChargesHelper.getLoanDisbursementJSON());
 
-        Integer amountPercentage = ChargesHelper.createCharges(requestSpec, responseSpec,
+        Integer amountPercentage = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
                 ChargesHelper.getLoanDisbursementJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1"));
         addCharges(charges, amountPercentage, "1", null);
-        Integer amountPlusInterestPercentage = ChargesHelper.createCharges(requestSpec, responseSpec,
+        Integer amountPlusInterestPercentage = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
                 ChargesHelper.getLoanDisbursementJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT_AND_INTEREST, "1"));
         addCharges(charges, amountPlusInterestPercentage, "1", null);
-        Integer interestPercentage = ChargesHelper.createCharges(requestSpec, responseSpec,
+        Integer interestPercentage = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
                 ChargesHelper.getLoanDisbursementJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_INTEREST, "1"));
         addCharges(charges, interestPercentage, "1", null);
 
         final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges, null, "12,000.00", collaterals);
         Assertions.assertNotNull(loanID);
 
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
 
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         HashMap disbursementDetail = loanSchedule.get(0);
 
-        List<HashMap> loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
+        List<HashMap> loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
 
         validateCharge(amountPercentage, loanCharges, "1.0", "120.0", "0.0", "0.0");
         validateCharge(interestPercentage, loanCharges, "1.0", "6.06", "0.0", "0.0");
@@ -268,27 +292,26 @@ public class ClientLoanIntegrationTest {
 
         validateNumberForEqual("252.12", String.valueOf(disbursementDetail.get("feeChargesDue")));
 
-        this.loanTransactionHelper.addChargesForLoan(loanID,
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID,
                 LoanTransactionHelper.getDisbursementChargesForLoanAsJSON(String.valueOf(flatDisbursement)));
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         disbursementDetail = loanSchedule.get(0);
 
         validateCharge(flatDisbursement, loanCharges, "100.0", "100.0", "0.0", "0.0");
         validateNumberForEqual("352.12", String.valueOf(disbursementDetail.get("feeChargesDue")));
 
-        this.loanTransactionHelper.updateChargesForLoan(loanID, (Integer) getloanCharge(amountPercentage, loanCharges).get("id"),
+        LOAN_TRANSACTION_HELPER.updateChargesForLoan(loanID, (Integer) getloanCharge(amountPercentage, loanCharges).get("id"),
                 LoanTransactionHelper.getUpdateChargesForLoanAsJSON("2"));
-        this.loanTransactionHelper.updateChargesForLoan(loanID, (Integer) getloanCharge(interestPercentage, loanCharges).get("id"),
+        LOAN_TRANSACTION_HELPER.updateChargesForLoan(loanID, (Integer) getloanCharge(interestPercentage, loanCharges).get("id"),
                 LoanTransactionHelper.getUpdateChargesForLoanAsJSON("2"));
-        this.loanTransactionHelper.updateChargesForLoan(loanID,
-                (Integer) getloanCharge(amountPlusInterestPercentage, loanCharges).get("id"),
+        LOAN_TRANSACTION_HELPER.updateChargesForLoan(loanID, (Integer) getloanCharge(amountPlusInterestPercentage, loanCharges).get("id"),
                 LoanTransactionHelper.getUpdateChargesForLoanAsJSON("2"));
-        this.loanTransactionHelper.updateChargesForLoan(loanID, (Integer) getloanCharge(flatDisbursement, loanCharges).get("id"),
+        LOAN_TRANSACTION_HELPER.updateChargesForLoan(loanID, (Integer) getloanCharge(flatDisbursement, loanCharges).get("id"),
                 LoanTransactionHelper.getUpdateChargesForLoanAsJSON("150"));
 
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         disbursementDetail = loanSchedule.get(0);
         validateCharge(amountPercentage, loanCharges, "2.0", "240.0", "0.0", "0.0");
         validateCharge(interestPercentage, loanCharges, "2.0", "12.12", "0.0", "0.0");
@@ -296,11 +319,11 @@ public class ClientLoanIntegrationTest {
         validateCharge(flatDisbursement, loanCharges, "150.0", "150.0", "0.0", "0.0");
         validateNumberForEqual("654.24", String.valueOf(disbursementDetail.get("feeChargesDue")));
 
-        this.loanTransactionHelper.updateLoan(loanID,
+        LOAN_TRANSACTION_HELPER.updateLoan(loanID,
                 updateLoanJson(clientID, loanProductID, copyChargesForUpdate(loanCharges, null, null), null, collaterals));
 
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         disbursementDetail = loanSchedule.get(0);
         validateCharge(amountPercentage, loanCharges, "2.0", "200.0", "0.0", "0.0");
         validateCharge(interestPercentage, loanCharges, "2.0", "10.1", "0.0", "0.0");
@@ -308,11 +331,11 @@ public class ClientLoanIntegrationTest {
         validateCharge(flatDisbursement, loanCharges, "150.0", "150.0", "0.0", "0.0");
         validateNumberForEqual("570.2", String.valueOf(disbursementDetail.get("feeChargesDue")));
 
-        this.loanTransactionHelper.updateLoan(loanID,
+        LOAN_TRANSACTION_HELPER.updateLoan(loanID,
                 updateLoanJson(clientID, loanProductID, copyChargesForUpdate(loanCharges, flatDisbursement, "1"), null, collaterals));
 
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         disbursementDetail = loanSchedule.get(0);
         validateCharge(amountPercentage, loanCharges, "1.0", "100.0", "0.0", "0.0");
         validateCharge(interestPercentage, loanCharges, "1.0", "5.05", "0.0", "0.0");
@@ -321,17 +344,17 @@ public class ClientLoanIntegrationTest {
 
         charges.clear();
         addCharges(charges, flatDisbursement, "100", null);
-        this.loanTransactionHelper.updateLoan(loanID, updateLoanJson(clientID, loanProductID, charges, null, collaterals));
+        LOAN_TRANSACTION_HELPER.updateLoan(loanID, updateLoanJson(clientID, loanProductID, charges, null, collaterals));
 
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         disbursementDetail = loanSchedule.get(0);
         validateCharge(flatDisbursement, loanCharges, "100.0", "100.0", "0.0", "0.0");
         validateNumberForEqual("100.0", String.valueOf(disbursementDetail.get("feeChargesDue")));
 
-        this.loanTransactionHelper.deleteChargesForLoan(loanID, (Integer) getloanCharge(flatDisbursement, loanCharges).get("id"));
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        LOAN_TRANSACTION_HELPER.deleteChargesForLoan(loanID, (Integer) getloanCharge(flatDisbursement, loanCharges).get("id"));
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         disbursementDetail = loanSchedule.get(0);
         Assertions.assertEquals(0, loanCharges.size());
         validateNumberForEqual("0.0", String.valueOf(disbursementDetail.get("feeChargesDue")));
@@ -340,28 +363,27 @@ public class ClientLoanIntegrationTest {
 
     @Test
     public void testLoanCharges_DISBURSEMENT_FEE_WITH_AMOUNT_CHANGE() {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
 
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
         final Integer loanProductID = createLoanProduct(false, NONE);
 
         List<HashMap> charges = new ArrayList<>();
-        Integer amountPercentage = ChargesHelper.createCharges(requestSpec, responseSpec,
+        Integer amountPercentage = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
                 ChargesHelper.getLoanDisbursementJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1"));
         addCharges(charges, amountPercentage, "1", null);
-        Integer amountPlusInterestPercentage = ChargesHelper.createCharges(requestSpec, responseSpec,
+        Integer amountPlusInterestPercentage = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
                 ChargesHelper.getLoanDisbursementJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT_AND_INTEREST, "1"));
         addCharges(charges, amountPlusInterestPercentage, "1", null);
-        Integer interestPercentage = ChargesHelper.createCharges(requestSpec, responseSpec,
+        Integer interestPercentage = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
                 ChargesHelper.getLoanDisbursementJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_INTEREST, "1"));
         addCharges(charges, interestPercentage, "1", null);
 
         List<HashMap> collaterals = new ArrayList<>();
 
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
         Assertions.assertNotNull(collateralId);
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
                 String.valueOf(clientID), collateralId);
         Assertions.assertNotNull(clientCollateralId);
         addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
@@ -369,13 +391,13 @@ public class ClientLoanIntegrationTest {
         final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges, null, "12,000.00", collaterals);
         Assertions.assertNotNull(loanID);
 
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
 
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         HashMap disbursementDetail = loanSchedule.get(0);
 
-        List<HashMap> loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
+        List<HashMap> loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
 
         validateCharge(amountPercentage, loanCharges, "1.0", "120.0", "0.0", "0.0");
         validateCharge(interestPercentage, loanCharges, "1.0", "6.06", "0.0", "0.0");
@@ -383,19 +405,19 @@ public class ClientLoanIntegrationTest {
         validateNumberForEqual("252.12", String.valueOf(disbursementDetail.get("feeChargesDue")));
 
         LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan("20 September 2011", loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("20 September 2011", loanID);
         LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
         LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
 
         // DISBURSE
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID, "10000",
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID, "10000",
                 JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
         LOG.info("DISBURSE {}", loanStatusHashMap.toString());
         LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
 
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         disbursementDetail = loanSchedule.get(0);
 
         validateCharge(amountPercentage, loanCharges, "1.0", "0.0", "100.0", "0.0");
@@ -407,34 +429,33 @@ public class ClientLoanIntegrationTest {
 
     @Test
     public void testLoanDisbursedTodayIsRetrieved() {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
 
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
         final Integer loanProductID = createLoanProduct(false, NONE);
 
         final Integer loanID = applyForLoanApplication(clientID, loanProductID, "5", null);
         Assertions.assertNotNull(loanID);
 
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
 
-        DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US);
+        DateFormat dateFormat = new SimpleDateFormat(DATETIME_PATTERN, Locale.US);
         Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
         final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
 
         LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
         LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
         LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
 
         // DISBURSE on todays date so that loan can't be in arrears
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID, "10000",
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID, "10000",
                 JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
         LOG.info("DISBURSE {}", loanStatusHashMap.toString());
         LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-        loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
+        loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         // Test added because loans created without arrears were failing to be retrieved (associations=all) due to inner
         // join on m_loan_arrears_aging (now left join)
         Assertions.assertNotNull(loanDetails, "Empty Loan Details");
@@ -444,33 +465,32 @@ public class ClientLoanIntegrationTest {
 
     @Test
     public void testLoanCharges_SPECIFIED_DUE_DATE_FEE() {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
 
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
         final Integer loanProductID = createLoanProduct(false, NONE);
 
         List<HashMap> charges = new ArrayList<>();
-        Integer flat = ChargesHelper.createCharges(requestSpec, responseSpec,
+        Integer flat = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
                 ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "100", false));
-        Integer flatAccTransfer = ChargesHelper.createCharges(requestSpec, responseSpec,
+        Integer flatAccTransfer = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
                 ChargesHelper.getLoanSpecifiedDueDateWithAccountTransferJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "100", false));
 
-        Integer amountPercentage = ChargesHelper.createCharges(requestSpec, responseSpec,
+        Integer amountPercentage = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
                 ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", false));
         addCharges(charges, amountPercentage, "1", "29 September 2011");
-        Integer amountPlusInterestPercentage = ChargesHelper.createCharges(requestSpec, responseSpec, ChargesHelper
+        Integer amountPlusInterestPercentage = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC, ChargesHelper
                 .getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT_AND_INTEREST, "1", false));
         addCharges(charges, amountPlusInterestPercentage, "1", "29 September 2011");
-        Integer interestPercentage = ChargesHelper.createCharges(requestSpec, responseSpec,
+        Integer interestPercentage = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
                 ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_INTEREST, "1", false));
         addCharges(charges, interestPercentage, "1", "29 September 2011");
 
         List<HashMap> collaterals = new ArrayList<>();
 
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
         Assertions.assertNotNull(collateralId);
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
                 clientID.toString(), collateralId);
         Assertions.assertNotNull(clientCollateralId);
         addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
@@ -478,13 +498,13 @@ public class ClientLoanIntegrationTest {
         final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges, null, "12,000.00", collaterals);
         Assertions.assertNotNull(loanID);
 
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
 
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         HashMap firstInstallment = loanSchedule.get(1);
 
-        List<HashMap> loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
+        List<HashMap> loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
 
         validateCharge(amountPercentage, loanCharges, "1.0", "120.0", "0.0", "0.0");
         validateCharge(interestPercentage, loanCharges, "1.0", "6.06", "0.0", "0.0");
@@ -492,27 +512,26 @@ public class ClientLoanIntegrationTest {
 
         validateNumberForEqual("252.12", String.valueOf(firstInstallment.get("feeChargesDue")));
 
-        this.loanTransactionHelper.addChargesForLoan(loanID,
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID,
                 LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flat), "29 September 2011", "100"));
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         firstInstallment = loanSchedule.get(1);
 
         validateCharge(flat, loanCharges, "100.0", "100.0", "0.0", "0.0");
         validateNumberForEqual("352.12", String.valueOf(firstInstallment.get("feeChargesDue")));
 
-        this.loanTransactionHelper.updateChargesForLoan(loanID, (Integer) getloanCharge(amountPercentage, loanCharges).get("id"),
+        LOAN_TRANSACTION_HELPER.updateChargesForLoan(loanID, (Integer) getloanCharge(amountPercentage, loanCharges).get("id"),
                 LoanTransactionHelper.getUpdateChargesForLoanAsJSON("2"));
-        this.loanTransactionHelper.updateChargesForLoan(loanID, (Integer) getloanCharge(interestPercentage, loanCharges).get("id"),
+        LOAN_TRANSACTION_HELPER.updateChargesForLoan(loanID, (Integer) getloanCharge(interestPercentage, loanCharges).get("id"),
                 LoanTransactionHelper.getUpdateChargesForLoanAsJSON("2"));
-        this.loanTransactionHelper.updateChargesForLoan(loanID,
-                (Integer) getloanCharge(amountPlusInterestPercentage, loanCharges).get("id"),
+        LOAN_TRANSACTION_HELPER.updateChargesForLoan(loanID, (Integer) getloanCharge(amountPlusInterestPercentage, loanCharges).get("id"),
                 LoanTransactionHelper.getUpdateChargesForLoanAsJSON("2"));
-        this.loanTransactionHelper.updateChargesForLoan(loanID, (Integer) getloanCharge(flat, loanCharges).get("id"),
+        LOAN_TRANSACTION_HELPER.updateChargesForLoan(loanID, (Integer) getloanCharge(flat, loanCharges).get("id"),
                 LoanTransactionHelper.getUpdateChargesForLoanAsJSON("150"));
 
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         firstInstallment = loanSchedule.get(1);
         validateCharge(amountPercentage, loanCharges, "2.0", "240.0", "0.0", "0.0");
         validateCharge(interestPercentage, loanCharges, "2.0", "12.12", "0.0", "0.0");
@@ -520,13 +539,12 @@ public class ClientLoanIntegrationTest {
         validateCharge(flat, loanCharges, "150.0", "150.0", "0.0", "0.0");
         validateNumberForEqual("654.24", String.valueOf(firstInstallment.get("feeChargesDue")));
 
-        final Integer savingsId = SavingsAccountHelper.openSavingsAccount(this.requestSpec, this.responseSpec, clientID,
-                MINIMUM_OPENING_BALANCE);
-        this.loanTransactionHelper.updateLoan(loanID, updateLoanJson(clientID, loanProductID, copyChargesForUpdate(loanCharges, null, null),
+        final Integer savingsId = SavingsAccountHelper.openSavingsAccount(REQUEST_SPEC, RESPONSE_SPEC, clientID, MINIMUM_OPENING_BALANCE);
+        LOAN_TRANSACTION_HELPER.updateLoan(loanID, updateLoanJson(clientID, loanProductID, copyChargesForUpdate(loanCharges, null, null),
                 String.valueOf(savingsId), collaterals));
 
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         firstInstallment = loanSchedule.get(1);
         validateCharge(amountPercentage, loanCharges, "2.0", "200.0", "0.0", "0.0");
         validateCharge(interestPercentage, loanCharges, "2.0", "10.1", "0.0", "0.0");
@@ -534,11 +552,11 @@ public class ClientLoanIntegrationTest {
         validateCharge(flat, loanCharges, "150.0", "150.0", "0.0", "0.0");
         validateNumberForEqual("570.2", String.valueOf(firstInstallment.get("feeChargesDue")));
 
-        this.loanTransactionHelper.updateLoan(loanID,
+        LOAN_TRANSACTION_HELPER.updateLoan(loanID,
                 updateLoanJson(clientID, loanProductID, copyChargesForUpdate(loanCharges, flat, "1"), null, collaterals));
 
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         firstInstallment = loanSchedule.get(1);
         validateCharge(amountPercentage, loanCharges, "1.0", "100.0", "0.0", "0.0");
         validateCharge(interestPercentage, loanCharges, "1.0", "5.05", "0.0", "0.0");
@@ -547,53 +565,53 @@ public class ClientLoanIntegrationTest {
 
         charges.clear();
         addCharges(charges, flat, "100", "29 September 2011");
-        this.loanTransactionHelper.updateLoan(loanID, updateLoanJson(clientID, loanProductID, charges, null, collaterals));
+        LOAN_TRANSACTION_HELPER.updateLoan(loanID, updateLoanJson(clientID, loanProductID, charges, null, collaterals));
 
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         firstInstallment = loanSchedule.get(1);
         validateCharge(flat, loanCharges, "100.0", "100.0", "0.0", "0.0");
         validateNumberForEqual("100.0", String.valueOf(firstInstallment.get("feeChargesDue")));
 
-        this.loanTransactionHelper.deleteChargesForLoan(loanID, (Integer) getloanCharge(flat, loanCharges).get("id"));
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        LOAN_TRANSACTION_HELPER.deleteChargesForLoan(loanID, (Integer) getloanCharge(flat, loanCharges).get("id"));
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         firstInstallment = loanSchedule.get(1);
         Assertions.assertEquals(0, loanCharges.size());
         validateNumberForEqual("0", String.valueOf(firstInstallment.get("feeChargesDue")));
 
         LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan("20 September 2011", loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("20 September 2011", loanID);
         LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
         LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
 
-        this.loanTransactionHelper.addChargesForLoan(loanID,
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID,
                 LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatAccTransfer), "29 September 2011", "100"));
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         firstInstallment = loanSchedule.get(1);
         validateCharge(flatAccTransfer, loanCharges, "100.0", "100.0", "0.0", "0.0");
         validateNumberForEqual("100.0", String.valueOf(firstInstallment.get("feeChargesDue")));
 
         // DISBURSE
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID, "10000",
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID, "10000",
                 JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
         LOG.info("DISBURSE {}", loanStatusHashMap.toString());
         LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
 
-        this.loanTransactionHelper.addChargesForLoan(loanID,
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID,
                 LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(amountPercentage), "29 September 2011", "1"));
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         firstInstallment = loanSchedule.get(1);
         validateCharge(amountPercentage, loanCharges, "1.0", "100.0", "0.0", "0.0");
         validateCharge(flatAccTransfer, loanCharges, "100.0", "100.0", "0.0", "0.0");
         validateNumberForEqual("200.0", String.valueOf(firstInstallment.get("feeChargesDue")));
 
-        this.loanTransactionHelper.waiveChargesForLoan(loanID, (Integer) getloanCharge(amountPercentage, loanCharges).get("id"), "");
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        LOAN_TRANSACTION_HELPER.waiveChargesForLoan(loanID, (Integer) getloanCharge(amountPercentage, loanCharges).get("id"), "");
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         firstInstallment = loanSchedule.get(1);
         validateCharge(amountPercentage, loanCharges, "1.0", "0.0", "0.0", "100.0");
         validateCharge(flatAccTransfer, loanCharges, "100.0", "100.0", "0.0", "0.0");
@@ -601,10 +619,10 @@ public class ClientLoanIntegrationTest {
         validateNumberForEqual("100.0", String.valueOf(firstInstallment.get("feeChargesOutstanding")));
         validateNumberForEqual("100.0", String.valueOf(firstInstallment.get("feeChargesWaived")));
 
-        this.loanTransactionHelper.payChargesForLoan(loanID, (Integer) getloanCharge(flatAccTransfer, loanCharges).get("id"),
+        LOAN_TRANSACTION_HELPER.payChargesForLoan(loanID, (Integer) getloanCharge(flatAccTransfer, loanCharges).get("id"),
                 LoanTransactionHelper.getPayChargeJSON(SavingsAccountHelper.TRANSACTION_DATE, null));
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         firstInstallment = loanSchedule.get(1);
         validateCharge(amountPercentage, loanCharges, "1.0", "0.0", "0.0", "100.0");
         validateCharge(flatAccTransfer, loanCharges, "100.0", "0.0", "100.0", "0.0");
@@ -616,44 +634,43 @@ public class ClientLoanIntegrationTest {
 
     @Test
     public void testLoanCharges_INSTALMENT_FEE() {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
         final Integer loanProductID = createLoanProduct(false, NONE);
 
         List<HashMap> charges = new ArrayList<>();
-        Integer flat = ChargesHelper.createCharges(requestSpec, responseSpec,
+        Integer flat = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
                 ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "50", false));
-        Integer flatAccTransfer = ChargesHelper.createCharges(requestSpec, responseSpec,
+        Integer flatAccTransfer = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
                 ChargesHelper.getLoanInstallmentWithAccountTransferJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "50", false));
 
-        Integer amountPercentage = ChargesHelper.createCharges(requestSpec, responseSpec,
+        Integer amountPercentage = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
                 ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", false));
         addCharges(charges, amountPercentage, "1", "29 September 2011");
-        Integer amountPlusInterestPercentage = ChargesHelper.createCharges(requestSpec, responseSpec,
+        Integer amountPlusInterestPercentage = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
                 ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT_AND_INTEREST, "1", false));
         addCharges(charges, amountPlusInterestPercentage, "1", "29 September 2011");
-        Integer interestPercentage = ChargesHelper.createCharges(requestSpec, responseSpec,
+        Integer interestPercentage = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
                 ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_INTEREST, "1", false));
         addCharges(charges, interestPercentage, "1", "29 September 2011");
 
         List<HashMap> collaterals = new ArrayList<>();
 
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
 
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
                 String.valueOf(clientID), collateralId);
         addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
 
         final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges, null, "12,000.00", collaterals);
         Assertions.assertNotNull(loanID);
 
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
 
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         loanSchedule.remove(0);
-        List<HashMap> loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
+        List<HashMap> loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
 
         Float totalPerOfAmout = 0F;
         Float totalPerOfAmoutPlusInt = 0F;
@@ -675,10 +692,10 @@ public class ClientLoanIntegrationTest {
         validateChargeExcludePrecission(amountPlusInterestPercentage, loanCharges, "1.0", String.valueOf(totalPerOfAmoutPlusInt), "0.0",
                 "0.0");
 
-        this.loanTransactionHelper.addChargesForLoan(loanID,
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID,
                 LoanTransactionHelper.getInstallmentChargesForLoanAsJSON(String.valueOf(flat), "50"));
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         loanSchedule.remove(0);
         totalPerOfAmout = 0F;
         totalPerOfAmoutPlusInt = 0F;
@@ -701,18 +718,17 @@ public class ClientLoanIntegrationTest {
                 "0.0");
         validateChargeExcludePrecission(flat, loanCharges, "50.0", "200", "0.0", "0.0");
 
-        this.loanTransactionHelper.updateChargesForLoan(loanID, (Integer) getloanCharge(amountPercentage, loanCharges).get("id"),
+        LOAN_TRANSACTION_HELPER.updateChargesForLoan(loanID, (Integer) getloanCharge(amountPercentage, loanCharges).get("id"),
                 LoanTransactionHelper.getUpdateChargesForLoanAsJSON("2"));
-        this.loanTransactionHelper.updateChargesForLoan(loanID, (Integer) getloanCharge(interestPercentage, loanCharges).get("id"),
+        LOAN_TRANSACTION_HELPER.updateChargesForLoan(loanID, (Integer) getloanCharge(interestPercentage, loanCharges).get("id"),
                 LoanTransactionHelper.getUpdateChargesForLoanAsJSON("2"));
-        this.loanTransactionHelper.updateChargesForLoan(loanID,
-                (Integer) getloanCharge(amountPlusInterestPercentage, loanCharges).get("id"),
+        LOAN_TRANSACTION_HELPER.updateChargesForLoan(loanID, (Integer) getloanCharge(amountPlusInterestPercentage, loanCharges).get("id"),
                 LoanTransactionHelper.getUpdateChargesForLoanAsJSON("2"));
-        this.loanTransactionHelper.updateChargesForLoan(loanID, (Integer) getloanCharge(flat, loanCharges).get("id"),
+        LOAN_TRANSACTION_HELPER.updateChargesForLoan(loanID, (Integer) getloanCharge(flat, loanCharges).get("id"),
                 LoanTransactionHelper.getUpdateChargesForLoanAsJSON("100"));
 
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         loanSchedule.remove(0);
         totalPerOfAmout = 0F;
         totalPerOfAmoutPlusInt = 0F;
@@ -735,13 +751,12 @@ public class ClientLoanIntegrationTest {
                 "0.0");
         validateChargeExcludePrecission(flat, loanCharges, "100.0", "400", "0.0", "0.0");
 
-        final Integer savingsId = SavingsAccountHelper.openSavingsAccount(this.requestSpec, this.responseSpec, clientID,
-                MINIMUM_OPENING_BALANCE);
-        this.loanTransactionHelper.updateLoan(loanID, updateLoanJson(clientID, loanProductID, copyChargesForUpdate(loanCharges, null, null),
+        final Integer savingsId = SavingsAccountHelper.openSavingsAccount(REQUEST_SPEC, RESPONSE_SPEC, clientID, MINIMUM_OPENING_BALANCE);
+        LOAN_TRANSACTION_HELPER.updateLoan(loanID, updateLoanJson(clientID, loanProductID, copyChargesForUpdate(loanCharges, null, null),
                 String.valueOf(savingsId), collaterals));
 
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         loanSchedule.remove(0);
         totalPerOfAmout = 0F;
         totalPerOfAmoutPlusInt = 0F;
@@ -764,11 +779,11 @@ public class ClientLoanIntegrationTest {
                 "0.0");
         validateChargeExcludePrecission(flat, loanCharges, "100.0", "400", "0.0", "0.0");
 
-        this.loanTransactionHelper.updateLoan(loanID,
+        LOAN_TRANSACTION_HELPER.updateLoan(loanID,
                 updateLoanJson(clientID, loanProductID, copyChargesForUpdate(loanCharges, flat, "1"), null, collaterals));
 
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         loanSchedule.remove(0);
         totalPerOfAmout = 0F;
         totalPerOfAmoutPlusInt = 0F;
@@ -792,33 +807,33 @@ public class ClientLoanIntegrationTest {
 
         charges.clear();
         addCharges(charges, flat, "50", "29 September 2011");
-        this.loanTransactionHelper.updateLoan(loanID, updateLoanJson(clientID, loanProductID, charges, null, collaterals));
+        LOAN_TRANSACTION_HELPER.updateLoan(loanID, updateLoanJson(clientID, loanProductID, charges, null, collaterals));
 
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         loanSchedule.remove(0);
         for (HashMap installment : loanSchedule) {
             validateNumberForEqualExcludePrecission("50", String.valueOf(installment.get("feeChargesDue")));
         }
         validateChargeExcludePrecission(flat, loanCharges, "50.0", "200", "0.0", "0.0");
 
-        this.loanTransactionHelper.deleteChargesForLoan(loanID, (Integer) getloanCharge(flat, loanCharges).get("id"));
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        LOAN_TRANSACTION_HELPER.deleteChargesForLoan(loanID, (Integer) getloanCharge(flat, loanCharges).get("id"));
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         loanSchedule.remove(0);
         for (HashMap installment : loanSchedule) {
             validateNumberForEqualExcludePrecission("0", String.valueOf(installment.get("feeChargesDue")));
         }
 
         LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan("20 September 2011", loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("20 September 2011", loanID);
         LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
         LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
 
-        this.loanTransactionHelper.addChargesForLoan(loanID,
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID,
                 LoanTransactionHelper.getInstallmentChargesForLoanAsJSON(String.valueOf(flatAccTransfer), "100"));
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         loanSchedule.remove(0);
         for (HashMap installment : loanSchedule) {
             validateNumberForEqualExcludePrecission("100", String.valueOf(installment.get("feeChargesDue")));
@@ -826,17 +841,17 @@ public class ClientLoanIntegrationTest {
         validateChargeExcludePrecission(flatAccTransfer, loanCharges, "100.0", "400", "0.0", "0.0");
 
         // DISBURSE
-        String loanDetail = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID, "10000",
+        String loanDetail = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID, "10000",
                 JsonPath.from(loanDetail).get("netDisbursalAmount").toString());
         LOG.info("DISBURSE {}", loanStatusHashMap.toString());
         LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
 
-        this.loanTransactionHelper.addChargesForLoan(loanID,
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID,
                 LoanTransactionHelper.getInstallmentChargesForLoanAsJSON(String.valueOf(flat), "50"));
 
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         loanSchedule.remove(0);
         for (HashMap installment : loanSchedule) {
             validateNumberForEqualExcludePrecission("150", String.valueOf(installment.get("feeChargesDue")));
@@ -845,18 +860,18 @@ public class ClientLoanIntegrationTest {
         validateChargeExcludePrecission(flat, loanCharges, "50.0", "200", "0.0", "0.0");
 
         Integer waivePeriodnum = 1;
-        final Integer waivedChargeId = this.loanTransactionHelper.waiveChargesForLoan(loanID,
+        final Integer waivedChargeId = LOAN_TRANSACTION_HELPER.waiveChargesForLoan(loanID,
                 (Integer) getloanCharge(flat, loanCharges).get("id"),
                 LoanTransactionHelper.getWaiveChargeJSON(String.valueOf(waivePeriodnum)));
 
         // Get loan transaction details
-        ArrayList<HashMap> loanDetails = this.loanTransactionHelper.getLoanTransactionDetails(this.requestSpec, this.responseSpec, loanID);
+        ArrayList<HashMap> loanDetails = LOAN_TRANSACTION_HELPER.getLoanTransactionDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         Assertions.assertNotNull(loanDetails, "Empty Loan Details");
         Gson gson = new Gson();
         Integer transId = null;
         Integer chargeId = null;
-        for (int i = 0; i < loanDetails.size(); i++) {
-            String resultObject = gson.toJson(loanDetails.get(i));
+        for (HashMap detail : loanDetails) {
+            String resultObject = gson.toJson(detail);
             JsonObject reportObject = JsonParser.parseString(resultObject).getAsJsonObject();
             JsonObject type = reportObject.getAsJsonObject("type");
             final Integer transTypeId = type.get("id").getAsInt();
@@ -868,7 +883,7 @@ public class ClientLoanIntegrationTest {
                 map.put("id", transId.toString());
                 map.put("loanId", loanID.toString());
                 final String putBody = gson.toJson(map);
-                chargeId = this.loanTransactionHelper.undoWaiveChargesForLoanReturnResourceId(loanID, transId, putBody);
+                chargeId = LOAN_TRANSACTION_HELPER.undoWaiveChargesForLoanReturnResourceId(loanID, transId, putBody);
                 break;
             }
         }
@@ -876,8 +891,7 @@ public class ClientLoanIntegrationTest {
         Assertions.assertEquals(waivedChargeId, chargeId);
 
         // Validate the undo process
-        ArrayList<HashMap> loanTransactionDetails = this.loanTransactionHelper.getLoanTransactionDetails(this.requestSpec,
-                this.responseSpec, loanID);
+        ArrayList<HashMap> loanTransactionDetails = LOAN_TRANSACTION_HELPER.getLoanTransactionDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         Assertions.assertNotNull(loanTransactionDetails, "Empty Loan Transaction Details");
         for (int i = 0; i < loanTransactionDetails.size(); i++) {
             String resultObject = gson.toJson(loanTransactionDetails.get(i));
@@ -886,7 +900,7 @@ public class ClientLoanIntegrationTest {
             final Integer id = reportObject.get("id").getAsInt();
 
             if (transId.compareTo(id) == 0) {
-                final HashMap chargeDetails = this.loanTransactionHelper.getLoanCharge(loanID, waivedChargeId);
+                final HashMap chargeDetails = LOAN_TRANSACTION_HELPER.getLoanCharge(loanID, waivedChargeId);
                 String resultChargeObject = gson.toJson(chargeDetails);
                 JsonObject reportChargeObject = JsonParser.parseString(resultChargeObject).getAsJsonObject();
                 BigDecimal waiveAmount = reportChargeObject.get("amountWaived").getAsBigDecimal();
@@ -900,10 +914,10 @@ public class ClientLoanIntegrationTest {
         }
 
         // Re-waive charge
-        this.loanTransactionHelper.waiveChargesForLoan(loanID, waivedChargeId,
+        LOAN_TRANSACTION_HELPER.waiveChargesForLoan(loanID, waivedChargeId,
                 LoanTransactionHelper.getWaiveChargeJSON(String.valueOf(waivePeriodnum)));
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         loanSchedule.remove(0);
         for (HashMap installment : loanSchedule) {
             validateNumberForEqualExcludePrecission("150", String.valueOf(installment.get("feeChargesDue")));
@@ -920,10 +934,10 @@ public class ClientLoanIntegrationTest {
         validateChargeExcludePrecission(flat, loanCharges, "50.0", "150", "0.0", "50.0");
 
         Integer payPeriodnum = 2;
-        this.loanTransactionHelper.payChargesForLoan(loanID, (Integer) getloanCharge(flatAccTransfer, loanCharges).get("id"),
+        LOAN_TRANSACTION_HELPER.payChargesForLoan(loanID, (Integer) getloanCharge(flatAccTransfer, loanCharges).get("id"),
                 LoanTransactionHelper.getPayChargeJSON(SavingsAccountHelper.TRANSACTION_DATE, String.valueOf(payPeriodnum)));
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         loanSchedule.remove(0);
         for (HashMap installment : loanSchedule) {
             validateNumberForEqualExcludePrecission("150", String.valueOf(installment.get("feeChargesDue")));
@@ -943,22 +957,22 @@ public class ClientLoanIntegrationTest {
         validateChargeExcludePrecission(flat, loanCharges, "50.0", "150", "0.0", "50.0");
 
         // Loan Charges with US Locale using the amount as a number in the JSON body
-        this.loanTransactionHelper.addChargesForLoan(loanID,
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID,
                 LoanTransactionHelper.getInstallmentChargesForLoanAsJSON(String.valueOf(flat), 50.05, Locale.US));
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
 
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         loanSchedule.remove(0);
         for (HashMap installment : loanSchedule) {
             validateNumberForEqualExcludePrecission("200.05", String.valueOf(installment.get("feeChargesDue")));
         }
 
         // Loan Charges with other Locale using comma (,) as decimal delimiter
-        this.loanTransactionHelper.addChargesForLoan(loanID,
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID,
                 LoanTransactionHelper.getInstallmentChargesForLoanAsJSON(String.valueOf(flat), "50,05", Locale.GERMAN));
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
 
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         loanSchedule.remove(0);
         for (HashMap installment : loanSchedule) {
             validateNumberForEqualExcludePrecission("250.10", String.valueOf(installment.get("feeChargesDue")));
@@ -966,11 +980,11 @@ public class ClientLoanIntegrationTest {
 
         // Loan Charges with German Locale (where the comma is the decimal delimiter) using the amount as a number in
         // the JSON body
-        this.loanTransactionHelper.addChargesForLoan(loanID,
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID,
                 LoanTransactionHelper.getInstallmentChargesForLoanAsJSON(String.valueOf(flat), 50.05, Locale.GERMAN));
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
 
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         loanSchedule.remove(0);
         for (HashMap installment : loanSchedule) {
             validateNumberForEqualExcludePrecission("300.15", String.valueOf(installment.get("feeChargesDue")));
@@ -979,20 +993,17 @@ public class ClientLoanIntegrationTest {
 
     @Test
     public void testLoanCharges_DISBURSEMENT_TO_SAVINGS() {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-        SavingsAccountHelper savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec);
 
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
         final Integer loanProductID = createLoanProduct(false, NONE);
 
-        final Integer savingsId = SavingsAccountHelper.openSavingsAccount(this.requestSpec, this.responseSpec, clientID,
-                MINIMUM_OPENING_BALANCE);
+        final Integer savingsId = SavingsAccountHelper.openSavingsAccount(REQUEST_SPEC, RESPONSE_SPEC, clientID, MINIMUM_OPENING_BALANCE);
 
         List<HashMap> collaterals = new ArrayList<>();
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
         Assertions.assertNotNull(collateralId);
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
                 String.valueOf(clientID), collateralId);
         Assertions.assertNotNull(clientCollateralId);
         addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
@@ -1000,34 +1011,34 @@ public class ClientLoanIntegrationTest {
         final Integer loanID = applyForLoanApplication(clientID, loanProductID, null, savingsId.toString(), "12,000.00", collaterals);
         Assertions.assertNotNull(loanID);
 
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
 
         LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan("20 September 2011", loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("20 September 2011", loanID);
         LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
         LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
 
-        HashMap summary = savingsAccountHelper.getSavingsSummary(savingsId);
-        Float balance = Float.parseFloat(MINIMUM_OPENING_BALANCE);
+        HashMap summary = SAVINGS_ACCOUNT_HELPER.getSavingsSummary(savingsId);
+        float balance = Float.parseFloat(MINIMUM_OPENING_BALANCE);
         assertEquals(balance, summary.get("accountBalance"), "Verifying opening Balance");
 
         // DISBURSE
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanToSavings(SavingsAccountHelper.TRANSACTION_DATE, loanID,
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanToSavings(SavingsAccountHelper.TRANSACTION_DATE, loanID,
                 JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
         LOG.info("DISBURSE {}", loanStatusHashMap.toString());
         LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
 
-        summary = savingsAccountHelper.getSavingsSummary(savingsId);
+        summary = SAVINGS_ACCOUNT_HELPER.getSavingsSummary(savingsId);
         balance = Float.parseFloat(MINIMUM_OPENING_BALANCE) + Float.parseFloat("12000");
         assertEquals(balance, summary.get("accountBalance"), "Verifying opening Balance");
 
-        loanStatusHashMap = this.loanTransactionHelper.undoDisbursal(loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.undoDisbursal(loanID);
         LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
         LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
 
-        summary = savingsAccountHelper.getSavingsSummary(savingsId);
+        summary = SAVINGS_ACCOUNT_HELPER.getSavingsSummary(savingsId);
         balance = Float.parseFloat(MINIMUM_OPENING_BALANCE);
         assertEquals(balance, summary.get("accountBalance"), "Verifying opening Balance");
 
@@ -1035,9 +1046,8 @@ public class ClientLoanIntegrationTest {
 
     @Test
     public void testLoanCharges_DISBURSEMENT_WITH_TRANCHES() {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
         final Integer loanProductID = createLoanProduct(true, NONE);
 
         List<HashMap> tranches = new ArrayList<>();
@@ -1046,9 +1056,9 @@ public class ClientLoanIntegrationTest {
 
         List<HashMap> collaterals = new ArrayList<>();
 
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
         Assertions.assertNotNull(collateralId);
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
                 clientID.toString(), collateralId);
         Assertions.assertNotNull(clientCollateralId);
         addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
@@ -1056,28 +1066,28 @@ public class ClientLoanIntegrationTest {
         final Integer loanID = applyForLoanApplicationWithTranches(clientID, loanProductID, null, null, "45,000.00", tranches, collaterals);
         Assertions.assertNotNull(loanID);
 
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
 
         LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan("01 March 2014", loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("01 March 2014", loanID);
         LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
         LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
 
         // DISBURSE first Tranche
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("20 March 2014", loanID,
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("20 March 2014", loanID,
                 JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
         LOG.info("DISBURSE {}", loanStatusHashMap);
         LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
 
         // DISBURSE Second Tranche
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("23 April 2014", loanID,
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("23 April 2014", loanID,
                 JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
         LOG.info("DISBURSE {}", loanStatusHashMap.toString());
         LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
 
-        loanStatusHashMap = this.loanTransactionHelper.undoDisbursal(loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.undoDisbursal(loanID);
         LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
         LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
 
@@ -1085,15 +1095,11 @@ public class ClientLoanIntegrationTest {
 
     @Test
     public void testLoanCharges_DISBURSEMENT_TO_SAVINGS_WITH_TRANCHES() {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-        SavingsAccountHelper savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec);
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
         final Integer loanProductID = createLoanProduct(true, NONE);
 
-        final Integer savingsId = SavingsAccountHelper.openSavingsAccount(this.requestSpec, this.responseSpec, clientID,
-                MINIMUM_OPENING_BALANCE);
+        final Integer savingsId = SavingsAccountHelper.openSavingsAccount(REQUEST_SPEC, RESPONSE_SPEC, clientID, MINIMUM_OPENING_BALANCE);
 
         List<HashMap> tranches = new ArrayList<>();
         tranches.add(createTrancheDetail("01 March 2014", "25000"));
@@ -1101,9 +1107,9 @@ public class ClientLoanIntegrationTest {
 
         List<HashMap> collaterals = new ArrayList<>();
 
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
         Assertions.assertNotNull(collateralId);
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
                 String.valueOf(clientID), collateralId);
         Assertions.assertNotNull(clientCollateralId);
         addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
@@ -1112,49 +1118,5913 @@ public class ClientLoanIntegrationTest {
                 tranches, collaterals);
         Assertions.assertNotNull(loanID);
 
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
 
         LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan("01 March 2014", loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("01 March 2014", loanID);
         LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
         LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
 
-        HashMap summary = savingsAccountHelper.getSavingsSummary(savingsId);
-        Float balance = Float.parseFloat(MINIMUM_OPENING_BALANCE);
+        HashMap summary = SAVINGS_ACCOUNT_HELPER.getSavingsSummary(savingsId);
+        float balance = Float.parseFloat(MINIMUM_OPENING_BALANCE);
         assertEquals(balance, summary.get("accountBalance"), "Verifying opening Balance");
 
         // DISBURSE first Tranche
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanToSavings("01 March 2014", loanID,
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanToSavings("01 March 2014", loanID,
                 JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
         LOG.info("DISBURSE {}", loanStatusHashMap.toString());
         LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
 
-        summary = savingsAccountHelper.getSavingsSummary(savingsId);
+        summary = SAVINGS_ACCOUNT_HELPER.getSavingsSummary(savingsId);
         balance = Float.parseFloat(MINIMUM_OPENING_BALANCE) + Float.parseFloat("25000");
         assertEquals(balance, summary.get("accountBalance"), "Verifying opening Balance");
 
         // DISBURSE Second Tranche
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanToSavings("23 April 2014", loanID,
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanToSavings("23 April 2014", loanID,
                 JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
         LOG.info("DISBURSE {}", loanStatusHashMap.toString());
         LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
 
-        summary = savingsAccountHelper.getSavingsSummary(savingsId);
+        summary = SAVINGS_ACCOUNT_HELPER.getSavingsSummary(savingsId);
         balance = Float.parseFloat(MINIMUM_OPENING_BALANCE) + Float.parseFloat("25000") + Float.parseFloat("20000");
         assertEquals(balance, summary.get("accountBalance"), "Verifying opening Balance");
 
-        loanStatusHashMap = this.loanTransactionHelper.undoDisbursal(loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.undoDisbursal(loanID);
         LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
         LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
 
-        summary = savingsAccountHelper.getSavingsSummary(savingsId);
+        summary = SAVINGS_ACCOUNT_HELPER.getSavingsSummary(savingsId);
         balance = Float.parseFloat(MINIMUM_OPENING_BALANCE);
         assertEquals(balance, summary.get("accountBalance"), "Verifying opening Balance");
 
     }
 
+    /***
+     * Test case for checking CashBasedAccounting functionality adding charges with calculation type flat
+     */
+    @Test
+    public void loanWithFlatCahargesAndCashBasedAccountingEnabled() {
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+
+        // Add charges with payment mode regular
+        List<HashMap> charges = new ArrayList<>();
+        Integer flatDisbursement = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC, ChargesHelper.getLoanDisbursementJSON());
+        addCharges(charges, flatDisbursement, "100", null);
+        Integer flatSpecifiedDueDate = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "100", false));
+        addCharges(charges, flatSpecifiedDueDate, "100", "29 September 2011");
+        Integer flatInstallmentFee = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "50", false));
+        addCharges(charges, flatInstallmentFee, "50", null);
+
+        final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
+        final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
+        final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
+        final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
+
+        List<HashMap> collaterals = new ArrayList<>();
+
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
+
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
+                String.valueOf(clientID), collateralId);
+        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
+
+        final Integer loanProductID = createLoanProduct(false, CASH_BASED, assetAccount, incomeAccount, expenseAccount, overpaymentAccount);
+
+        final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges, null, "12,000.00", collaterals);
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        verifyLoanRepaymentSchedule(loanSchedule);
+
+        List<HashMap> loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(flatDisbursement, loanCharges, "100", "100.00", "0.0", "0.0");
+        validateCharge(flatSpecifiedDueDate, loanCharges, "100", "100.00", "0.0", "0.0");
+        validateCharge(flatInstallmentFee, loanCharges, "50", "200.00", "0.0", "0.0");
+
+        // check for disbursement fee
+        HashMap disbursementDetail = loanSchedule.get(0);
+        validateNumberForEqual("100.00", String.valueOf(disbursementDetail.get("feeChargesDue")));
+
+        // check for charge at specified date and installment fee
+        HashMap firstInstallment = loanSchedule.get(1);
+        validateNumberForEqual("150.00", String.valueOf(firstInstallment.get("feeChargesDue")));
+
+        // check for installment fee
+        HashMap secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("50.00", String.valueOf(secondInstallment.get("feeChargesDue")));
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("20 September 2011", loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(Float.parseFloat("100.00"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.DEBIT) };
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 September 2011", assetAccountInitialEntry);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 September 2011",
+                new JournalEntry(Float.parseFloat("100.00"), JournalEntry.TransactionType.CREDIT));
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(flatDisbursement, loanCharges, "100", "0.00", "100.0", "0.0");
+
+        LOG.info("-------------Make repayment 1-----------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 October 2011", Float.parseFloat("3301.49"), loanID);
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(flatDisbursement, loanCharges, "100", "0.00", "100.0", "0.0");
+        validateCharge(flatSpecifiedDueDate, loanCharges, "100", "0.00", "100.0", "0.0");
+        validateCharge(flatInstallmentFee, loanCharges, "50", "150.00", "50.0", "0.0");
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
+                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("2911.49"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 October 2011",
+                new JournalEntry(Float.parseFloat("150.00"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("240.00"), JournalEntry.TransactionType.CREDIT));
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper
+                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatSpecifiedDueDate), "29 October 2011", "100"));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("150.00", String.valueOf(secondInstallment.get("feeChargesDue")));
+        LOAN_TRANSACTION_HELPER.waiveChargesForLoan(loanID, (Integer) getloanCharge(flatInstallmentFee, loanCharges).get("id"),
+                LoanTransactionHelper.getWaiveChargeJSON(String.valueOf(2)));
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(flatInstallmentFee, loanCharges, "50", "100.00", "50.0", "50.0");
+
+        LOG.info("----------Make repayment 2------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 November 2011", Float.parseFloat("3251.49"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("3251.49"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("2969.72"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("100.00"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("181.77"), JournalEntry.TransactionType.CREDIT));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("0", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("--------------Waive interest---------------");
+        LOAN_TRANSACTION_HELPER.waiveInterest("20 December 2011", String.valueOf(61.79), loanID);
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap thirdInstallment = loanSchedule.get(3);
+        validateNumberForEqual("60.59", String.valueOf(thirdInstallment.get("interestOutstanding")));
+
+        Integer flatPenaltySpecifiedDueDate = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "100", true));
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper
+                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatPenaltySpecifiedDueDate), "29 September 2011", "100"));
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(flatPenaltySpecifiedDueDate, loanCharges, "100", "0.00", "100.0", "0.0");
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("100", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
+                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("2811.49"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 October 2011",
+                new JournalEntry(Float.parseFloat("100.00"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("150.00"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("240"), JournalEntry.TransactionType.CREDIT));
+
+        LOG.info("----------Make repayment 3 advance------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 November 2011", Float.parseFloat("3301.49"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3129.11"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("50.00"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("122.38"), JournalEntry.TransactionType.CREDIT));
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper
+                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatPenaltySpecifiedDueDate), "10 January 2012", "100"));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap fourthInstallment = loanSchedule.get(4);
+        validateNumberForEqual("100", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
+        validateNumberForEqual("3239.68", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("----------Pay applied penalty ------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 January 2012", Float.parseFloat("100"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("100"), JournalEntry.TransactionType.DEBIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("100.00"), JournalEntry.TransactionType.CREDIT));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        fourthInstallment = loanSchedule.get(4);
+        validateNumberForEqual("0", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
+        validateNumberForEqual("3139.68", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("----------Make repayment 4 ------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 January 2012", Float.parseFloat("3139.68"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("3139.68"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3089.68"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("50.00"), JournalEntry.TransactionType.CREDIT));
+    }
+
+    /***
+     * Test case for checking CashBasedAccounting functionality adding charges with calculation type percentage of
+     * amount
+     */
+    @Test
+    public void loanWithCahargesOfTypeAmountPercentageAndCashBasedAccountingEnabled() {
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+
+        // Add charges with payment mode regular
+        List<HashMap> charges = new ArrayList<>();
+        Integer percentageDisbursementCharge = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanDisbursementJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1"));
+        addCharges(charges, percentageDisbursementCharge, "1", null);
+
+        Integer percentageSpecifiedDueDateCharge = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", false));
+        addCharges(charges, percentageSpecifiedDueDateCharge, "1", "29 September 2011");
+
+        Integer percentageInstallmentFee = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", false));
+        addCharges(charges, percentageInstallmentFee, "1", "29 September 2011");
+
+        final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
+        final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
+        final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
+        final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
+
+        List<HashMap> collaterals = new ArrayList<>();
+
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
+        Assertions.assertNotNull(collateralId);
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
+                clientID.toString(), collateralId);
+        Assertions.assertNotNull(clientCollateralId);
+        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
+
+        final Integer loanProductID = createLoanProduct(false, CASH_BASED, assetAccount, incomeAccount, expenseAccount, overpaymentAccount);
+        final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges, null, "12,000.00", collaterals);
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        verifyLoanRepaymentSchedule(loanSchedule);
+
+        List<HashMap> loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(percentageDisbursementCharge, loanCharges, "1", "120.00", "0.0", "0.0");
+        validateCharge(percentageSpecifiedDueDateCharge, loanCharges, "1", "120.00", "0.0", "0.0");
+        validateCharge(percentageInstallmentFee, loanCharges, "1", "120.00", "0.0", "0.0");
+
+        // check for disbursement fee
+        HashMap disbursementDetail = loanSchedule.get(0);
+        validateNumberForEqual("120.00", String.valueOf(disbursementDetail.get("feeChargesDue")));
+
+        // check for charge at specified date and installment fee
+        HashMap firstInstallment = loanSchedule.get(1);
+        validateNumberForEqual("149.11", String.valueOf(firstInstallment.get("feeChargesDue")));
+
+        // check for installment fee
+        HashMap secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("29.70", String.valueOf(secondInstallment.get("feeChargesDue")));
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("20 September 2011", loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.DEBIT) };
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 September 2011", assetAccountInitialEntry);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 September 2011",
+                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.CREDIT));
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(percentageDisbursementCharge, loanCharges, "1", "0.0", "120.00", "0.0");
+
+        LOG.info("-------------Make repayment 1-----------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 October 2011", Float.parseFloat("3300.60"), loanID);
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(percentageDisbursementCharge, loanCharges, "1", "0.00", "120.00", "0.0");
+        validateCharge(percentageSpecifiedDueDateCharge, loanCharges, "1", "0.00", "120.0", "0.0");
+        validateCharge(percentageInstallmentFee, loanCharges, "1", "90.89", "29.11", "0.0");
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
+                new JournalEntry(Float.parseFloat("3300.60"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("2911.49"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 October 2011",
+                new JournalEntry(Float.parseFloat("149.11"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("240.00"), JournalEntry.TransactionType.CREDIT));
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper
+                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(percentageSpecifiedDueDateCharge), "29 October 2011", "1"));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("149.70", String.valueOf(secondInstallment.get("feeChargesDue")));
+        LOAN_TRANSACTION_HELPER.waiveChargesForLoan(loanID, (Integer) getloanCharge(percentageInstallmentFee, loanCharges).get("id"),
+                LoanTransactionHelper.getWaiveChargeJSON(String.valueOf(2)));
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(percentageInstallmentFee, loanCharges, "1", "61.19", "29.11", "29.70");
+
+        LOG.info("----------Make repayment 2------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 November 2011", Float.parseFloat("3271.49"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("3271.49"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("2969.72"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("181.77"), JournalEntry.TransactionType.CREDIT));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("0", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("--------------Waive interest---------------");
+        LOAN_TRANSACTION_HELPER.waiveInterest("20 December 2011", String.valueOf(61.79), loanID);
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap thirdInstallment = loanSchedule.get(3);
+        validateNumberForEqual("60.59", String.valueOf(thirdInstallment.get("interestOutstanding")));
+
+        Integer percentagePenaltySpecifiedDueDate = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", true));
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper
+                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(percentagePenaltySpecifiedDueDate), "29 September 2011", "1"));
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(percentagePenaltySpecifiedDueDate, loanCharges, "1", "0.00", "120.0", "0.0");
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("120", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
+                new JournalEntry(Float.parseFloat("3300.60"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("2791.49"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 October 2011",
+                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("149.11"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("240"), JournalEntry.TransactionType.CREDIT));
+
+        LOG.info("----------Make repayment 3 advance------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 November 2011", Float.parseFloat("3301.78"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("3301.78"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3149.11"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("30.29"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("122.38"), JournalEntry.TransactionType.CREDIT));
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper
+                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(percentagePenaltySpecifiedDueDate), "10 January 2012", "1"));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap fourthInstallment = loanSchedule.get(4);
+        validateNumberForEqual("120", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
+        validateNumberForEqual("3240.58", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("----------Pay applied penalty ------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 January 2012", Float.parseFloat("120"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("120"), JournalEntry.TransactionType.DEBIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.CREDIT));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        fourthInstallment = loanSchedule.get(4);
+        validateNumberForEqual("0", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
+        validateNumberForEqual("3120.58", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("----------Make repayment 4 ------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 January 2012", Float.parseFloat("3120.58"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("3120.58"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3089.68"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("30.90"), JournalEntry.TransactionType.CREDIT));
+    }
+
+    /***
+     * Test case for checking CashBasedAccounting functionality adding charges with calculation type percentage of
+     * amount plus interest
+     */
+    @Test
+    public void loanWithCahargesOfTypeAmountPlusInterestPercentageAndCashBasedAccountingEnabled() {
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+
+        // Add charges with payment mode regular
+        List<HashMap> charges = new ArrayList<>();
+        Integer amountPlusInterestPercentageDisbursementCharge = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanDisbursementJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT_AND_INTEREST, "1"));
+        addCharges(charges, amountPlusInterestPercentageDisbursementCharge, "1", null);
+
+        Integer amountPlusInterestPercentageSpecifiedDueDateCharge = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC, ChargesHelper
+                .getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT_AND_INTEREST, "1", false));
+        addCharges(charges, amountPlusInterestPercentageSpecifiedDueDateCharge, "1", "29 September 2011");
+
+        Integer amountPlusInterestPercentageInstallmentFee = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT_AND_INTEREST, "1", false));
+        addCharges(charges, amountPlusInterestPercentageInstallmentFee, "1", "29 September 2011");
+
+        final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
+        final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
+        final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
+        final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
+
+        List<HashMap> collaterals = new ArrayList<>();
+
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
+
+        Assertions.assertNotNull(collateralId);
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
+                clientID.toString(), collateralId);
+        Assertions.assertNotNull(collateralId);
+        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
+
+        final Integer loanProductID = createLoanProduct(false, CASH_BASED, assetAccount, incomeAccount, expenseAccount, overpaymentAccount);
+        final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges, null, "12,000.00", collaterals);
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        verifyLoanRepaymentSchedule(loanSchedule);
+
+        List<HashMap> loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(amountPlusInterestPercentageDisbursementCharge, loanCharges, "1", "126.06", "0.0", "0.0");
+        validateCharge(amountPlusInterestPercentageSpecifiedDueDateCharge, loanCharges, "1", "126.06", "0.0", "0.0");
+        validateCharge(amountPlusInterestPercentageInstallmentFee, loanCharges, "1", "126.04", "0.0", "0.0");
+
+        // check for disbursement fee
+        HashMap disbursementDetail = loanSchedule.get(0);
+        validateNumberForEqual("126.06", String.valueOf(disbursementDetail.get("feeChargesDue")));
+
+        // check for charge at specified date and installment fee
+        HashMap firstInstallment = loanSchedule.get(1);
+        validateNumberForEqual("157.57", String.valueOf(firstInstallment.get("feeChargesDue")));
+
+        // check for installment fee
+        HashMap secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("31.51", String.valueOf(secondInstallment.get("feeChargesDue")));
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("20 September 2011", loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(Float.parseFloat("126.06"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.DEBIT) };
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 September 2011", assetAccountInitialEntry);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 September 2011",
+                new JournalEntry(Float.parseFloat("126.06"), JournalEntry.TransactionType.CREDIT));
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(amountPlusInterestPercentageDisbursementCharge, loanCharges, "1", "0.0", "126.06", "0.0");
+
+        LOG.info("-------------Make repayment 1-----------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 October 2011", Float.parseFloat("3309.06"), loanID);
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(amountPlusInterestPercentageDisbursementCharge, loanCharges, "1", "0.00", "126.06", "0.0");
+        validateCharge(amountPlusInterestPercentageSpecifiedDueDateCharge, loanCharges, "1", "0.00", "126.06", "0.0");
+        validateCharge(amountPlusInterestPercentageInstallmentFee, loanCharges, "1", "94.53", "31.51", "0.0");
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
+                new JournalEntry(Float.parseFloat("3309.06"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("2911.49"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 October 2011",
+                new JournalEntry(Float.parseFloat("157.57"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("240.00"), JournalEntry.TransactionType.CREDIT));
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(
+                String.valueOf(amountPlusInterestPercentageSpecifiedDueDateCharge), "29 October 2011", "1"));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("157.57", String.valueOf(secondInstallment.get("feeChargesDue")));
+        LOAN_TRANSACTION_HELPER.waiveChargesForLoan(loanID,
+                (Integer) getloanCharge(amountPlusInterestPercentageInstallmentFee, loanCharges).get("id"),
+                LoanTransactionHelper.getWaiveChargeJSON(String.valueOf(2)));
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(amountPlusInterestPercentageInstallmentFee, loanCharges, "1", "63.02", "31.51", "31.51");
+
+        LOG.info("----------Make repayment 2------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 November 2011", Float.parseFloat("3277.55"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("3277.55"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("2969.72"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("126.06"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("181.77"), JournalEntry.TransactionType.CREDIT));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("0", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("--------------Waive interest---------------");
+        LOAN_TRANSACTION_HELPER.waiveInterest("20 December 2011", String.valueOf(61.79), loanID);
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap thirdInstallment = loanSchedule.get(3);
+        validateNumberForEqual("60.59", String.valueOf(thirdInstallment.get("interestOutstanding")));
+
+        Integer amountPlusInterestPercentagePenaltySpecifiedDueDate = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", true));
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(
+                String.valueOf(amountPlusInterestPercentagePenaltySpecifiedDueDate), "29 September 2011", "1"));
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(amountPlusInterestPercentagePenaltySpecifiedDueDate, loanCharges, "1", "0.0", "120.0", "0.0");
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("120", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
+                new JournalEntry(Float.parseFloat("3309.06"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("2791.49"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 October 2011",
+                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("157.57"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("240"), JournalEntry.TransactionType.CREDIT));
+
+        LOG.info("----------Make repayment 3 advance------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 November 2011", Float.parseFloat("3303"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("3303"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3149.11"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("31.51"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("122.38"), JournalEntry.TransactionType.CREDIT));
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(
+                String.valueOf(amountPlusInterestPercentagePenaltySpecifiedDueDate), "10 January 2012", "1"));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap fourthInstallment = loanSchedule.get(4);
+        validateNumberForEqual("120", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
+        validateNumberForEqual("3241.19", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("----------Pay applied penalty ------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 January 2012", Float.parseFloat("120"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("120"), JournalEntry.TransactionType.DEBIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.CREDIT));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        fourthInstallment = loanSchedule.get(4);
+        validateNumberForEqual("0", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
+        validateNumberForEqual("3121.19", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("----------Make repayment 4 ------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 January 2012", Float.parseFloat("3121.19"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("3121.19"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3089.68"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("31.51"), JournalEntry.TransactionType.CREDIT));
+    }
+
+    /***
+     * Test case for checking AccuralUpfrontAccounting functionality adding charges with calculation type flat
+     */
+    @Test
+    public void loanWithFlatCahargesAndUpfrontAccrualAccountingEnabled() {
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+
+        // Add charges with payment mode regular
+        List<HashMap> charges = new ArrayList<>();
+        Integer flatDisbursement = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC, ChargesHelper.getLoanDisbursementJSON());
+        addCharges(charges, flatDisbursement, "100", null);
+        Integer flatSpecifiedDueDate = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "100", false));
+
+        Integer flatInstallmentFee = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "50", false));
+        addCharges(charges, flatInstallmentFee, "50", null);
+
+        final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
+        final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
+        final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
+        final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
+
+        List<HashMap> collaterals = new ArrayList<>();
+
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
+        Assertions.assertNotNull(collateralId);
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
+                String.valueOf(clientID), collateralId);
+        Assertions.assertNotNull(clientCollateralId);
+        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
+
+        final Integer loanProductID = createLoanProduct(false, ACCRUAL_UPFRONT, assetAccount, incomeAccount, expenseAccount,
+                overpaymentAccount);
+        final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges, null, "12,000.00", collaterals);
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        verifyLoanRepaymentSchedule(loanSchedule);
+
+        List<HashMap> loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(flatDisbursement, loanCharges, "100", "100.00", "0.0", "0.0");
+        validateCharge(flatInstallmentFee, loanCharges, "50", "200.00", "0.0", "0.0");
+
+        // check for disbursement fee
+        HashMap disbursementDetail = loanSchedule.get(0);
+        validateNumberForEqual("100.00", String.valueOf(disbursementDetail.get("feeChargesDue")));
+
+        // check for charge at specified date and installment fee
+        HashMap firstInstallment = loanSchedule.get(1);
+        validateNumberForEqual("50.00", String.valueOf(firstInstallment.get("feeChargesDue")));
+
+        // check for installment fee
+        HashMap secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("50.00", String.valueOf(secondInstallment.get("feeChargesDue")));
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("20 September 2011", loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(Float.parseFloat("605.94"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("100.00"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("200.00"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.DEBIT) };
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 September 2011", assetAccountInitialEntry);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 September 2011",
+                new JournalEntry(Float.parseFloat("605.94"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("100.00"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("200.00"), JournalEntry.TransactionType.CREDIT));
+
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper
+                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatSpecifiedDueDate), "29 September 2011", "100"));
+
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(flatDisbursement, loanCharges, "100", "0.00", "100.0", "0.0");
+        validateCharge(flatSpecifiedDueDate, loanCharges, "100", "100.00", "0.0", "0.0");
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "29 September 2011",
+                new JournalEntry(Float.parseFloat("100.00"), JournalEntry.TransactionType.DEBIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "29 September 2011",
+                new JournalEntry(Float.parseFloat("100.00"), JournalEntry.TransactionType.CREDIT));
+
+        LOG.info("-------------Make repayment 1-----------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 October 2011", Float.parseFloat("3301.49"), loanID);
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(flatDisbursement, loanCharges, "100", "0.00", "100.0", "0.0");
+        validateCharge(flatSpecifiedDueDate, loanCharges, "100", "0.00", "100.0", "0.0");
+        validateCharge(flatInstallmentFee, loanCharges, "50", "150.00", "50.0", "0.0");
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
+                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.CREDIT));
+
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper
+                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatSpecifiedDueDate), "29 October 2011", "100"));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("150.00", String.valueOf(secondInstallment.get("feeChargesDue")));
+        LOG.info("----------- Waive installment charge for 2nd installment ---------");
+        LOAN_TRANSACTION_HELPER.waiveChargesForLoan(loanID, (Integer) getloanCharge(flatInstallmentFee, loanCharges).get("id"),
+                LoanTransactionHelper.getWaiveChargeJSON(String.valueOf(2)));
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(flatInstallmentFee, loanCharges, "50", "100.00", "50.0", "50.0");
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("50.0"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForExpenseAccount(expenseAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("50.0"), JournalEntry.TransactionType.DEBIT));
+
+        LOG.info("----------Make repayment 2------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 November 2011", Float.parseFloat("3251.49"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("3251.49"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3251.49"), JournalEntry.TransactionType.CREDIT));
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("0", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("--------------Waive interest---------------");
+        LOAN_TRANSACTION_HELPER.waiveInterest("20 December 2011", String.valueOf(61.79), loanID);
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap thirdInstallment = loanSchedule.get(3);
+        validateNumberForEqual("60.59", String.valueOf(thirdInstallment.get("interestOutstanding")));
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 December 2011",
+                new JournalEntry(Float.parseFloat("61.79"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForExpenseAccount(expenseAccount, "20 December 2011",
+                new JournalEntry(Float.parseFloat("61.79"), JournalEntry.TransactionType.DEBIT));
+
+        Integer flatPenaltySpecifiedDueDate = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "100", true));
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper
+                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatPenaltySpecifiedDueDate), "29 September 2011", "100"));
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(flatPenaltySpecifiedDueDate, loanCharges, "100", "0.00", "100.0", "0.0");
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("100", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
+
+        // checking the journal entry as applied penalty has been collected
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
+                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.CREDIT));
+
+        LOG.info("----------Make repayment 3 advance------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 November 2011", Float.parseFloat("3301.49"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.CREDIT));
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper
+                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatPenaltySpecifiedDueDate), "10 January 2012", "100"));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap fourthInstallment = loanSchedule.get(4);
+        validateNumberForEqual("100", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
+        validateNumberForEqual("3239.68", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("----------Pay applied penalty ------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 January 2012", Float.parseFloat("100"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("100"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("100"), JournalEntry.TransactionType.CREDIT));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        fourthInstallment = loanSchedule.get(4);
+        validateNumberForEqual("0", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
+        validateNumberForEqual("3139.68", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("----------Make over payment for repayment 4 ------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 January 2012", Float.parseFloat("3220.60"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("3220.60"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3139.68"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForLiabilityAccount(overpaymentAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("80.92"), JournalEntry.TransactionType.CREDIT));
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.getLoanDetail(REQUEST_SPEC, RESPONSE_SPEC, loanID, "status");
+        LoanStatusChecker.verifyLoanAccountIsOverPaid(loanStatusHashMap);
+    }
+
+    /***
+     * Test case for checking AccuralUpfrontAccounting functionality adding charges with calculation type percentage of
+     * amount
+     */
+    @Test
+    public void loanWithCahargesAndUpfrontAccrualAccountingEnabled() {
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+
+        // Add charges with payment mode regular
+        List<HashMap> charges = new ArrayList<>();
+        Integer percentageDisbursementCharge = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanDisbursementJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1"));
+        addCharges(charges, percentageDisbursementCharge, "1", null);
+
+        Integer percentageSpecifiedDueDateCharge = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", false));
+        addCharges(charges, percentageSpecifiedDueDateCharge, "1", "29 September 2011");
+
+        Integer percentageInstallmentFee = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", false));
+        addCharges(charges, percentageInstallmentFee, "1", "29 September 2011");
+
+        final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
+        final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
+        final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
+        final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
+
+        List<HashMap> collaterals = new ArrayList<>();
+
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
+        Assertions.assertNotNull(collateralId);
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
+                String.valueOf(clientID), collateralId);
+        Assertions.assertNotNull(clientCollateralId);
+        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
+
+        final Integer loanProductID = createLoanProduct(false, ACCRUAL_UPFRONT, assetAccount, incomeAccount, expenseAccount,
+                overpaymentAccount);
+        final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges, null, "12,000.00", collaterals);
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        verifyLoanRepaymentSchedule(loanSchedule);
+
+        List<HashMap> loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(percentageDisbursementCharge, loanCharges, "1", "120.00", "0.0", "0.0");
+        validateCharge(percentageSpecifiedDueDateCharge, loanCharges, "1", "120.00", "0.0", "0.0");
+        validateCharge(percentageInstallmentFee, loanCharges, "1", "120.00", "0.0", "0.0");
+
+        // check for disbursement fee
+        HashMap disbursementDetail = loanSchedule.get(0);
+        validateNumberForEqual("120.00", String.valueOf(disbursementDetail.get("feeChargesDue")));
+
+        // check for charge at specified date and installment fee
+        HashMap firstInstallment = loanSchedule.get(1);
+        validateNumberForEqual("149.11", String.valueOf(firstInstallment.get("feeChargesDue")));
+
+        // check for installment fee
+        HashMap secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("29.70", String.valueOf(secondInstallment.get("feeChargesDue")));
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("20 September 2011", loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(Float.parseFloat("605.94"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.DEBIT) };
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 September 2011", assetAccountInitialEntry);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 September 2011",
+                new JournalEntry(Float.parseFloat("605.94"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.CREDIT));
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(percentageDisbursementCharge, loanCharges, "1", "0.0", "120.00", "0.0");
+
+        LOG.info("-------------Make repayment 1-----------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 October 2011", Float.parseFloat("3300.60"), loanID);
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(percentageDisbursementCharge, loanCharges, "1", "0.00", "120.00", "0.0");
+        validateCharge(percentageSpecifiedDueDateCharge, loanCharges, "1", "0.00", "120.0", "0.0");
+        validateCharge(percentageInstallmentFee, loanCharges, "1", "90.89", "29.11", "0.0");
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
+                new JournalEntry(Float.parseFloat("3300.60"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3300.60"), JournalEntry.TransactionType.CREDIT));
+
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper
+                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(percentageSpecifiedDueDateCharge), "29 October 2011", "1"));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("149.70", String.valueOf(secondInstallment.get("feeChargesDue")));
+        LOG.info("----------- Waive installment charge for 2nd installment ---------");
+        LOAN_TRANSACTION_HELPER.waiveChargesForLoan(loanID, (Integer) getloanCharge(percentageInstallmentFee, loanCharges).get("id"),
+                LoanTransactionHelper.getWaiveChargeJSON(String.valueOf(2)));
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(percentageInstallmentFee, loanCharges, "1", "61.19", "29.11", "29.70");
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("29.7"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForExpenseAccount(expenseAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("29.7"), JournalEntry.TransactionType.DEBIT));
+
+        LOG.info("----------Make repayment 2------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 November 2011", Float.parseFloat("3271.49"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("3271.49"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3271.49"), JournalEntry.TransactionType.CREDIT));
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("0", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("--------------Waive interest---------------");
+        LOAN_TRANSACTION_HELPER.waiveInterest("20 December 2011", String.valueOf(61.79), loanID);
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap thirdInstallment = loanSchedule.get(3);
+        validateNumberForEqual("60.59", String.valueOf(thirdInstallment.get("interestOutstanding")));
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 December 2011",
+                new JournalEntry(Float.parseFloat("61.79"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForExpenseAccount(expenseAccount, "20 December 2011",
+                new JournalEntry(Float.parseFloat("61.79"), JournalEntry.TransactionType.DEBIT));
+
+        Integer percentagePenaltySpecifiedDueDate = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", true));
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper
+                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(percentagePenaltySpecifiedDueDate), "29 September 2011", "1"));
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(percentagePenaltySpecifiedDueDate, loanCharges, "1", "0.00", "120.0", "0.0");
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("120", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
+
+        // checking the journal entry as applied penalty has been collected
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
+                new JournalEntry(Float.parseFloat("3300.60"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3300.60"), JournalEntry.TransactionType.CREDIT));
+
+        LOG.info("----------Make repayment 3 advance------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 November 2011", Float.parseFloat("3301.78"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("3301.78"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3301.78"), JournalEntry.TransactionType.CREDIT));
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper
+                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(percentagePenaltySpecifiedDueDate), "10 January 2012", "1"));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap fourthInstallment = loanSchedule.get(4);
+        validateNumberForEqual("120", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
+        validateNumberForEqual("3240.58", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("----------Pay applied penalty ------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 January 2012", Float.parseFloat("120"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("120"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("120"), JournalEntry.TransactionType.CREDIT));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        fourthInstallment = loanSchedule.get(4);
+        validateNumberForEqual("0", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
+        validateNumberForEqual("3120.58", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("----------Make over payment for repayment 4 ------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 January 2012", Float.parseFloat("3220.58"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("3220.58"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3120.58"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForLiabilityAccount(overpaymentAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("100.00"), JournalEntry.TransactionType.CREDIT));
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.getLoanDetail(REQUEST_SPEC, RESPONSE_SPEC, loanID, "status");
+        LoanStatusChecker.verifyLoanAccountIsOverPaid(loanStatusHashMap);
+    }
+
+    /***
+     * Test case for checking AccuralUpfrontAccounting functionality adding charges with calculation type percentage of
+     * amount plus interest
+     */
+    @Test
+    public void loanWithCahargesOfTypeAmountPlusInterestPercentageAndUpfrontAccrualAccountingEnabled() {
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+
+        // Add charges with payment mode regular
+        List<HashMap> charges = new ArrayList<>();
+        Integer amountPlusInterestPercentageDisbursementCharge = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanDisbursementJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT_AND_INTEREST, "1"));
+        addCharges(charges, amountPlusInterestPercentageDisbursementCharge, "1", null);
+
+        Integer amountPlusInterestPercentageSpecifiedDueDateCharge = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC, ChargesHelper
+                .getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT_AND_INTEREST, "1", false));
+
+        Integer amountPlusInterestPercentageInstallmentFee = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT_AND_INTEREST, "1", false));
+        addCharges(charges, amountPlusInterestPercentageInstallmentFee, "1", "29 September 2011");
+
+        final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
+        final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
+        final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
+        final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
+
+        List<HashMap> collaterals = new ArrayList<>();
+
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
+
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
+                String.valueOf(clientID), collateralId);
+        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
+
+        final Integer loanProductID = createLoanProduct(false, ACCRUAL_UPFRONT, assetAccount, incomeAccount, expenseAccount,
+                overpaymentAccount);
+        final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges, null, "12,000.00", collaterals);
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        verifyLoanRepaymentSchedule(loanSchedule);
+
+        List<HashMap> loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(amountPlusInterestPercentageDisbursementCharge, loanCharges, "1", "126.06", "0.0", "0.0");
+        validateCharge(amountPlusInterestPercentageInstallmentFee, loanCharges, "1", "126.04", "0.0", "0.0");
+
+        // check for disbursement fee
+        HashMap disbursementDetail = loanSchedule.get(0);
+        validateNumberForEqual("126.06", String.valueOf(disbursementDetail.get("feeChargesDue")));
+
+        // check for charge at specified date and installment fee
+        HashMap firstInstallment = loanSchedule.get(1);
+        validateNumberForEqual("31.51", String.valueOf(firstInstallment.get("feeChargesDue")));
+
+        // check for installment fee
+        HashMap secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("31.51", String.valueOf(secondInstallment.get("feeChargesDue")));
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("20 September 2011", loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(Float.parseFloat("605.94"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("126.06"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("126.04"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.DEBIT) };
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 September 2011", assetAccountInitialEntry);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 September 2011",
+                new JournalEntry(Float.parseFloat("605.94"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("126.06"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("126.04"), JournalEntry.TransactionType.CREDIT));
+
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(
+                String.valueOf(amountPlusInterestPercentageSpecifiedDueDateCharge), "29 September 2011", "1"));
+
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(amountPlusInterestPercentageDisbursementCharge, loanCharges, "1", "0.0", "126.06", "0.0");
+        validateCharge(amountPlusInterestPercentageSpecifiedDueDateCharge, loanCharges, "1", "126.06", "0.0", "0.0");
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "29 September 2011",
+                new JournalEntry(Float.parseFloat("126.06"), JournalEntry.TransactionType.DEBIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "29 September 2011",
+                new JournalEntry(Float.parseFloat("126.06"), JournalEntry.TransactionType.CREDIT));
+
+        LOG.info("-------------Make repayment 1-----------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 October 2011", Float.parseFloat("3309.06"), loanID);
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(amountPlusInterestPercentageDisbursementCharge, loanCharges, "1", "0.00", "126.06", "0.0");
+        validateCharge(amountPlusInterestPercentageSpecifiedDueDateCharge, loanCharges, "1", "0.00", "126.06", "0.0");
+        validateCharge(amountPlusInterestPercentageInstallmentFee, loanCharges, "1", "94.53", "31.51", "0.0");
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
+                new JournalEntry(Float.parseFloat("3309.06"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3309.06"), JournalEntry.TransactionType.CREDIT));
+
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(
+                String.valueOf(amountPlusInterestPercentageSpecifiedDueDateCharge), "29 October 2011", "1"));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("157.57", String.valueOf(secondInstallment.get("feeChargesDue")));
+        LOG.info("----------- Waive installment charge for 2nd installment ---------");
+        LOAN_TRANSACTION_HELPER.waiveChargesForLoan(loanID,
+                (Integer) getloanCharge(amountPlusInterestPercentageInstallmentFee, loanCharges).get("id"),
+                LoanTransactionHelper.getWaiveChargeJSON(String.valueOf(2)));
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(amountPlusInterestPercentageInstallmentFee, loanCharges, "1", "63.02", "31.51", "31.51");
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("31.51"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForExpenseAccount(expenseAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("31.51"), JournalEntry.TransactionType.DEBIT));
+
+        LOG.info("----------Make repayment 2------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 November 2011", Float.parseFloat("3277.55"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("3277.55"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3277.55"), JournalEntry.TransactionType.CREDIT));
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("0", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("--------------Waive interest---------------");
+        LOAN_TRANSACTION_HELPER.waiveInterest("20 December 2011", String.valueOf(61.79), loanID);
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap thirdInstallment = loanSchedule.get(3);
+        validateNumberForEqual("60.59", String.valueOf(thirdInstallment.get("interestOutstanding")));
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 December 2011",
+                new JournalEntry(Float.parseFloat("61.79"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForExpenseAccount(expenseAccount, "20 December 2011",
+                new JournalEntry(Float.parseFloat("61.79"), JournalEntry.TransactionType.DEBIT));
+
+        Integer amountPlusInterestPercentagePenaltySpecifiedDueDate = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", true));
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(
+                String.valueOf(amountPlusInterestPercentagePenaltySpecifiedDueDate), "29 September 2011", "1"));
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(amountPlusInterestPercentagePenaltySpecifiedDueDate, loanCharges, "1", "0.0", "120.0", "0.0");
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("120", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
+
+        // checking the journal entry as applied penalty has been collected
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
+                new JournalEntry(Float.parseFloat("3309.06"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3309.06"), JournalEntry.TransactionType.CREDIT));
+
+        LOG.info("----------Make repayment 3 advance------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 November 2011", Float.parseFloat("3303"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("3303"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3303"), JournalEntry.TransactionType.CREDIT));
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(
+                String.valueOf(amountPlusInterestPercentagePenaltySpecifiedDueDate), "10 January 2012", "1"));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap fourthInstallment = loanSchedule.get(4);
+        validateNumberForEqual("120", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
+        validateNumberForEqual("3241.19", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("----------Pay applied penalty ------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 January 2012", Float.parseFloat("120"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("120"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("120"), JournalEntry.TransactionType.CREDIT));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        fourthInstallment = loanSchedule.get(4);
+        validateNumberForEqual("0", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
+        validateNumberForEqual("3121.19", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("----------Make over payment for repayment 4 ------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 January 2012", Float.parseFloat("3221.61"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("3221.61"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3121.19"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForLiabilityAccount(overpaymentAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("100.42"), JournalEntry.TransactionType.CREDIT));
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.getLoanDetail(REQUEST_SPEC, RESPONSE_SPEC, loanID, "status");
+        LoanStatusChecker.verifyLoanAccountIsOverPaid(loanStatusHashMap);
+    }
+
+    /***
+     * Test case for checking AccuralPeriodicAccounting functionality adding charges with calculation type flat
+     */
+    @Test
+    public void loanWithFlatChargesAndPeriodicAccrualAccountingEnabled() throws InterruptedException {
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+
+        // Add charges with payment mode regular
+        List<HashMap> charges = new ArrayList<>();
+        Integer flatDisbursement = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC, ChargesHelper.getLoanDisbursementJSON());
+        addCharges(charges, flatDisbursement, "100", null);
+        Integer flatSpecifiedDueDate = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "100", false));
+        addCharges(charges, flatSpecifiedDueDate, "100", "29 September 2011");
+        Integer flatInstallmentFee = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "50", false));
+        addCharges(charges, flatInstallmentFee, "50", null);
+
+        final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
+        final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
+        final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
+        final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
+
+        List<HashMap> collaterals = new ArrayList<>();
+
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
+
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
+                String.valueOf(clientID), collateralId);
+        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
+
+        final Integer loanProductID = createLoanProduct(false, ACCRUAL_PERIODIC, assetAccount, incomeAccount, expenseAccount,
+                overpaymentAccount);
+        final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges, null, "12,000.00", collaterals);
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        verifyLoanRepaymentSchedule(loanSchedule);
+
+        List<HashMap> loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(flatDisbursement, loanCharges, "100", "100.00", "0.0", "0.0");
+        validateCharge(flatSpecifiedDueDate, loanCharges, "100", "100.00", "0.0", "0.0");
+        validateCharge(flatInstallmentFee, loanCharges, "50", "200.00", "0.0", "0.0");
+
+        // check for disbursement fee
+        HashMap disbursementDetail = loanSchedule.get(0);
+        validateNumberForEqual("100.00", String.valueOf(disbursementDetail.get("feeChargesDue")));
+
+        // check for charge at specified date and installment fee
+        HashMap firstInstallment = loanSchedule.get(1);
+        validateNumberForEqual("150.00", String.valueOf(firstInstallment.get("feeChargesDue")));
+
+        // check for installment fee
+        HashMap secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("50.00", String.valueOf(secondInstallment.get("feeChargesDue")));
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("20 September 2011", loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(Float.parseFloat("100.00"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.DEBIT) };
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 September 2011", assetAccountInitialEntry);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 September 2011",
+                new JournalEntry(Float.parseFloat("100.00"), JournalEntry.TransactionType.CREDIT));
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(flatDisbursement, loanCharges, "100", "0.00", "100.0", "0.0");
+
+        LOG.info("-------------Make repayment 1-----------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 October 2011", Float.parseFloat("3301.49"), loanID);
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(flatDisbursement, loanCharges, "100", "0.00", "100.0", "0.0");
+        validateCharge(flatSpecifiedDueDate, loanCharges, "100", "0.00", "100.0", "0.0");
+        validateCharge(flatInstallmentFee, loanCharges, "50", "150.00", "50.0", "0.0");
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
+                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.CREDIT));
+
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper
+                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatSpecifiedDueDate), "29 October 2011", "100"));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("150.00", String.valueOf(secondInstallment.get("feeChargesDue")));
+        LOG.info("----------- Waive installment charge for 2nd installment ---------");
+        LOAN_TRANSACTION_HELPER.waiveChargesForLoan(loanID, (Integer) getloanCharge(flatInstallmentFee, loanCharges).get("id"),
+                LoanTransactionHelper.getWaiveChargeJSON(String.valueOf(2)));
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(flatInstallmentFee, loanCharges, "50", "100.00", "50.0", "50.0");
+
+        /*
+         * JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount( assetAccount, "20 September 2011", new
+         * JournalEntry(Float.parseFloat("50.0"), JournalEntry.TransactionType.CREDIT));
+         * JOURNAL_ENTRY_HELPER.checkJournalEntryForExpenseAccount (expenseAccount, "20 September 2011", new
+         * JournalEntry(Float.parseFloat("50.0"), JournalEntry.TransactionType.DEBIT));
+         */
+        final String jobName = "Add Accrual Transactions";
+
+        SCHEDULER_JOB_HELPER.executeAndAwaitJob(jobName);
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        checkAccrualTransactions(loanSchedule, loanID);
+
+        LOG.info("----------Make repayment 2------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 November 2011", Float.parseFloat("3251.49"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("3251.49"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3251.49"), JournalEntry.TransactionType.CREDIT));
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("0", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("--------------Waive interest---------------");
+        LOAN_TRANSACTION_HELPER.waiveInterest("20 December 2011", String.valueOf(61.79), loanID);
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap thirdInstallment = loanSchedule.get(3);
+        validateNumberForEqual("60.59", String.valueOf(thirdInstallment.get("interestOutstanding")));
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 December 2011",
+                new JournalEntry(Float.parseFloat("61.79"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForExpenseAccount(expenseAccount, "20 December 2011",
+                new JournalEntry(Float.parseFloat("61.79"), JournalEntry.TransactionType.DEBIT));
+
+        Integer flatPenaltySpecifiedDueDate = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "100", true));
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper
+                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatPenaltySpecifiedDueDate), "29 September 2011", "100"));
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(flatPenaltySpecifiedDueDate, loanCharges, "100", "0.00", "100.0", "0.0");
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("100", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
+
+        // checking the journal entry as applied penalty has been collected
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
+                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.CREDIT));
+
+        LOG.info("----------Make repayment 3 advance------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 November 2011", Float.parseFloat("3301.49"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.CREDIT));
+
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper
+                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatPenaltySpecifiedDueDate), "10 January 2012", "100"));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap fourthInstallment = loanSchedule.get(4);
+        validateNumberForEqual("100", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
+        validateNumberForEqual("3239.68", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("----------Pay applied penalty ------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 January 2012", Float.parseFloat("100"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("100"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("100"), JournalEntry.TransactionType.CREDIT));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        fourthInstallment = loanSchedule.get(4);
+        validateNumberForEqual("0", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
+        validateNumberForEqual("3139.68", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("----------Make repayment 4 ------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 January 2012", Float.parseFloat("3139.68"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("3139.68"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3139.68"), JournalEntry.TransactionType.CREDIT));
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.getLoanDetail(REQUEST_SPEC, RESPONSE_SPEC, loanID, "status");
+        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
+    }
+
+    /**
+     * Test case for checking AccuralPeriodicAccounting functionality adding charges with calculation type percentage of
+     * amount
+     */
+    @Test
+    public void loanWithChargesOfTypeAmountPercentageAndPeriodicAccrualAccountingEnabled() throws InterruptedException {
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+
+        // Add charges with payment mode regular
+        List<HashMap> charges = new ArrayList<>();
+        Integer percentageDisbursementCharge = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanDisbursementJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1"));
+        addCharges(charges, percentageDisbursementCharge, "1", null);
+
+        Integer percentageSpecifiedDueDateCharge = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", false));
+        addCharges(charges, percentageSpecifiedDueDateCharge, "1", "29 September 2011");
+
+        Integer percentageInstallmentFee = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", false));
+        addCharges(charges, percentageInstallmentFee, "1", "29 September 2011");
+
+        final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
+        final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
+        final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
+        final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
+
+        List<HashMap> collaterals = new ArrayList<>();
+
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
+
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
+                String.valueOf(clientID), collateralId);
+        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
+
+        final Integer loanProductID = createLoanProduct(false, ACCRUAL_PERIODIC, assetAccount, incomeAccount, expenseAccount,
+                overpaymentAccount);
+        final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges, null, "12,000.00", collaterals);
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        verifyLoanRepaymentSchedule(loanSchedule);
+
+        List<HashMap> loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(percentageDisbursementCharge, loanCharges, "1", "120.00", "0.0", "0.0");
+        validateCharge(percentageSpecifiedDueDateCharge, loanCharges, "1", "120.00", "0.0", "0.0");
+        validateCharge(percentageInstallmentFee, loanCharges, "1", "120.00", "0.0", "0.0");
+
+        // check for disbursement fee
+        HashMap disbursementDetail = loanSchedule.get(0);
+        validateNumberForEqual("120.00", String.valueOf(disbursementDetail.get("feeChargesDue")));
+
+        // check for charge at specified date and installment fee
+        HashMap firstInstallment = loanSchedule.get(1);
+        validateNumberForEqual("149.11", String.valueOf(firstInstallment.get("feeChargesDue")));
+
+        // check for installment fee
+        HashMap secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("29.70", String.valueOf(secondInstallment.get("feeChargesDue")));
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("20 September 2011", loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        GlobalConfigurationHelper.manageConfigurations(REQUEST_SPEC, RESPONSE_SPEC,
+                GlobalConfigurationHelper.ENABLE_AUTOGENERATED_EXTERNAL_ID, true);
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        ArrayList<HashMap> loanTransactionDetails = LOAN_TRANSACTION_HELPER.getLoanTransactionDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        validateAccrualTransactionForDisbursementCharge(loanTransactionDetails);
+        final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.DEBIT) };
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 September 2011", assetAccountInitialEntry);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 September 2011",
+                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.CREDIT));
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(percentageDisbursementCharge, loanCharges, "1", "0.0", "120.00", "0.0");
+
+        LOG.info("-------------Make repayment 1-----------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 October 2011", Float.parseFloat("3300.60"), loanID);
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(percentageDisbursementCharge, loanCharges, "1", "0.00", "120.00", "0.0");
+        validateCharge(percentageSpecifiedDueDateCharge, loanCharges, "1", "0.00", "120.0", "0.0");
+        validateCharge(percentageInstallmentFee, loanCharges, "1", "90.89", "29.11", "0.0");
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
+                new JournalEntry(Float.parseFloat("3300.60"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3300.60"), JournalEntry.TransactionType.CREDIT));
+
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper
+                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(percentageSpecifiedDueDateCharge), "29 October 2011", "1"));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("149.70", String.valueOf(secondInstallment.get("feeChargesDue")));
+        LOG.info("----------- Waive installment charge for 2nd installment ---------");
+        LOAN_TRANSACTION_HELPER.waiveChargesForLoan(loanID, (Integer) getloanCharge(percentageInstallmentFee, loanCharges).get("id"),
+                LoanTransactionHelper.getWaiveChargeJSON(String.valueOf(2)));
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(percentageInstallmentFee, loanCharges, "1", "61.19", "29.11", "29.70");
+
+        /*
+         * JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount( assetAccount, "20 September 2011", new
+         * JournalEntry(Float.parseFloat("29.7"), JournalEntry.TransactionType.CREDIT));
+         * JOURNAL_ENTRY_HELPER.checkJournalEntryForExpenseAccount (expenseAccount, "20 September 2011", new
+         * JournalEntry(Float.parseFloat("29.7"), JournalEntry.TransactionType.DEBIT));
+         */
+
+        final String jobName = "Add Accrual Transactions";
+
+        SCHEDULER_JOB_HELPER.executeAndAwaitJob(jobName);
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        checkAccrualTransactions(loanSchedule, loanID);
+
+        LOG.info("----------Make repayment 2------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 November 2011", Float.parseFloat("3271.49"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("3271.49"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3271.49"), JournalEntry.TransactionType.CREDIT));
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("0", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("--------------Waive interest---------------");
+        LOAN_TRANSACTION_HELPER.waiveInterest("20 December 2011", String.valueOf(61.79), loanID);
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap thirdInstallment = loanSchedule.get(3);
+        validateNumberForEqual("60.59", String.valueOf(thirdInstallment.get("interestOutstanding")));
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 December 2011",
+                new JournalEntry(Float.parseFloat("61.79"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForExpenseAccount(expenseAccount, "20 December 2011",
+                new JournalEntry(Float.parseFloat("61.79"), JournalEntry.TransactionType.DEBIT));
+
+        Integer percentagePenaltySpecifiedDueDate = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", true));
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper
+                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(percentagePenaltySpecifiedDueDate), "29 September 2011", "1"));
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(percentagePenaltySpecifiedDueDate, loanCharges, "1", "0.00", "120.0", "0.0");
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("120", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
+
+        // checking the journal entry as applied penalty has been collected
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
+                new JournalEntry(Float.parseFloat("3300.60"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3300.60"), JournalEntry.TransactionType.CREDIT));
+
+        LOG.info("----------Make repayment 3 advance------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 November 2011", Float.parseFloat("3301.78"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("3301.78"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3301.78"), JournalEntry.TransactionType.CREDIT));
+
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper
+                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(percentagePenaltySpecifiedDueDate), "10 January 2012", "1"));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap fourthInstallment = loanSchedule.get(4);
+        validateNumberForEqual("120", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
+        validateNumberForEqual("3240.58", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("----------Pay applied penalty ------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 January 2012", Float.parseFloat("120"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("120"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("120"), JournalEntry.TransactionType.CREDIT));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        fourthInstallment = loanSchedule.get(4);
+        validateNumberForEqual("0", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
+        validateNumberForEqual("3120.58", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("----------Make repayment 4 ------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 January 2012", Float.parseFloat("3120.58"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("3120.58"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3120.58"), JournalEntry.TransactionType.CREDIT));
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.getLoanDetail(REQUEST_SPEC, RESPONSE_SPEC, loanID, "status");
+        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
+    }
+
+    /***
+     * Test case for checking AccuralPeriodicAccounting functionality adding charges with calculation type percentage of
+     * amount and interest
+     */
+    @Test
+    public void loanWithChargesOfTypeAmountPlusInterestPercentageAndPeriodicAccrualAccountingEnabled() throws InterruptedException {
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+
+        // Add charges with payment mode regular
+        List<HashMap> charges = new ArrayList<>();
+        Integer amountPlusInterestPercentageDisbursementCharge = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanDisbursementJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT_AND_INTEREST, "1"));
+        addCharges(charges, amountPlusInterestPercentageDisbursementCharge, "1", null);
+
+        Integer amountPlusInterestPercentageSpecifiedDueDateCharge = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC, ChargesHelper
+                .getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT_AND_INTEREST, "1", false));
+        addCharges(charges, amountPlusInterestPercentageSpecifiedDueDateCharge, "1", "29 September 2011");
+
+        Integer amountPlusInterestPercentageInstallmentFee = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT_AND_INTEREST, "1", false));
+        addCharges(charges, amountPlusInterestPercentageInstallmentFee, "1", "29 September 2011");
+
+        final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
+        final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
+        final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
+        final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
+
+        List<HashMap> collaterals = new ArrayList<>();
+
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
+        Assertions.assertNotNull(collateralId);
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
+                String.valueOf(clientID), collateralId);
+        Assertions.assertNotNull(clientCollateralId);
+        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
+
+        final Integer loanProductID = createLoanProduct(false, ACCRUAL_PERIODIC, assetAccount, incomeAccount, expenseAccount,
+                overpaymentAccount);
+        final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges, null, "12,000.00", collaterals);
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        verifyLoanRepaymentSchedule(loanSchedule);
+
+        List<HashMap> loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(amountPlusInterestPercentageDisbursementCharge, loanCharges, "1", "126.06", "0.0", "0.0");
+        validateCharge(amountPlusInterestPercentageSpecifiedDueDateCharge, loanCharges, "1", "126.06", "0.0", "0.0");
+        validateCharge(amountPlusInterestPercentageInstallmentFee, loanCharges, "1", "126.04", "0.0", "0.0");
+
+        // check for disbursement fee
+        HashMap disbursementDetail = loanSchedule.get(0);
+        validateNumberForEqual("126.06", String.valueOf(disbursementDetail.get("feeChargesDue")));
+
+        // check for charge at specified date and installment fee
+        HashMap firstInstallment = loanSchedule.get(1);
+        validateNumberForEqual("157.57", String.valueOf(firstInstallment.get("feeChargesDue")));
+
+        // check for installment fee
+        HashMap secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("31.51", String.valueOf(secondInstallment.get("feeChargesDue")));
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("20 September 2011", loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(Float.parseFloat("126.06"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.DEBIT) };
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 September 2011", assetAccountInitialEntry);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, "20 September 2011",
+                new JournalEntry(Float.parseFloat("126.06"), JournalEntry.TransactionType.CREDIT));
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(amountPlusInterestPercentageDisbursementCharge, loanCharges, "1", "0.0", "126.06", "0.0");
+
+        LOG.info("-------------Make repayment 1-----------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 October 2011", Float.parseFloat("3309.06"), loanID);
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(amountPlusInterestPercentageDisbursementCharge, loanCharges, "1", "0.00", "126.06", "0.0");
+        validateCharge(amountPlusInterestPercentageSpecifiedDueDateCharge, loanCharges, "1", "0.00", "126.06", "0.0");
+        validateCharge(amountPlusInterestPercentageInstallmentFee, loanCharges, "1", "94.53", "31.51", "0.0");
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
+                new JournalEntry(Float.parseFloat("3309.06"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3309.06"), JournalEntry.TransactionType.CREDIT));
+
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(
+                String.valueOf(amountPlusInterestPercentageSpecifiedDueDateCharge), "29 October 2011", "1"));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("157.57", String.valueOf(secondInstallment.get("feeChargesDue")));
+        LOG.info("----------- Waive installment charge for 2nd installment ---------");
+        LOAN_TRANSACTION_HELPER.waiveChargesForLoan(loanID,
+                (Integer) getloanCharge(amountPlusInterestPercentageInstallmentFee, loanCharges).get("id"),
+                LoanTransactionHelper.getWaiveChargeJSON(String.valueOf(2)));
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(amountPlusInterestPercentageInstallmentFee, loanCharges, "1", "63.02", "31.51", "31.51");
+
+        /*
+         * JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount( assetAccount, "20 September 2011", new JournalEntry(
+         * Float.parseFloat("31.51"), JournalEntry.TransactionType.CREDIT));
+         * JOURNAL_ENTRY_HELPER.checkJournalEntryForExpenseAccount (expenseAccount, "20 September 2011", new
+         * JournalEntry(Float.parseFloat("31.51"), JournalEntry.TransactionType.DEBIT));
+         */
+
+        final String jobName = "Add Accrual Transactions";
+
+        SCHEDULER_JOB_HELPER.executeAndAwaitJob(jobName);
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        checkAccrualTransactions(loanSchedule, loanID);
+
+        LOG.info("----------Make repayment 2------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 November 2011", Float.parseFloat("3277.55"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("3277.55"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3277.55"), JournalEntry.TransactionType.CREDIT));
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("0", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("--------------Waive interest---------------");
+        LOAN_TRANSACTION_HELPER.waiveInterest("20 December 2011", String.valueOf(61.79), loanID);
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap thirdInstallment = loanSchedule.get(3);
+        validateNumberForEqual("60.59", String.valueOf(thirdInstallment.get("interestOutstanding")));
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 December 2011",
+                new JournalEntry(Float.parseFloat("61.79"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForExpenseAccount(expenseAccount, "20 December 2011",
+                new JournalEntry(Float.parseFloat("61.79"), JournalEntry.TransactionType.DEBIT));
+
+        Integer amountPlusInterestPercentagePenaltySpecifiedDueDate = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", true));
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(
+                String.valueOf(amountPlusInterestPercentagePenaltySpecifiedDueDate), "29 September 2011", "1"));
+        loanCharges.clear();
+        loanCharges = LOAN_TRANSACTION_HELPER.getLoanCharges(loanID);
+        validateCharge(amountPlusInterestPercentagePenaltySpecifiedDueDate, loanCharges, "1", "0.0", "120.0", "0.0");
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("120", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
+
+        // checking the journal entry as applied penalty has been collected
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
+                new JournalEntry(Float.parseFloat("3309.06"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3309.06"), JournalEntry.TransactionType.CREDIT));
+
+        LOG.info("----------Make repayment 3 advance------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 November 2011", Float.parseFloat("3303"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
+                new JournalEntry(Float.parseFloat("3303"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3303"), JournalEntry.TransactionType.CREDIT));
+
+        LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(
+                String.valueOf(amountPlusInterestPercentagePenaltySpecifiedDueDate), "10 January 2012", "1"));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap fourthInstallment = loanSchedule.get(4);
+        validateNumberForEqual("120", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
+        validateNumberForEqual("3241.19", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("----------Pay applied penalty ------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 January 2012", Float.parseFloat("120"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("120"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("120"), JournalEntry.TransactionType.CREDIT));
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        fourthInstallment = loanSchedule.get(4);
+        validateNumberForEqual("0", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
+        validateNumberForEqual("3121.19", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
+
+        LOG.info("----------Make repayment 4 ------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 January 2012", Float.parseFloat("3121.19"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
+                new JournalEntry(Float.parseFloat("3121.19"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("3121.19"), JournalEntry.TransactionType.CREDIT));
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.getLoanDetail(REQUEST_SPEC, RESPONSE_SPEC, loanID, "status");
+        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
+    }
+
+    @Test
+    public void testClientLoanScheduleWithCurrencyDetails() {
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+
+        List<HashMap> collaterals = new ArrayList<>();
+
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
+
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
+                String.valueOf(clientID), collateralId);
+        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
+
+        final Integer loanProductID = createLoanProduct("100", "0", LoanProductTestBuilder.DEFAULT_STRATEGY);
+        final Integer loanID = applyForLoanApplication(clientID, loanProductID, null, collaterals);
+        final ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        verifyLoanRepaymentScheduleForEqualPrincipal(loanSchedule);
+
+    }
+
+    @Test
+    public void testClientLoanScheduleWithCurrencyDetails_with_grace() {
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+
+        List<HashMap> collaterals = new ArrayList<>();
+
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
+
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
+                String.valueOf(clientID), collateralId);
+        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
+
+        final Integer loanProductID = createLoanProduct("100", "0", LoanProductTestBuilder.DEFAULT_STRATEGY);
+        final Integer loanID = applyForLoanApplication(clientID, loanProductID, "5", collaterals);
+        final ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        verifyLoanRepaymentScheduleForEqualPrincipalWithGrace(loanSchedule);
+
+    }
+
+    /***
+     * Test case to verify RBI payment strategy
+     */
+    @Test
+    public void testRBIPaymentStrategy() {
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+
+        /***
+         * Create loan product with RBI strategy
+         */
+        final Integer loanProductID = createLoanProduct("100", "0", LoanProductTestBuilder.RBI_INDIA_STRATEGY);
+        Assertions.assertNotNull(loanProductID);
+
+        /***
+         * Apply for loan application and verify loan status
+         */
+        final String savingsId = null;
+        final String principal = "12,000.00";
+
+        List<HashMap> collaterals = new ArrayList<>();
+
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
+
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
+                String.valueOf(clientID), collateralId);
+        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
+
+        final Integer loanID = applyForLoanApplicationWithPaymentStrategy(clientID, loanProductID, null, savingsId, principal,
+                LoanApplicationTestBuilder.RBI_INDIA_STRATEGY, collaterals);
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("20 September 2011", loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap firstInstallment = loanSchedule.get(1);
+        validateNumberForEqual("3200", String.valueOf(firstInstallment.get("totalOutstandingForPeriod")));
+
+        /***
+         * Make payment for installment #1
+         */
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 October 2011", Float.parseFloat("3200"), loanID);
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        firstInstallment = loanSchedule.get(1);
+        validateNumberForEqual("0.00", String.valueOf(firstInstallment.get("totalOutstandingForPeriod")));
+
+        /***
+         * Verify 2nd and 3rd repayments dues before making excess payment for installment no 2
+         */
+        HashMap secondInstallment = loanSchedule.get(2);
+        HashMap thirdInstallment = loanSchedule.get(3);
+
+        validateNumberForEqual("3200", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
+        validateNumberForEqual("3200", String.valueOf(thirdInstallment.get("totalOutstandingForPeriod")));
+
+        validateNumberForEqual("3000", String.valueOf(secondInstallment.get("principalOutstanding")));
+        validateNumberForEqual("3100", String.valueOf(thirdInstallment.get("principalOutstanding")));
+
+        /***
+         * Make payment for installment #2
+         */
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 November 2011", Float.parseFloat("3200"), loanID);
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        /***
+         * Verify 2nd and 3rd repayments after making excess payment for installment no 2
+         */
+        secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("0.00", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
+
+        /***
+         * According to RBI Excess payment should go to principal portion of next installment, but as interest
+         * recalculation is not implemented, it wont make any difference to schedule even though if we made excess
+         * payment, so excess payments will behave the same as regular payment with the excess amount
+         */
+        thirdInstallment = loanSchedule.get(3);
+        validateNumberForEqual("3200", String.valueOf(thirdInstallment.get("totalOutstandingForPeriod")));
+        validateNumberForEqual("3100", String.valueOf(thirdInstallment.get("principalOutstanding")));
+        validateNumberForEqual("0", String.valueOf(thirdInstallment.get("principalPaid")));
+        validateNumberForEqual("0", String.valueOf(thirdInstallment.get("interestPaid")));
+        validateNumberForEqual("100.00", String.valueOf(thirdInstallment.get("interestOutstanding")));
+
+        /***
+         * Make payment with due amount of 3rd installment on 4th installment date
+         */
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 January 2012", Float.parseFloat("3200"), loanID);
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+
+        /***
+         * Verify overdue interests are deducted first and then remaining amount for interest portion of due installment
+         */
+        thirdInstallment = loanSchedule.get(3);
+        HashMap fourthInstallment = loanSchedule.get(4);
+
+        validateNumberForEqual("100", String.valueOf(thirdInstallment.get("totalOutstandingForPeriod")));
+        validateNumberForEqual("100", String.valueOf(thirdInstallment.get("principalOutstanding")));
+
+        validateNumberForEqual("2900", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
+        validateNumberForEqual("100", String.valueOf(fourthInstallment.get("interestPaid")));
+        validateNumberForEqual("0.00", String.valueOf(fourthInstallment.get("interestOutstanding")));
+
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 January 2012", Float.parseFloat("3000"), loanID);
+
+        /***
+         * verify loan is closed as we paid full amount
+         */
+        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
+
+    }
+
+    @Test
+    public void testLoanScheduleWithInterestRecalculation_WITH_REST_SAME_AS_REPAYMENT_INTEREST_COMPOUND_NONE_STRATEGY_REDUCE_EMI() {
+
+        DateFormat dateFormat = new SimpleDateFormat(DATETIME_PATTERN, Locale.US);
+        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
+
+        Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -14);
+        final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+        final Integer loanProductID = createLoanProductWithInterestRecalculation(LoanProductTestBuilder.DEFAULT_STRATEGY,
+                LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_NONE,
+                LoanProductTestBuilder.RECALCULATION_STRATEGY_REDUCE_EMI_AMOUN,
+                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_SAME_AS_REPAYMENT_PERIOD, "0", null,
+                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, null, null, null);
+
+        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, LOAN_DISBURSEMENT_DATE, null,
+                LoanApplicationTestBuilder.DEFAULT_STRATEGY, new ArrayList<>(0));
+
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        List<Map<String, Object>> expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.67", "23.24", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2528.81", "11.67", "0.0", "0.0");
+
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -7);
+        final String LOAN_FIRST_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
+        Float totalDueForCurrentPeriod = (Float) loanSchedule.get(1).get("totalDueForPeriod");
+        LOAN_TRANSACTION_HELPER.makeRepayment(LOAN_FIRST_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        Float earlyPayment = Float.parseFloat("4000");
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -5);
+        final String LOAN_SECOND_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
+        LOAN_TRANSACTION_HELPER.makeRepayment(LOAN_SECOND_REPAYMENT_DATE, earlyPayment, loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "3965.31", "34.69", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "1771.88", "16.39", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "1780.05", "8.22", "0.0", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        HashMap prepayDetail = LOAN_TRANSACTION_HELPER.getPrepayAmount(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        String prepayAmount = String.valueOf(prepayDetail.get("amount"));
+        validateNumberForEqualWithMsg("verify pre-close amount", "3551.93", prepayAmount);
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        final String loanRepaymentDate = dateFormat.format(todaysDate.getTime());
+        LOAN_TRANSACTION_HELPER.makeRepayment(loanRepaymentDate, Float.parseFloat(prepayAmount), loanID);
+        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
+    }
+
+    @Test
+    public void testLoanScheduleWithInterestRecalculation_WITH_REST_SAME_AS_REPAYMENT_INTEREST_COMPOUND_NONE_STRATEGY_REDUCE_EMI_PRE_CLOSE_INTEREST_PRE_CLOSE_DATE() {
+        String preCloseInterestStrategy = LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE;
+        String preCloseAmount = "7561.84";
+        testLoanScheduleWithInterestRecalculation_WITH_REST_SAME_AS_REPAYMENT_INTEREST_COMPOUND_NONE_STRATEGY_REDUCE_EMI_PRE_CLOSE_INTEREST(
+                preCloseInterestStrategy, preCloseAmount);
+    }
+
+    @Test
+    public void testLoanScheduleWithInterestRecalculation_WITH_REST_SAME_AS_REPAYMENT_INTEREST_COMPOUND_NONE_STRATEGY_REDUCE_EMI_PRE_CLOSE_INTEREST_REST_DATE() {
+        String preCloseInterestStrategy = LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_REST_DATE;
+        String preCloseAmount = "7586.62";
+        testLoanScheduleWithInterestRecalculation_WITH_REST_SAME_AS_REPAYMENT_INTEREST_COMPOUND_NONE_STRATEGY_REDUCE_EMI_PRE_CLOSE_INTEREST(
+                preCloseInterestStrategy, preCloseAmount);
+    }
+
+    @Test
+    public void testLoanScheduleWithInterestRecalculation_WITH_REST_SAME_AS_REPAYMENT_INTEREST_COMPOUND_NONE_STRATEGY_REDUCE_EMI_WITH_INSTALLMENT_CHARGE() {
+
+        DateFormat dateFormat = new SimpleDateFormat(DATETIME_PATTERN, Locale.US);
+        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
+
+        Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -14);
+        final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+        final Integer loanProductID = createLoanProductWithInterestRecalculation(LoanProductTestBuilder.DEFAULT_STRATEGY,
+                LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_NONE,
+                LoanProductTestBuilder.RECALCULATION_STRATEGY_REDUCE_EMI_AMOUN,
+                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_SAME_AS_REPAYMENT_PERIOD, "0", null,
+                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, null, null, null);
+
+        List<HashMap> charges = new ArrayList<>();
+        Integer installmentCharge = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_INTEREST, "10", false));
+        addCharges(charges, installmentCharge, "10", null);
+        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, LOAN_DISBURSEMENT_DATE, null,
+                LoanApplicationTestBuilder.DEFAULT_STRATEGY, charges);
+
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        List<Map<String, Object>> expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "4.62", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "3.47", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "2.32", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "1.16", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "4.62", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.76", "46.15", "4.62", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.67", "23.24", "2.32", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2528.81", "11.67", "1.17", "0.0");
+
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -7);
+        final String LOAN_FIRST_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
+        Float totalDueForCurrentPeriod = (Float) loanSchedule.get(1).get("totalDueForPeriod");
+        LOAN_TRANSACTION_HELPER.makeRepayment(LOAN_FIRST_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "4.62", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "3.47", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "2.32", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "1.16", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        Float earlyPayment = Float.parseFloat("4000");
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -5);
+        final String LOAN_SECOND_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
+        LOAN_TRANSACTION_HELPER.makeRepayment(LOAN_SECOND_REPAYMENT_DATE, earlyPayment, loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "4.62", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "3961.84", "34.69", "3.47", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "1773.61", "16.41", "1.64", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "1781.79", "8.22", "0.82", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        HashMap prepayDetail = LOAN_TRANSACTION_HELPER.getPrepayAmount(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        String prepayAmount = String.valueOf(prepayDetail.get("amount"));
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        final String loanRepaymentDate = dateFormat.format(todaysDate.getTime());
+        LOAN_TRANSACTION_HELPER.makeRepayment(loanRepaymentDate, Float.parseFloat(prepayAmount), loanID);
+        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
+    }
+
+    @Test
+    public void testLoanScheduleWithInterestRecalculation_WITH_REST_DAILY_INTEREST_COMPOUND_INTEREST_STRATEGY_REDUCE_NUMBER_OF_INSTALLMENTS() {
+
+        DateFormat dateFormat = new SimpleDateFormat(DATETIME_PATTERN, Locale.US);
+        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
+
+        Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -14);
+        final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
+        Integer dayOfWeek = getDayOfWeek(todaysDate);
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+        final Integer loanProductID = createLoanProductWithInterestRecalculationAndCompoundingDetails(
+                LoanProductTestBuilder.RBI_INDIA_STRATEGY, LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_INTEREST,
+                LoanProductTestBuilder.RECALCULATION_STRATEGY_REDUCE_NUMBER_OF_INSTALLMENTS,
+                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_DAILY, "1", LOAN_DISBURSEMENT_DATE,
+                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_WEEKLY, "1", LOAN_DISBURSEMENT_DATE,
+                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, null, null, dayOfWeek, null, dayOfWeek);
+
+        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, LOAN_DISBURSEMENT_DATE,
+                LoanApplicationTestBuilder.RBI_INDIA_STRATEGY, new ArrayList<>(0));
+
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        List<Map<String, Object>> expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
+
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.54", "46.37", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.67", "23.24", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2529.03", "11.67", "0.0", "0.0");
+
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanFutureRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, 0, false, "4965.3", "92.52", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.67", "23.24", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2529.03", "11.67", "0.0", "0.0");
+
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues, 0);
+
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -7);
+        final String LOAN_FIRST_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
+        Float totalDueForCurrentPeriod = (Float) loanSchedule.get(1).get("totalDueForPeriod");
+        LOAN_TRANSACTION_HELPER.makeRepayment(LOAN_FIRST_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        Float earlyPayment = Float.parseFloat("4000");
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -5);
+        final String LOAN_SECOND_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
+        LOAN_TRANSACTION_HELPER.makeRepayment(LOAN_SECOND_REPAYMENT_DATE, earlyPayment, loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        Calendar today = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        Map<String, Object> paymentday = new HashMap<>(3);
+        paymentday.put("dueDate", getDateAsArray(today, -5, Calendar.DAY_OF_MONTH));
+        paymentday.put("principalDue", "3990.09");
+        paymentday.put("interestDue", "9.91");
+        paymentday.put("feeChargesDue", "0");
+        paymentday.put("penaltyChargesDue", "0");
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
+        expectedvalues.add(paymentday);
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.31", "11.6", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "1009.84", "4.66", "0.0", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        HashMap prepayDetail = LOAN_TRANSACTION_HELPER.getPrepayAmount(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        String prepayAmount = String.valueOf(prepayDetail.get("amount"));
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        final String loanRepaymentDate = dateFormat.format(todaysDate.getTime());
+        LOAN_TRANSACTION_HELPER.makeRepayment(loanRepaymentDate, Float.parseFloat(prepayAmount), loanID);
+        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
+
+    }
+
+    @Test
+    public void testInteroperationLoanRepaymentAPI() {
+
+        DateFormat dateFormat = new SimpleDateFormat(DATETIME_PATTERN, Locale.US);
+        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
+        GlobalConfigurationHelper.updateEnabledFlagForGlobalConfiguration(REQUEST_SPEC, RESPONSE_SPEC, "42", true);
+        Calendar startDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        startDate.add(Calendar.MONTH, -8);
+
+        Calendar firstRepaymentDate = (Calendar) startDate.clone();
+        firstRepaymentDate.add(Calendar.MONTH, 1);
+        firstRepaymentDate.add(Calendar.DAY_OF_MONTH, firstRepaymentDate.getActualMaximum(Calendar.DAY_OF_MONTH) - Calendar.DAY_OF_MONTH);
+        String firstRepayment = dateFormat.format(firstRepaymentDate.getTime());
+
+        final String loanDisbursementDate = dateFormat.format(startDate.getTime());
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+        final Integer loanProductID = createLoanProductWithInterestRecalculationAndCompoundingDetails(
+                LoanProductTestBuilder.INTEREST_PRINCIPAL_PENALTIES_FEES_ORDER_STRATEGY,
+                LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_NONE,
+                LoanProductTestBuilder.RECALCULATION_STRATEGY_REDUCE_NUMBER_OF_INSTALLMENTS,
+                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_SAME_AS_REPAYMENT_PERIOD,
+                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, null, "12");
+
+        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, loanDisbursementDate,
+                LoanApplicationTestBuilder.INTEREST_PRINCIPAL_PENALTIES_FEES_ORDER_STRATEGY, firstRepayment);
+
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan(loanDisbursementDate, loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount(loanDisbursementDate, loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        Assertions.assertNotNull(loanSchedule);
+        startDate.add(Calendar.DAY_OF_MONTH, 2);
+        String loanFirstRepaymentDate = dateFormat.format(startDate.getTime());
+
+        Float earlyPayment = Float.parseFloat("3000");
+        String accountNo = JsonPath.from(loanDetails).get("accountNo").toString();
+
+        HashMap loanRepayment = LOAN_TRANSACTION_HELPER.makeRepaymentWithAccountNo(loanFirstRepaymentDate, earlyPayment, accountNo);
+        assertNotNull(loanRepayment);
+    }
+
+    @Test
+    public void testLoanScheduleWithInterestRecalculation_WITH_REST_WEEKLY_INTEREST_COMPOUND_INTEREST_FEE_STRATEGY_REDUCE_NEXT_INSTALLMENTS() {
+
+        DateFormat dateFormat = new SimpleDateFormat(DATETIME_PATTERN, Locale.US);
+        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
+
+        Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -14);
+        Integer compoundingDayOfMonth = getDayOfMonth(todaysDate);
+        Integer compoundingDayOfWeek = getDayOfWeek(todaysDate);
+        final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -2);
+        Integer restDayOfMonth = getDayOfMonth(todaysDate);
+        Integer restDayOfWeek = getDayOfWeek(todaysDate);
+        final String REST_START_DATE = dateFormat.format(todaysDate.getTime());
+
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -14);
+        todaysDate.add(Calendar.DAY_OF_MONTH, 2);
+        final String LOAN_FLAT_CHARGE_DATE = dateFormat.format(todaysDate.getTime());
+        todaysDate.add(Calendar.DAY_OF_MONTH, 14);
+        final String LOAN_INTEREST_CHARGE_DATE = dateFormat.format(todaysDate.getTime());
+        List<HashMap> charges = new ArrayList<>(2);
+        Integer flat = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "100", false));
+        Integer principalPercentage = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "2", false));
+
+        addCharges(charges, flat, "100", LOAN_FLAT_CHARGE_DATE);
+        addCharges(charges, principalPercentage, "2", LOAN_INTEREST_CHARGE_DATE);
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+        final Integer loanProductID = createLoanProductWithInterestRecalculationAndCompoundingDetails(
+                LoanProductTestBuilder.DEFAULT_STRATEGY, LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_INTEREST_AND_FEE,
+                LoanProductTestBuilder.RECALCULATION_STRATEGY_RESCHEDULE_NEXT_REPAYMENTS,
+                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_WEEKLY, "1", REST_START_DATE,
+                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_WEEKLY, "1", LOAN_DISBURSEMENT_DATE,
+                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, null, compoundingDayOfMonth, compoundingDayOfWeek,
+                restDayOfMonth, restDayOfWeek);
+
+        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, LOAN_DISBURSEMENT_DATE,
+                LOAN_DISBURSEMENT_DATE, LoanApplicationTestBuilder.DEFAULT_STRATEGY, charges);
+
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        List<Map<String, Object>> expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "100.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "200", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "100.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.08", "46.83", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.67", "23.24", "200", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2529.49", "11.67", "0.0", "0.0");
+
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        Calendar repaymentDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        repaymentDate.add(Calendar.DAY_OF_MONTH, -7);
+        final String LOAN_FIRST_REPAYMENT_DATE = dateFormat.format(repaymentDate.getTime());
+        Float totalDueForCurrentPeriod = (Float) loanSchedule.get(1).get("totalDueForPeriod");
+        LOAN_TRANSACTION_HELPER.makeRepayment(LOAN_FIRST_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "100.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "200", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        Float earlyPayment = Float.parseFloat("5100");
+        repaymentDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        repaymentDate.add(Calendar.DAY_OF_MONTH, -5);
+        final String LOAN_SECOND_REPAYMENT_DATE = dateFormat.format(repaymentDate.getTime());
+        LOAN_TRANSACTION_HELPER.makeRepayment(LOAN_SECOND_REPAYMENT_DATE, earlyPayment, loanID);
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "100.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "5065.31", "34.69", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "0", "11.32", "200", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2451.93", "11.32", "0.0", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        HashMap prepayDetail = LOAN_TRANSACTION_HELPER.getPrepayAmount(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        String prepayAmount = String.valueOf(prepayDetail.get("amount"));
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        final String loanRepaymentDate = dateFormat.format(todaysDate.getTime());
+        LOAN_TRANSACTION_HELPER.makeRepayment(loanRepaymentDate, Float.parseFloat(prepayAmount), loanID);
+        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
+
+    }
+
+    @Test
+    public void testLoanScheduleWithInterestRecalculation_WITH_REST_WEEKLY_INTEREST_COMPOUND_INTEREST_FEE_STRATEGY_REDUCE_NEXT_INSTALLMENTS_PRE_CLOSE_INTEREST_PRE_CLOSE_DATE() {
+        String preCloseInterestStrategy = LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE;
+        String preCloseAmount = "7761.89";
+        testLoanScheduleWithInterestRecalculation_WITH_REST_WEEKLY_INTEREST_COMPOUND_INTEREST_FEE_STRATEGY_REDUCE_NEXT_INSTALLMENTS_PRE_CLOSE_INTEREST(
+                preCloseInterestStrategy, preCloseAmount);
+
+    }
+
+    @Test
+    public void testLoanScheduleWithInterestRecalculation_WITH_REST_WEEKLY_INTEREST_COMPOUND_INTEREST_FEE_STRATEGY_REDUCE_NEXT_INSTALLMENTS_PRE_CLOSE_INTEREST_REST_DATE() {
+        String preCloseInterestStrategy = LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_REST_DATE;
+        String preCloseAmount = "7786.79";
+        testLoanScheduleWithInterestRecalculation_WITH_REST_WEEKLY_INTEREST_COMPOUND_INTEREST_FEE_STRATEGY_REDUCE_NEXT_INSTALLMENTS_PRE_CLOSE_INTEREST(
+                preCloseInterestStrategy, preCloseAmount);
+
+    }
+
+    @Test
+    public void testLoanScheduleWithInterestRecalculation_WITH_REST_DAILY_INTEREST_COMPOUND_INTEREST_FEE_STRATEGY_WITH_OVERDUE_CHARGE()
+            throws InterruptedException {
+
+        DateFormat dateFormat = new SimpleDateFormat(DATETIME_PATTERN, Locale.US);
+        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
+
+        Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -7 * 3);
+        final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -2);
+        final String REST_START_DATE = dateFormat.format(todaysDate.getTime());
+
+        Integer overdueFeeChargeId = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanOverdueFeeJSONWithCalculationTypePercentage("10"));
+        Assertions.assertNotNull(overdueFeeChargeId);
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+        final String recalculationCompoundingFrequencyInterval = null;
+        final String recalculationCompoundingFrequencyDate = null;
+        final Integer loanProductID = createLoanProductWithInterestRecalculation(LoanProductTestBuilder.DEFAULT_STRATEGY,
+                LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_INTEREST_AND_FEE,
+                LoanProductTestBuilder.RECALCULATION_STRATEGY_RESCHEDULE_NEXT_REPAYMENTS,
+                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_DAILY, "1", REST_START_DATE,
+                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_SAME_AS_REPAYMENT_PERIOD, recalculationCompoundingFrequencyInterval,
+                recalculationCompoundingFrequencyDate, LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, null,
+                overdueFeeChargeId.toString(), false, null, null, null, null);
+
+        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, LOAN_DISBURSEMENT_DATE,
+                REST_START_DATE, LoanApplicationTestBuilder.DEFAULT_STRATEGY, null);
+
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        List<Map<String, Object>> expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -2, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+
+        addRepaymentValues(expectedvalues, todaysDate, -2, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.54", "46.37", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.33", "46.58", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2552.37", "11.78", "0.0", "0.0");
+
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        String JobName = "Apply penalty to overdue loans";
+        SCHEDULER_JOB_HELPER.executeAndAwaitJob(JobName);
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -2, false, "2482.76", "46.15", "0.0", "252.89");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2481.38", "47.53", "0.0", "252.89");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2479.99", "48.92", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2555.87", "11.8", "0.0", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        Calendar repaymentDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        repaymentDate.add(Calendar.DAY_OF_MONTH, -7 * 2);
+        final String LOAN_FIRST_REPAYMENT_DATE = dateFormat.format(repaymentDate.getTime());
+        Float totalDueForCurrentPeriod = (Float) loanSchedule.get(1).get("totalDueForPeriod");
+        totalDueForCurrentPeriod = totalDueForCurrentPeriod - Float.parseFloat("252.89");
+        LOAN_TRANSACTION_HELPER.makeRepayment(LOAN_FIRST_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -2, false, "2482.76", "46.15", "0.0", "252.89");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2493.05", "35.86", "0.0", "252.89");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2491.72", "37.19", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2532.47", "11.69", "0.0", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        repaymentDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        repaymentDate.add(Calendar.DAY_OF_MONTH, -3);
+        final String LOAN_SECOND_REPAYMENT_DATE = dateFormat.format(repaymentDate.getTime());
+        totalDueForCurrentPeriod = (Float) loanSchedule.get(2).get("totalDueForPeriod");
+        LOAN_TRANSACTION_HELPER.makeRepayment(LOAN_SECOND_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -2, false, "2482.76", "46.15", "0.0", "252.89");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2493.05", "35.86", "0.0", "252.89");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2497.22", "31.69", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2526.97", "11.66", "0.0", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+    }
+
+    @Test
+    public void testLoanScheduleWithInterestRecalculation_WITH_PERIODIC_ACCOUNTING() {
+
+        DateFormat dateFormat = new SimpleDateFormat(DATETIME_PATTERN, Locale.US);
+        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
+
+        final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
+        final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
+        final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
+        final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
+
+        Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        LOG.info("Disbursal Date Calendar {}", todaysDate.getTime());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -14);
+        final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+        Account[] accounts = { assetAccount, incomeAccount, expenseAccount, overpaymentAccount };
+        final Integer loanProductID = createLoanProductWithInterestRecalculation(LoanProductTestBuilder.DEFAULT_STRATEGY,
+                LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_NONE,
+                LoanProductTestBuilder.RECALCULATION_STRATEGY_REDUCE_EMI_AMOUN,
+                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_SAME_AS_REPAYMENT_PERIOD, "0", null,
+                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, accounts, null, null);
+
+        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, LOAN_DISBURSEMENT_DATE, null,
+                LoanApplicationTestBuilder.DEFAULT_STRATEGY, new ArrayList<>(0));
+
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        List<Map<String, Object>> expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        LOG.info("Date during repayment schedule {}", todaysDate.getTime());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.67", "23.24", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2528.81", "11.67", "0.0", "0.0");
+
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(10000.0f, JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(10000.0f, JournalEntry.TransactionType.DEBIT), };
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, LOAN_DISBURSEMENT_DATE, assetAccountInitialEntry);
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        String runOndate = dateFormat.format(todaysDate.getTime());
+        LOG.info("runOndate : {}", runOndate);
+        PERIODIC_ACCRUAL_ACCOUNTING_HELPER.runPeriodicAccrualAccounting(runOndate);
+        LOAN_TRANSACTION_HELPER.checkAccrualTransactionForRepayment(Utils.getLocalDateOfTenant().minusDays(7), 46.15f, 0f, 0f, loanID);
+        LOAN_TRANSACTION_HELPER.checkAccrualTransactionForRepayment(Utils.getLocalDateOfTenant(), 46.15f, 0f, 0f, loanID);
+
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -7);
+        final String LOAN_FIRST_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
+        Float totalDueForCurrentPeriod = (Float) loanSchedule.get(1).get("totalDueForPeriod");
+        LOAN_TRANSACTION_HELPER.makeRepayment(LOAN_FIRST_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        PERIODIC_ACCRUAL_ACCOUNTING_HELPER.runPeriodicAccrualAccounting(runOndate);
+        LOAN_TRANSACTION_HELPER.checkAccrualTransactionForRepayment(Utils.getLocalDateOfTenant().minusDays(7), 46.15f, 0f, 0f, loanID);
+        LOAN_TRANSACTION_HELPER.checkAccrualTransactionForRepayment(Utils.getLocalDateOfTenant(), 34.69f, 0f, 0f, loanID);
+
+        HashMap prepayDetail = LOAN_TRANSACTION_HELPER.getPrepayAmount(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        String prepayAmount = String.valueOf(prepayDetail.get("amount"));
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        final String loanRepaymentDate = dateFormat.format(todaysDate.getTime());
+        LOAN_TRANSACTION_HELPER.makeRepayment(loanRepaymentDate, Float.parseFloat(prepayAmount), loanID);
+        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
+
+        LOAN_TRANSACTION_HELPER.checkAccrualTransactionForRepayment(Utils.getLocalDateOfTenant().minusDays(7), 46.15f, 0f, 0f, loanID);
+        LOAN_TRANSACTION_HELPER.checkAccrualTransactionForRepayment(Utils.getLocalDateOfTenant(), 34.69f, 0f, 0f, loanID);
+
+    }
+
+    @Test
+    public void testLoanScheduleWithInterestRecalculation_WITH_CURRENT_REPAYMENT_BASED_ARREARS_AGEING() {
+
+        DateFormat dateFormat = new SimpleDateFormat(DATETIME_PATTERN, Locale.US);
+        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
+
+        Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -14);
+        final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+        final Integer loanProductID = createLoanProductWithInterestRecalculationAndCompoundingDetails(
+                LoanProductTestBuilder.RBI_INDIA_STRATEGY, LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_INTEREST,
+                LoanProductTestBuilder.RECALCULATION_STRATEGY_RESCHEDULE_NEXT_REPAYMENTS,
+                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_DAILY, "1", LOAN_DISBURSEMENT_DATE,
+                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_SAME_AS_REPAYMENT_PERIOD, "1", LOAN_DISBURSEMENT_DATE,
+                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, null, getDayOfMonth(todaysDate),
+                getDayOfWeek(todaysDate), getDayOfMonth(todaysDate), getDayOfWeek(todaysDate));
+
+        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, LOAN_DISBURSEMENT_DATE,
+                LOAN_DISBURSEMENT_DATE, LoanApplicationTestBuilder.RBI_INDIA_STRATEGY, new ArrayList<>(0));
+
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        List<Map<String, Object>> expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
+
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.54", "46.37", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.67", "23.24", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2529.03", "11.67", "0.0", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -7);
+        HashMap loanSummary = LOAN_TRANSACTION_HELPER.getLoanSummary(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        List dates = (List) loanSummary.get("overdueSinceDate");
+        assertEquals(todaysDate.get(Calendar.YEAR), dates.get(0));
+        assertEquals(todaysDate.get(Calendar.MONTH) + 1, dates.get(1));
+        assertEquals(todaysDate.get(Calendar.DAY_OF_MONTH), dates.get(2));
+
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -8);
+        final String LOAN_FIRST_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
+        Float totalDueForCurrentPeriod = (Float) loanSchedule.get(1).get("totalDueForPeriod");
+        LOAN_TRANSACTION_HELPER.makeRepayment(LOAN_FIRST_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
+
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -7);
+        loanSummary = LOAN_TRANSACTION_HELPER.getLoanSummary(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        dates = (List) loanSummary.get("overdueSinceDate");
+        assertEquals(todaysDate.get(Calendar.YEAR), dates.get(0));
+        assertEquals(todaysDate.get(Calendar.MONTH) + 1, dates.get(1));
+        assertEquals(todaysDate.get(Calendar.DAY_OF_MONTH), dates.get(2));
+
+    }
+
+    @Test
+    public void testLoanScheduleWithInterestRecalculation_WITH_ORIGINAL_REPAYMENT_BASED_ARREARS_AGEING() {
+
+        DateFormat dateFormat = new SimpleDateFormat(DATETIME_PATTERN, Locale.US);
+        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
+
+        Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        LOG.info("----timeeeeeeeeeeeeee------> {}", dateFormat.format(todaysDate.getTime()));
+        todaysDate.add(Calendar.DAY_OF_MONTH, -14);
+        final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+        final String recalculationCompoundingFrequencyInterval = null;
+        final String recalculationCompoundingFrequencyDate = null;
+        final Integer loanProductID = createLoanProductWithInterestRecalculation(LoanProductTestBuilder.RBI_INDIA_STRATEGY,
+                LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_INTEREST,
+                LoanProductTestBuilder.RECALCULATION_STRATEGY_RESCHEDULE_NEXT_REPAYMENTS,
+                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_DAILY, "1", LOAN_DISBURSEMENT_DATE,
+                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_SAME_AS_REPAYMENT_PERIOD, recalculationCompoundingFrequencyInterval,
+                recalculationCompoundingFrequencyDate, LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, null, null,
+                true, null, null, getDayOfMonth(todaysDate), getDayOfWeek(todaysDate));
+
+        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, LOAN_DISBURSEMENT_DATE,
+                LOAN_DISBURSEMENT_DATE, LoanApplicationTestBuilder.RBI_INDIA_STRATEGY, new ArrayList<>(0));
+
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        List<Map<String, Object>> expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
+
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.54", "46.37", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.67", "23.24", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2529.03", "11.67", "0.0", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -7);
+        HashMap loanSummary = LOAN_TRANSACTION_HELPER.getLoanSummary(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        List dates = (List) loanSummary.get("overdueSinceDate");
+        assertEquals(todaysDate.get(Calendar.YEAR), dates.get(0));
+        assertEquals(todaysDate.get(Calendar.MONTH) + 1, dates.get(1));
+        assertEquals(todaysDate.get(Calendar.DAY_OF_MONTH), dates.get(2));
+
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -8);
+        final String LOAN_FIRST_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
+        Float totalDueForCurrentPeriod = (Float) loanSchedule.get(1).get("totalDueForPeriod");
+        LOAN_TRANSACTION_HELPER.makeRepayment(LOAN_FIRST_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
+
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -7);
+        loanSummary = LOAN_TRANSACTION_HELPER.getLoanSummary(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        dates = (List) loanSummary.get("overdueSinceDate");
+        Assertions.assertNull(dates);
+
+    }
+
+    @Test
+    public void testLoanScheduleWithInterestRecalculation_FOR_PRE_CLOSE_WITH_MORATORIUM_INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE() {
+        testLoanScheduleWithInterestRecalculation_FOR_PRE_CLOSE_WITH_MORATORIUM(
+                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, "10006.59");
+    }
+
+    @Test
+    public void testLoanScheduleWithInterestRecalculation_FOR_PRE_CLOSE_WITH_MORATORIUM_INTEREST_APPLICABLE_STRATEGY_REST_DATE() {
+        testLoanScheduleWithInterestRecalculation_FOR_PRE_CLOSE_WITH_MORATORIUM(
+                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_REST_DATE, "10046.15");
+    }
+
+    /***
+     * Test case to verify default Style payment strategy
+     */
+    @Test
+    public void testLoanRefundByCashCashBasedAccounting() {
+
+        Calendar fourMonthsfromNowCalendar = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        fourMonthsfromNowCalendar.add(Calendar.MONTH, -4);
+
+        // FINERACT-885: If the loan starts on day 27-31th of month and not all months have that
+        // many days, then loan payment will get reset to a day of month less than today's day
+        // and 4th payment will be in the past. In such case, start the loan a few days later,
+        // so that 4th payment is guaranteed to be in the future.
+        if (fourMonthsfromNowCalendar.get(Calendar.DAY_OF_MONTH) > 27) {
+            fourMonthsfromNowCalendar.add(Calendar.DAY_OF_MONTH, 4);
+        }
+
+        String fourMonthsfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+
+        /***
+         * Create loan product with Default STYLE strategy
+         */
+
+        final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
+        final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
+        final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
+        final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
+
+        final Integer loanProductID = createLoanProduct("0", "0", LoanProductTestBuilder.DEFAULT_STRATEGY, CASH_BASED, assetAccount,
+                incomeAccount, expenseAccount, overpaymentAccount);
+        Assertions.assertNotNull(loanProductID);
+
+        /***
+         * Apply for loan application and verify loan status
+         */
+        final String savingsId = null;
+        final String principal = "12,000.00";
+
+        // Add charges with payment mode regular
+        List<HashMap> charges = new ArrayList<>();
+
+        Integer flatInstallmentFee = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "50", false));
+        addCharges(charges, flatInstallmentFee, "50", null);
+
+        List<HashMap> collaterals = new ArrayList<>();
+
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
+
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
+                String.valueOf(clientID), collateralId);
+        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
+
+        final Integer loanID = applyForLoanApplicationWithPaymentStrategyAndPastMonth(clientID, loanProductID, charges, savingsId,
+                principal, LoanApplicationTestBuilder.DEFAULT_STRATEGY, -4, collaterals);
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan(fourMonthsfromNow, loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount(fourMonthsfromNow, loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        final JournalEntry[] assetAccountInitialEntry = {
+                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.DEBIT) };
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, fourMonthsfromNow, assetAccountInitialEntry);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap firstInstallment = loanSchedule.get(1);
+        validateNumberForEqual("2290", String.valueOf(firstInstallment.get("totalOutstandingForPeriod")));
+
+        // Make payment for installment #1
+
+        fourMonthsfromNowCalendar.add(Calendar.MONTH, 1);
+
+        final String threeMonthsfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
+
+        LOAN_TRANSACTION_HELPER.makeRepayment(threeMonthsfromNow, Float.parseFloat("2290"), loanID);
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        firstInstallment = loanSchedule.get(1);
+        validateNumberForEqual("0.00", String.valueOf(firstInstallment.get("totalOutstandingForPeriod")));
+
+        // Make payment for installment #2
+        fourMonthsfromNowCalendar.add(Calendar.MONTH, 1);
+
+        final String twoMonthsfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
+
+        LOAN_TRANSACTION_HELPER.makeRepayment(twoMonthsfromNow, Float.parseFloat("2290"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, twoMonthsfromNow,
+                new JournalEntry(Float.parseFloat("2290"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("2000"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, twoMonthsfromNow,
+                new JournalEntry(Float.parseFloat("50"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("240"), JournalEntry.TransactionType.CREDIT));
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        Map secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("0.00", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
+
+        // Make payment for installment #3
+        // Pay 2290 more than expected
+        fourMonthsfromNowCalendar.add(Calendar.MONTH, 1);
+
+        final String oneMonthfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
+
+        LOAN_TRANSACTION_HELPER.makeRepayment(oneMonthfromNow, Float.parseFloat("4580"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, oneMonthfromNow,
+                new JournalEntry(Float.parseFloat("4580"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("4000"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, oneMonthfromNow,
+                new JournalEntry(Float.parseFloat("100"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("480"), JournalEntry.TransactionType.CREDIT));
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap thirdInstallment = loanSchedule.get(3);
+        validateNumberForEqual("0.00", String.valueOf(thirdInstallment.get("totalOutstandingForPeriod")));
+
+        // Make refund of 20
+        // max 2290 to refund. Pay 20 means only principal
+        // Default style refund order(principal, interest, fees and penalties
+        // paid: principal 2000, interest 240, fees 50, penalty 0
+        // refund 20 means paid: principal 1980, interest 240, fees 50, penalty
+        // 0
+
+        // FINERACT-885: As loan may not have started exactly four months ago,
+        // make final payment today and not four months from start (as that may be in the future)
+        fourMonthsfromNowCalendar.setTime(Date.from(Utils.getLocalDateOfTenant().atStartOfDay(Utils.getZoneIdOfTenant()).toInstant()));
+        final String now = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
+
+        LOAN_TRANSACTION_HELPER.makeRefundByCash(now, Float.parseFloat("20"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, now,
+                new JournalEntry(Float.parseFloat("20"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("20"), JournalEntry.TransactionType.DEBIT));
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap fourthInstallment = loanSchedule.get(4);
+        validateNumberForEqual("20.00", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
+        validateNumberForEqual("20.00", String.valueOf(fourthInstallment.get("principalOutstanding")));
+        validateNumberForEqual("0.00", String.valueOf(fourthInstallment.get("interestOutstanding")));
+        validateNumberForEqual("0.00", String.valueOf(fourthInstallment.get("feeChargesOutstanding")));
+
+        // Make refund of 2000
+        // max 2270 to refund. Pay 2000 means only principal
+        // paid: principal 1980, interest 240, fees 50, penalty 0
+        // refund 2000 means paid: principal 0, interest 220, fees 50, penalty 0
+
+        LOAN_TRANSACTION_HELPER.makeRefundByCash(now, Float.parseFloat("2000"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, now,
+                new JournalEntry(Float.parseFloat("2000"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("1980"), JournalEntry.TransactionType.DEBIT));
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, now,
+                new JournalEntry(Float.parseFloat("20"), JournalEntry.TransactionType.DEBIT));
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        fourthInstallment = loanSchedule.get(4);
+        validateNumberForEqual("2020.00", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
+        validateNumberForEqual("2000.00", String.valueOf(fourthInstallment.get("principalOutstanding")));
+        validateNumberForEqual("20.00", String.valueOf(fourthInstallment.get("interestOutstanding")));
+        validateNumberForEqual("0.00", String.valueOf(fourthInstallment.get("feeChargesOutstanding")));
+
+    }
+
+    /***
+     * Test case to verify Default style payment strategy
+     */
+    @Test
+    public void testLoanRefundByCashAccrualBasedAccounting() {
+        Calendar fourMonthsfromNowCalendar = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        fourMonthsfromNowCalendar.add(Calendar.MONTH, -4);
+
+        // FINERACT-885: If the loan starts on day 27-31th of month and not all months have that
+        // many days, then loan payment will get reset to a day of month less than today's day
+        // and 4th payment will be in the past. In such case, start the loan a few days later,
+        // so that 4th payment is guaranteed to be in the future.
+        if (fourMonthsfromNowCalendar.get(Calendar.DAY_OF_MONTH) > 27) {
+            fourMonthsfromNowCalendar.add(Calendar.DAY_OF_MONTH, 4);
+        }
+
+        String fourMonthsfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+
+        /***
+         * Create loan product with Default STYLE strategy
+         */
+
+        final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
+        final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
+        final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
+        final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
+
+        final Integer loanProductID = createLoanProduct("0", "0", LoanProductTestBuilder.DEFAULT_STRATEGY, ACCRUAL_UPFRONT, assetAccount,
+                incomeAccount, expenseAccount, overpaymentAccount);// ,
+        // LoanProductTestBuilder.EQUAL_INSTALLMENTS,
+        // LoanProductTestBuilder.FLAT_BALANCE);
+        Assertions.assertNotNull(loanProductID);
+
+        /***
+         * Apply for loan application and verify loan status
+         */
+        final String savingsId = null;
+        final String principal = "12,000.00";
+
+        // Add charges with payment mode regular
+        List<HashMap> charges = new ArrayList<>();
+
+        Integer flatInstallmentFee = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "50", false));
+        addCharges(charges, flatInstallmentFee, "50", null);
+
+        List<HashMap> collaterals = new ArrayList<>();
+
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
+        Assertions.assertNotNull(collateralId);
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
+                String.valueOf(clientID), collateralId);
+        Assertions.assertNotNull(clientCollateralId);
+        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
+
+        final Integer loanID = applyForLoanApplicationWithPaymentStrategyAndPastMonth(clientID, loanProductID, charges, savingsId,
+                principal, LoanApplicationTestBuilder.DEFAULT_STRATEGY, -4, collaterals);
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan(fourMonthsfromNow, loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount(fourMonthsfromNow, loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(Float.parseFloat("1440"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("300.00"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.DEBIT) };
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, fourMonthsfromNow, assetAccountInitialEntry);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap firstInstallment = loanSchedule.get(1);
+        validateNumberForEqual("2290", String.valueOf(firstInstallment.get("totalOutstandingForPeriod")));
+
+        // Make payment for installment #1
+
+        fourMonthsfromNowCalendar.add(Calendar.MONTH, 1);
+
+        final String threeMonthsfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
+
+        LOAN_TRANSACTION_HELPER.makeRepayment(threeMonthsfromNow, Float.parseFloat("2290"), loanID);
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        firstInstallment = loanSchedule.get(1);
+        validateNumberForEqual("0.00", String.valueOf(firstInstallment.get("totalOutstandingForPeriod")));
+
+        // Make payment for installment #2
+        fourMonthsfromNowCalendar.add(Calendar.MONTH, 1);
+
+        final String twoMonthsfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
+
+        LOAN_TRANSACTION_HELPER.makeRepayment(twoMonthsfromNow, Float.parseFloat("2290"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, twoMonthsfromNow,
+                new JournalEntry(Float.parseFloat("2290"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("2290"), JournalEntry.TransactionType.CREDIT));
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        Map secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("0.00", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
+
+        // Make payment for installment #3
+        // Pay 2290 more than expected
+        fourMonthsfromNowCalendar.add(Calendar.MONTH, 1);
+
+        final String oneMonthfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
+
+        LOAN_TRANSACTION_HELPER.makeRepayment(oneMonthfromNow, Float.parseFloat("4580"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, oneMonthfromNow,
+                new JournalEntry(Float.parseFloat("4580"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("4580"), JournalEntry.TransactionType.CREDIT));
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap thirdInstallment = loanSchedule.get(3);
+        validateNumberForEqual("0.00", String.valueOf(thirdInstallment.get("totalOutstandingForPeriod")));
+
+        // Make refund of 20
+        // max 2290 to refund. Pay 20 means only principal
+        // Default style refund order(principal, interest, fees and penalties
+        // paid: principal 2000, interest 240, fees 50, penalty 0
+        // refund 20 means paid: principal 1980, interest 240, fees 50, penalty
+        // 0
+
+        // FINERACT-885: As loan may not have started exactly four months ago,
+        // make final payment today and not four months from start (as that may be in the future)
+        fourMonthsfromNowCalendar.setTime(Date.from(Utils.getLocalDateOfTenant().atStartOfDay(Utils.getZoneIdOfTenant()).toInstant()));
+        final String now = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
+
+        LOAN_TRANSACTION_HELPER.makeRefundByCash(now, Float.parseFloat("20"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, now,
+                new JournalEntry(Float.parseFloat("20"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("20"), JournalEntry.TransactionType.DEBIT));
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap fourthInstallment = loanSchedule.get(4);
+        validateNumberForEqual("20.00", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
+        validateNumberForEqual("20.00", String.valueOf(fourthInstallment.get("principalOutstanding")));
+        validateNumberForEqual("0.00", String.valueOf(fourthInstallment.get("interestOutstanding")));
+        validateNumberForEqual("0.00", String.valueOf(fourthInstallment.get("feeChargesOutstanding")));
+
+        // Make refund of 2000
+        // max 2270 to refund. Pay 2000 means only principal
+        // paid: principal 1980, interest 240, fees 50, penalty 0
+        // refund 2000 means paid: principal 0, interest 220, fees 50, penalty 0
+
+        LOAN_TRANSACTION_HELPER.makeRefundByCash(now, Float.parseFloat("2000"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, now,
+                new JournalEntry(Float.parseFloat("2000"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("1980"), JournalEntry.TransactionType.DEBIT));
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, now,
+                new JournalEntry(Float.parseFloat("20"), JournalEntry.TransactionType.DEBIT));
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        fourthInstallment = loanSchedule.get(4);
+        validateNumberForEqual("2020.00", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
+        validateNumberForEqual("2000.00", String.valueOf(fourthInstallment.get("principalOutstanding")));
+        validateNumberForEqual("20.00", String.valueOf(fourthInstallment.get("interestOutstanding")));
+        validateNumberForEqual("0.00", String.valueOf(fourthInstallment.get("feeChargesOutstanding")));
+
+    }
+
+    @Test
+    public void testLoanRefundByTransferCashBasedAccounting() {
+
+        Calendar fourMonthsfromNowCalendar = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        fourMonthsfromNowCalendar.add(Calendar.MONTH, -4);
+
+        // FINERACT-885: If the loan starts on day 27-31th of month and not all months have that
+        // many days, then loan payment will get reset to a day of month less than today's day
+        // and 4th payment will be in the past. In such case, start the loan a few days later,
+        // so that 4th payment is guaranteed to be in the future.
+        if (fourMonthsfromNowCalendar.get(Calendar.DAY_OF_MONTH) > 27) {
+            fourMonthsfromNowCalendar.add(Calendar.DAY_OF_MONTH, 4);
+        }
+
+        String fourMonthsfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+
+        final Integer savingsProductID = createSavingsProduct(MINIMUM_OPENING_BALANCE);
+        Assertions.assertNotNull(savingsProductID);
+
+        final Integer savingsId = SAVINGS_ACCOUNT_HELPER.applyForSavingsApplication(clientID, savingsProductID, ACCOUNT_TYPE_INDIVIDUAL);
+        Assertions.assertNotNull(savingsProductID);
+
+        HashMap modifications = SAVINGS_ACCOUNT_HELPER.updateSavingsAccount(clientID, savingsProductID, savingsId, ACCOUNT_TYPE_INDIVIDUAL);
+        assertTrue(modifications.containsKey("submittedOnDate"));
+
+        HashMap savingsStatusHashMap = SavingsStatusChecker.getStatusOfSavings(REQUEST_SPEC, RESPONSE_SPEC, savingsId);
+        SavingsStatusChecker.verifySavingsIsPending(savingsStatusHashMap);
+
+        savingsStatusHashMap = SAVINGS_ACCOUNT_HELPER.approveSavings(savingsId);
+        SavingsStatusChecker.verifySavingsIsApproved(savingsStatusHashMap);
+
+        savingsStatusHashMap = SAVINGS_ACCOUNT_HELPER.activateSavings(savingsId);
+        SavingsStatusChecker.verifySavingsIsActive(savingsStatusHashMap);
+
+        /***
+         * Create loan product with Default STYLE strategy
+         */
+
+        final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
+        final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
+        final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
+        final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
+
+        final Integer loanProductID = createLoanProduct("0", "0", LoanProductTestBuilder.DEFAULT_STRATEGY, CASH_BASED, assetAccount,
+                incomeAccount, expenseAccount, overpaymentAccount);
+        Assertions.assertNotNull(loanProductID);
+
+        /***
+         * Apply for loan application and verify loan status
+         */
+
+        final String principal = "12,000.00";
+
+        // Add charges with payment mode regular
+        List<HashMap> charges = new ArrayList<>();
+
+        Integer flatInstallmentFee = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "50", false));
+        addCharges(charges, flatInstallmentFee, "50", null);
+
+        List<HashMap> collaterals = new ArrayList<>();
+
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
+        Assertions.assertNotNull(collateralId);
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
+                clientID.toString(), collateralId);
+        Assertions.assertNotNull(clientCollateralId);
+        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
+
+        final Integer loanID = applyForLoanApplicationWithPaymentStrategyAndPastMonth(clientID, loanProductID, charges, null, principal,
+                LoanApplicationTestBuilder.DEFAULT_STRATEGY, -4, collaterals);
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan(fourMonthsfromNow, loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount(fourMonthsfromNow, loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        final JournalEntry[] assetAccountInitialEntry = {
+                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.DEBIT) };
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, fourMonthsfromNow, assetAccountInitialEntry);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap firstInstallment = loanSchedule.get(1);
+        validateNumberForEqual("2290", String.valueOf(firstInstallment.get("totalOutstandingForPeriod")));
+
+        // Make payment for installment #1
+
+        fourMonthsfromNowCalendar.add(Calendar.MONTH, 1);
+
+        final String threeMonthsfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
+
+        LOAN_TRANSACTION_HELPER.makeRepayment(threeMonthsfromNow, Float.parseFloat("2290"), loanID);
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        firstInstallment = loanSchedule.get(1);
+        validateNumberForEqual("0.00", String.valueOf(firstInstallment.get("totalOutstandingForPeriod")));
+
+        // Make payment for installment #2
+        fourMonthsfromNowCalendar.add(Calendar.MONTH, 1);
+
+        final String twoMonthsfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
+
+        LOAN_TRANSACTION_HELPER.makeRepayment(twoMonthsfromNow, Float.parseFloat("2290"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, twoMonthsfromNow,
+                new JournalEntry(Float.parseFloat("2290"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("2000"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, twoMonthsfromNow,
+                new JournalEntry(Float.parseFloat("50"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("240"), JournalEntry.TransactionType.CREDIT));
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        Map secondInstallment = loanSchedule.get(2);
+        validateNumberForEqual("0.00", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
+
+        // Make payment for installment #3
+        // Pay 2290 more than expected
+        fourMonthsfromNowCalendar.add(Calendar.MONTH, 1);
+
+        final String oneMonthfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
+
+        LOAN_TRANSACTION_HELPER.makeRepayment(oneMonthfromNow, Float.parseFloat("4580"), loanID);
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, oneMonthfromNow,
+                new JournalEntry(Float.parseFloat("4580"), JournalEntry.TransactionType.DEBIT),
+                new JournalEntry(Float.parseFloat("4000"), JournalEntry.TransactionType.CREDIT));
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, oneMonthfromNow,
+                new JournalEntry(Float.parseFloat("100"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("480"), JournalEntry.TransactionType.CREDIT));
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap thirdInstallment = loanSchedule.get(3);
+        validateNumberForEqual("0.00", String.valueOf(thirdInstallment.get("totalOutstandingForPeriod")));
+
+        // Make refund of 20
+        // max 2290 to refund. Pay 20 means only principal
+        // Default style refund order(principal, interest, fees and penalties
+        // paid: principal 2000, interest 240, fees 50, penalty 0
+        // refund 20 means paid: principal 1980, interest 240, fees 50, penalty
+        // 0
+
+        Float transferAmountValue = 20f;
+
+        // FINERACT-885: As loan may not have started exactly four months ago,
+        // make final payment today and not four months from start (as that may be in the future)
+        fourMonthsfromNowCalendar.setTime(Date.from(Utils.getLocalDateOfTenant().atStartOfDay(Utils.getZoneIdOfTenant()).toInstant()));
+        final String now = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
+
+        final String FROM_LOAN_ACCOUNT_TYPE = "1";
+        final String TO_SAVINGS_ACCOUNT_TYPE = "2";
+
+        ACCOUNT_TRANSFER_HELPER.refundLoanByTransfer(now, clientID, loanID, clientID, savingsId, FROM_LOAN_ACCOUNT_TYPE,
+                TO_SAVINGS_ACCOUNT_TYPE, transferAmountValue.toString());
+
+        Float toSavingsBalance = Float.parseFloat(MINIMUM_OPENING_BALANCE);
+
+        HashMap toSavingsSummaryAfter = SAVINGS_ACCOUNT_HELPER.getSavingsSummary(savingsId);
+
+        toSavingsBalance += transferAmountValue;
+
+        // Verifying toSavings Account Balance after Account Transfer
+        assertEquals(toSavingsBalance, toSavingsSummaryAfter.get("accountBalance"),
+                "Verifying From Savings Account Balance after Account Transfer");
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, now,
+                new JournalEntry(Float.parseFloat("20"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("20"), JournalEntry.TransactionType.DEBIT));
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        HashMap fourthInstallment = loanSchedule.get(4);
+        validateNumberForEqual("20.00", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
+        validateNumberForEqual("20.00", String.valueOf(fourthInstallment.get("principalOutstanding")));
+        validateNumberForEqual("0.00", String.valueOf(fourthInstallment.get("interestOutstanding")));
+        validateNumberForEqual("0.00", String.valueOf(fourthInstallment.get("feeChargesOutstanding")));
+
+        // Make refund of 2000
+        // max 2270 to refund. Pay 2000 means only principal
+        // paid: principal 1980, interest 240, fees 50, penalty 0
+        // refund 2000 means paid: principal 0, interest 220, fees 50, penalty 0
+        // final String now = Utils.convertDate(fourMonthsfromNowCalendar);
+
+        transferAmountValue = 2000f;
+
+        ACCOUNT_TRANSFER_HELPER.refundLoanByTransfer(now, clientID, loanID, clientID, savingsId, FROM_LOAN_ACCOUNT_TYPE,
+                TO_SAVINGS_ACCOUNT_TYPE, transferAmountValue.toString());
+
+        toSavingsSummaryAfter = SAVINGS_ACCOUNT_HELPER.getSavingsSummary(savingsId);
+
+        toSavingsBalance += transferAmountValue;
+
+        // Verifying toSavings Account Balance after Account Transfer
+        assertEquals(toSavingsBalance, toSavingsSummaryAfter.get("accountBalance"),
+                "Verifying From Savings Account Balance after Account Transfer");
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForAssetAccount(assetAccount, now,
+                new JournalEntry(Float.parseFloat("2000"), JournalEntry.TransactionType.CREDIT),
+                new JournalEntry(Float.parseFloat("1980"), JournalEntry.TransactionType.DEBIT));
+
+        JOURNAL_ENTRY_HELPER.checkJournalEntryForIncomeAccount(incomeAccount, now,
+                new JournalEntry(Float.parseFloat("20"), JournalEntry.TransactionType.DEBIT));
+
+        loanSchedule.clear();
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        fourthInstallment = loanSchedule.get(4);
+        validateNumberForEqual("2020.00", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
+        validateNumberForEqual("2000.00", String.valueOf(fourthInstallment.get("principalOutstanding")));
+        validateNumberForEqual("20.00", String.valueOf(fourthInstallment.get("interestOutstanding")));
+        validateNumberForEqual("0.00", String.valueOf(fourthInstallment.get("feeChargesOutstanding")));
+
+    }
+
+    @Test
+    public void testLoanProductConfiguration() {
+        final String proposedAmount = "5000";
+        JsonObject loanProductConfigurationAsTrue = new JsonObject();
+        loanProductConfigurationAsTrue = createLoanProductConfigurationDetail(loanProductConfigurationAsTrue, true);
+
+        JsonObject loanProductConfigurationAsFalse = new JsonObject();
+        loanProductConfigurationAsFalse = createLoanProductConfigurationDetail(loanProductConfigurationAsFalse, false);
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC, "01 January 2012");
+        Integer loanProductID = LOAN_TRANSACTION_HELPER
+                .getLoanProductId(new LoanProductTestBuilder().withAmortizationTypeAsEqualInstallments().withRepaymentTypeAsMonth()
+                        .withRepaymentAfterEvery("1").withRepaymentStrategy(LoanProductTestBuilder.DEFAULT_STRATEGY)
+                        .withInterestTypeAsDecliningBalance().withInterestCalculationPeriodTypeAsDays().withInArrearsTolerance("10")
+                        .withMoratorium("2", "3").withLoanProductConfiguration(loanProductConfigurationAsTrue).build(null));
+        LOG.info("-----------------------LOAN PRODUCT CREATED WITH ATTRIBUTE CONFIGURATION AS TRUE-------------------------- {}",
+                loanProductID);
+        Integer loanID = applyForLoanApplicationWithProductConfigurationAsTrue(clientID, loanProductID, proposedAmount);
+        LOG.info("------------------------LOAN CREATED WITH ID------------------------------{}", loanID);
+
+        loanProductID = LOAN_TRANSACTION_HELPER.getLoanProductId(new LoanProductTestBuilder().withAmortizationTypeAsEqualInstallments()
+                .withRepaymentTypeAsMonth().withRepaymentAfterEvery("1").withRepaymentStrategy(LoanProductTestBuilder.DEFAULT_STRATEGY)
+                .withInterestTypeAsDecliningBalance().withInterestCalculationPeriodTypeAsDays().withInArrearsTolerance("10")
+                .withMoratorium("2", "3").withLoanProductConfiguration(loanProductConfigurationAsFalse).build(null));
+        LOG.info("-------------------LOAN PRODUCT CREATED WITH ATTRIBUTE CONFIGURATION AS FALSE---------------------- {}", loanProductID);
+        /*
+         * Try to override attribute values in loan account when attribute configurations are set to false at product
+         * level
+         */
+        loanID = applyForLoanApplicationWithProductConfigurationAsFalse(clientID, loanProductID, proposedAmount);
+        LOG.info("--------------------------LOAN CREATED WITH ID------------------------- {}", loanID);
+        validateIfValuesAreNotOverridden(loanID, loanProductID);
+    }
+
+    /**
+     * Test case to verify Loan Foreclosure.
+     */
+    @Test
+    public void testLoanForeclosure() {
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+        final Integer loanProductID = createLoanProduct(false, NONE);
+
+        List<HashMap> charges = new ArrayList<>();
+
+        Integer flatAmountChargeOne = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "50", false));
+        addCharges(charges, flatAmountChargeOne, "50", "01 October 2011");
+        Integer flatAmountChargeTwo = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "100", true));
+        addCharges(charges, flatAmountChargeTwo, "100", "15 December 2011");
+
+        List<HashMap> collaterals = new ArrayList<>();
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
+        Assertions.assertNotNull(collateralId);
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
+                String.valueOf(clientID), collateralId);
+        Assertions.assertNotNull(clientCollateralId);
+        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
+
+        final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges, null, "10,000.00", collaterals);
+        Assertions.assertNotNull(loanID);
+
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        LOG.info("----------------------------------- APPROVE LOAN -----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("20 September 2011", loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("----------------------------------- DISBURSE LOAN ----------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID, "10,000.00",
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LOG.info("DISBURSE {}", loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        LOG.info("---------------------------------- Make repayment 1 --------------------------------------");
+        LOAN_TRANSACTION_HELPER.makeRepayment("20 October 2011", Float.parseFloat("2676.24"), loanID);
+
+        LOG.info("---------------------------------- FORECLOSE LOAN ----------------------------------------");
+        LOAN_TRANSACTION_HELPER.forecloseLoan("08 November 2011", loanID);
+
+        // retrieving the loan status
+        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        // verifying the loan status is closed
+        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
+        // retrieving the loan sub-status
+        loanStatusHashMap = LoanStatusChecker.getSubStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        // verifying the loan sub-status is foreclosed
+        LoanStatusChecker.verifyLoanAccountForeclosed(loanStatusHashMap);
+
+    }
+
+    @Test
+    public void testLoanScheduleWithInterestRecalculation_WITH_INTEREST_FIRST_STRATEGY_AND_REST_DAILY_INTEREST_COMPOUND_INTEREST_STRATEGY_REDUCE_NUMBER_OF_INSTALLMENTS() {
+
+        DateFormat dateFormat = new SimpleDateFormat(DATETIME_PATTERN, Locale.US);
+        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
+
+        Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -14);
+        final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
+        Integer dayOfWeek = getDayOfWeek(todaysDate);
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+        final Integer loanProductID = createLoanProductWithInterestRecalculationAndCompoundingDetails(
+                LoanProductTestBuilder.INTEREST_PRINCIPAL_PENALTIES_FEES_ORDER_STRATEGY,
+                LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_INTEREST,
+                LoanProductTestBuilder.RECALCULATION_STRATEGY_REDUCE_NUMBER_OF_INSTALLMENTS,
+                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_DAILY, "1", LOAN_DISBURSEMENT_DATE,
+                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_WEEKLY, "1", LOAN_DISBURSEMENT_DATE,
+                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, null, null, dayOfWeek, null, dayOfWeek);
+
+        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, LOAN_DISBURSEMENT_DATE,
+                LoanApplicationTestBuilder.INTEREST_PRINCIPAL_PENALTIES_FEES_ORDER_STRATEGY, new ArrayList<HashMap>(0));
+
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        List<Map<String, Object>> expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
+
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.54", "46.37", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.67", "23.24", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2529.03", "11.67", "0.0", "0.0");
+
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanFutureRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, 0, false, "4965.3", "92.52", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.67", "23.24", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2529.03", "11.67", "0.0", "0.0");
+
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues, 0);
+
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -7);
+        final String LOAN_FIRST_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
+        Float totalDueForCurrentPeriod = (Float) loanSchedule.get(1).get("totalDueForPeriod");
+        LOAN_TRANSACTION_HELPER.makeRepayment(LOAN_FIRST_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        Float earlyPayment = Float.parseFloat("4000");
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -5);
+        final String LOAN_SECOND_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
+        LOAN_TRANSACTION_HELPER.makeRepayment(LOAN_SECOND_REPAYMENT_DATE, earlyPayment, loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        Calendar today = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        Map<String, Object> paymentday = new HashMap<>(3);
+        paymentday.put("dueDate", getDateAsArray(today, -5, Calendar.DAY_OF_MONTH));
+        paymentday.put("principalDue", "3990.09");
+        paymentday.put("interestDue", "9.91");
+        paymentday.put("feeChargesDue", "0");
+        paymentday.put("penaltyChargesDue", "0");
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
+        expectedvalues.add(paymentday);
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.31", "11.6", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "1009.84", "4.66", "0.0", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        HashMap prepayDetail = LOAN_TRANSACTION_HELPER.getPrepayAmount(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        String prepayAmount = String.valueOf(prepayDetail.get("amount"));
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        final String loanRepaymentDate = dateFormat.format(todaysDate.getTime());
+        LOAN_TRANSACTION_HELPER.makeRepayment(loanRepaymentDate, Float.parseFloat(prepayAmount), loanID);
+        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
+
+    }
+
+    @Test
+    public void testLoanScheduleWithInterestRecalculation_WITH_INTEREST_FIRST_STRATEGY_AND_REST_DAILY_INTEREST_COMPOUND_INTEREST_STRATEGY_REDUCE_NUMBER_OF_INSTALLMENTS_EARLY_REPAYMENT() {
+
+        DateFormat dateFormat = new SimpleDateFormat(DATETIME_PATTERN, Locale.US);
+        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
+
+        Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -14);
+        final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
+        Integer dayOfWeek = getDayOfWeek(todaysDate);
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+        final Integer loanProductID = createLoanProductWithInterestRecalculationAndCompoundingDetails(
+                LoanProductTestBuilder.INTEREST_PRINCIPAL_PENALTIES_FEES_ORDER_STRATEGY,
+                LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_INTEREST,
+                LoanProductTestBuilder.RECALCULATION_STRATEGY_REDUCE_NUMBER_OF_INSTALLMENTS,
+                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_DAILY, "1", LOAN_DISBURSEMENT_DATE,
+                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_WEEKLY, "1", LOAN_DISBURSEMENT_DATE,
+                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, null, null, dayOfWeek, null, dayOfWeek);
+
+        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, LOAN_DISBURSEMENT_DATE,
+                LoanApplicationTestBuilder.INTEREST_PRINCIPAL_PENALTIES_FEES_ORDER_STRATEGY, new ArrayList<HashMap>(0));
+
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        List<Map<String, Object>> expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
+
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.54", "46.37", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.67", "23.24", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2529.03", "11.67", "0.0", "0.0");
+
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanFutureRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, 0, false, "4965.3", "92.52", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.67", "23.24", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2529.03", "11.67", "0.0", "0.0");
+
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues, 0);
+
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -7);
+        final String LOAN_FIRST_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
+        Float totalDueForCurrentPeriod = (Float) loanSchedule.get(1).get("totalDueForPeriod");
+        LOAN_TRANSACTION_HELPER.makeRepayment(LOAN_FIRST_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        // early repayment - pay exact due amount 2 days before due date
+        Float earlyPayment = Float.parseFloat("2528.91");
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -2);
+        final String LOAN_SECOND_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
+        LOAN_TRANSACTION_HELPER.makeRepayment(LOAN_SECOND_REPAYMENT_DATE, earlyPayment, loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        Calendar today = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
+        // early-repayment
+        addRepaymentValues(expectedvalues, todaysDate, 5, true, "2504.13", "24.78", "0.0", "0.0");
+
+        addRepaymentValues(expectedvalues, todaysDate, 2, true, "2522.33", "6.58", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2490.78", "11.5", "0.0", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
+        HashMap prepayDetail = LOAN_TRANSACTION_HELPER.getPrepayAmount(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        String prepayAmount = String.valueOf(prepayDetail.get("amount"));
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        final String loanRepaymentDate = dateFormat.format(todaysDate.getTime());
+        LOAN_TRANSACTION_HELPER.makeRepayment(loanRepaymentDate, Float.parseFloat(prepayAmount), loanID);
+        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
+
+    }
+
+    @Test
+    public void testLoanScheduleWithInterestRecalculationMakePrepaymentAfterRepayment() {
+
+        DateFormat dateFormat = new SimpleDateFormat(DATETIME_PATTERN, Locale.US);
+        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
+        GlobalConfigurationHelper.updateEnabledFlagForGlobalConfiguration(REQUEST_SPEC, RESPONSE_SPEC, "42", true);
+        Calendar startDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        Calendar currentDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        startDate.add(Calendar.MONTH, -8);
+
+        Calendar firstRepaymentDate = (Calendar) startDate.clone();
+        firstRepaymentDate.add(Calendar.MONTH, 1);
+        firstRepaymentDate.add(Calendar.DAY_OF_MONTH, firstRepaymentDate.getActualMaximum(Calendar.DAY_OF_MONTH) - Calendar.DAY_OF_MONTH);
+        String firstRepayment = dateFormat.format(firstRepaymentDate.getTime());
+
+        final String loanDisbursementDate = dateFormat.format(startDate.getTime());
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+        final Integer loanProductID = createLoanProductWithInterestRecalculationAndCompoundingDetails(
+                LoanProductTestBuilder.INTEREST_PRINCIPAL_PENALTIES_FEES_ORDER_STRATEGY,
+                LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_NONE,
+                LoanProductTestBuilder.RECALCULATION_STRATEGY_REDUCE_NUMBER_OF_INSTALLMENTS,
+                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_SAME_AS_REPAYMENT_PERIOD,
+                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, null, "12");
+
+        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, loanDisbursementDate,
+                LoanApplicationTestBuilder.INTEREST_PRINCIPAL_PENALTIES_FEES_ORDER_STRATEGY, firstRepayment);
+
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan(loanDisbursementDate, loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount(loanDisbursementDate, loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        Assertions.assertNotNull(loanSchedule);
+        startDate.add(Calendar.DAY_OF_MONTH, 2);
+        String loanFirstRepaymentDate = dateFormat.format(startDate.getTime());
+        //
+        Float earlyPayment = Float.parseFloat("3000");
+        LOAN_TRANSACTION_HELPER.makeRepayment(loanFirstRepaymentDate, earlyPayment, loanID);
+
+        HashMap prepayDetail = LOAN_TRANSACTION_HELPER.getPrepayAmount(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        String prepayAmount = String.valueOf(prepayDetail.get("amount"));
+        String loanPrepaymentDate = dateFormat.format(currentDate.getTime());
+        LOAN_TRANSACTION_HELPER.makeRepayment(loanPrepaymentDate, Float.parseFloat(prepayAmount), loanID);
+        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
+        GlobalConfigurationHelper.updateEnabledFlagForGlobalConfiguration(REQUEST_SPEC, RESPONSE_SPEC, "42", false);
+    }
+
+    @Test
+    public void testLoanScheduleWithInterestRecalculationMakeAdvancePaymentTillSettlement() {
+
+        final ResponseSpecification errorResponse = new ResponseSpecBuilder().expectStatusCode(403).build();
+        final LoanTransactionHelper validationErrorHelper = new LoanTransactionHelper(REQUEST_SPEC, errorResponse);
+        DateFormat dateFormat = new SimpleDateFormat(DATETIME_PATTERN, Locale.US);
+        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
+        GlobalConfigurationHelper.updateEnabledFlagForGlobalConfiguration(REQUEST_SPEC, RESPONSE_SPEC, "42", true);
+        Calendar startDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        Calendar currentDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        startDate.add(Calendar.MONTH, -8);
+
+        Calendar firstRepaymentDate = (Calendar) startDate.clone();
+        firstRepaymentDate.add(Calendar.MONTH, 1);
+        firstRepaymentDate.add(Calendar.DAY_OF_MONTH, firstRepaymentDate.getActualMaximum(Calendar.DAY_OF_MONTH) - Calendar.DAY_OF_MONTH);
+        String firstRepayment = dateFormat.format(firstRepaymentDate.getTime());
+
+        final String loanDisbursementDate = dateFormat.format(startDate.getTime());
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+        final Integer loanProductID = createLoanProductWithInterestRecalculationAndCompoundingDetails(
+                LoanProductTestBuilder.INTEREST_PRINCIPAL_PENALTIES_FEES_ORDER_STRATEGY,
+                LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_NONE,
+                LoanProductTestBuilder.RECALCULATION_STRATEGY_REDUCE_NUMBER_OF_INSTALLMENTS,
+                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_SAME_AS_REPAYMENT_PERIOD,
+                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, null, "12");
+
+        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, loanDisbursementDate,
+                LoanApplicationTestBuilder.INTEREST_PRINCIPAL_PENALTIES_FEES_ORDER_STRATEGY, firstRepayment);
+
+        Assertions.assertNotNull(loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan(loanDisbursementDate, loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount(loanDisbursementDate, loanID,
+                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        Assertions.assertNotNull(loanSchedule);
+        Calendar repaymentDate = (Calendar) firstRepaymentDate.clone();
+        startDate.add(Calendar.DAY_OF_MONTH, 2);
+        String loanFirstRepaymentDate = dateFormat.format(startDate.getTime());
+        //
+        Float earlyPayment = Float.parseFloat("3000");
+        String retrieveDueDate = null;
+        Float amount = null;
+        LOAN_TRANSACTION_HELPER.makeRepayment(loanFirstRepaymentDate, earlyPayment, loanID);
+        for (int i = 1; i < loanSchedule.size(); i++) {
+
+            retrieveDueDate = dateFormat.format(repaymentDate.getTime());
+            amount = (Float) loanSchedule.get(i).get("principalOriginalDue") + (Float) loanSchedule.get(i).get("interestOriginalDue");
+            if (currentDate.after(repaymentDate)) {
+                LOAN_TRANSACTION_HELPER.makeRepayment(retrieveDueDate, amount, loanID);
+            } else {
+                break;
+            }
+            repaymentDate.add(Calendar.MONTH, 1);
+        }
+        HashMap savingsAccountErrorData = validationErrorHelper.makeRepayment(retrieveDueDate, amount, loanID);
+        ArrayList<HashMap> error = (ArrayList<HashMap>) savingsAccountErrorData.get("errors");
+        assertEquals("error.msg.loan.transaction.cannot.be.a.future.date", error.get(0).get("userMessageGlobalisationCode"));
+        GlobalConfigurationHelper.updateEnabledFlagForGlobalConfiguration(REQUEST_SPEC, RESPONSE_SPEC, "42", false);
+    }
+
+    @Test
+    public void testCollateralDataIsAvailableWhenRequested() {
+        // given
+
+        Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
+        List<HashMap> collaterals = new ArrayList<>();
+        Integer clientId = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientId);
+
+        Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
+                String.valueOf(clientId), collateralId);
+        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
+
+        Integer loanProductId = createLoanProduct(false, NONE);
+
+        // when
+        Integer loanId = applyForLoanApplication(clientId, loanProductId, null, null, "12,000.00", collaterals);
+
+        // then
+        List<Integer> clientCollateralIds = LOAN_TRANSACTION_HELPER.getLoanDetail(REQUEST_SPEC, RESPONSE_SPEC, loanId,
+                "collateral.clientCollateralId");
+        Integer clientCollateralIdResult = clientCollateralIds.get(0);
+        assertEquals(clientCollateralId, clientCollateralIdResult);
+    }
+
+    @Test
+    public void undoWaivedChargeTransactionDoesNotExist() {
+        LoanTransactionHelper loanTransactionHelper = new LoanTransactionHelper(REQUEST_SPEC, createResponseSpecification(404));
+        HashMap response = loanTransactionHelper.undoWaiveChargesForLoan(-1, -2, "");
+        assertEquals("error.msg.loan.transaction.id.invalid",
+                ((Map) ((List) response.get("errors")).get(0)).get("userMessageGlobalisationCode"));
+        assertEquals("Transaction with identifier -2 does not exist for loan with identifier -1.",
+                ((Map) ((List) response.get("errors")).get(0)).get("defaultUserMessage"));
+    }
+
+    @Test
+    public void chargeAdjustmentChargeWrongParams() {
+        CallFailedRuntimeException exception = assertThrows(CallFailedRuntimeException.class,
+                () -> LOAN_TRANSACTION_HELPER.chargeAdjustment(0L, 0L, new PostLoansLoanIdChargesChargeIdRequest().amount(0.0)));
+        assertEquals(400, exception.getResponse().code());
+        assertTrue(exception.getMessage().contains("validation.msg.loan.charge.adjustment.request.amount.not.greater.than.zero"));
+        assertTrue(exception.getMessage().contains("validation.msg.loan.charge.adjustment.request.loanId.not.greater.than.zero"));
+        assertTrue(exception.getMessage().contains("validation.msg.loan.charge.adjustment.request.loanChargeId.not.greater.than.zero"));
+        exception = assertThrows(CallFailedRuntimeException.class,
+                () -> LOAN_TRANSACTION_HELPER.chargeAdjustment(1L, 0L, new PostLoansLoanIdChargesChargeIdRequest().amount(0.0)));
+        assertEquals(400, exception.getResponse().code());
+        assertTrue(exception.getMessage().contains("validation.msg.loan.charge.adjustment.request.amount.not.greater.than.zero"));
+        assertTrue(exception.getMessage().contains("validation.msg.loan.charge.adjustment.request.loanChargeId.not.greater.than.zero"));
+        exception = assertThrows(CallFailedRuntimeException.class,
+                () -> LOAN_TRANSACTION_HELPER.chargeAdjustment(1L, 1L, new PostLoansLoanIdChargesChargeIdRequest().amount(0.0)));
+        assertEquals(400, exception.getResponse().code());
+        assertTrue(exception.getMessage().contains("validation.msg.loan.charge.adjustment.request.amount.not.greater.than.zero"));
+    }
+
+    @Test
+    public void chargeAdjustmentChargeDoesNotExist() {
+        final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
+        final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
+        final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
+        final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
+
+        final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterest(assetAccount, incomeAccount, expenseAccount,
+                overpaymentAccount);
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC, "01 January 2011");
+
+        final Integer loanID = applyForLoanApplication(clientID, loanProductID);
+
+        CallFailedRuntimeException exception = assertThrows(CallFailedRuntimeException.class,
+                () -> LOAN_TRANSACTION_HELPER.chargeAdjustment((long) loanID, 1L, new PostLoansLoanIdChargesChargeIdRequest().amount(1.0)));
+        assertEquals(404, exception.getResponse().code());
+        assertTrue(exception.getMessage().contains("error.msg.loanCharge.id.invalid"));
+    }
+
+    @Test
+    public void chargeAdjustmentChargeDoesNotExistForLoan() {
+        final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
+        final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
+        final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
+        final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
+
+        final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterest(assetAccount, incomeAccount, expenseAccount,
+                overpaymentAccount);
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC, "01 January 2011");
+
+        final Integer loanID = applyForLoanApplication(clientID, loanProductID);
+
+        HashMap<String, Object> loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("02 September 2022", loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("03 September 2022", loanID, "1000");
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        Integer penalty = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "10", true));
+        LocalDate targetDate = LocalDate.of(2022, 9, 7);
+        final String penaltyCharge1AddedDate = DATE_TIME_FORMATTER.format(targetDate);
+        Integer penalty1LoanChargeId = LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID,
+                LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(penalty), penaltyCharge1AddedDate, "10"));
+
+        final Integer loanID2 = applyForLoanApplication(clientID, loanProductID);
+
+        CallFailedRuntimeException exception = assertThrows(CallFailedRuntimeException.class, () -> LOAN_TRANSACTION_HELPER
+                .chargeAdjustment((long) loanID2, (long) penalty1LoanChargeId, new PostLoansLoanIdChargesChargeIdRequest().amount(1.0)));
+        assertEquals(404, exception.getResponse().code());
+        assertTrue(exception.getMessage().contains("error.msg.loanCharge.id.invalid.for.given.loan"));
+    }
+
+    @Test
+    public void chargeAdjustmentForUnpaidCharge() {
+        try {
+            GlobalConfigurationHelper.updateIsBusinessDateEnabled(REQUEST_SPEC, RESPONSE_SPEC, Boolean.TRUE);
+            BUSINESS_DATE_HELPER.updateBusinessDate(new BusinessDateRequest().type(BusinessDateType.BUSINESS_DATE.getName())
+                    .date("01 November 2022").dateFormat(DATETIME_PATTERN).locale("en"));
+            final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
+            final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
+            final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
+            final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
+
+            Integer penalty = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                    ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "10", true));
+            final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterest(assetAccount, incomeAccount,
+                    expenseAccount, overpaymentAccount);
+
+            final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC, "01 January 2011");
+
+            final Integer loanID = applyForLoanApplication(clientID, loanProductID);
+
+            HashMap<String, Object> loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+            LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+            loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("02 September 2022", loanID);
+            LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+            LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+            loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("03 September 2022", loanID, "1000");
+            LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+            ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+            assertEquals(2, loanSchedule.size());
+            assertEquals(0, loanSchedule.get(1).get("penaltyChargesDue"));
+            assertEquals(0, loanSchedule.get(1).get("penaltyChargesOutstanding"));
+            assertEquals(1000.0f, loanSchedule.get(1).get("totalDueForPeriod"));
+            assertEquals(1000.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
+            LocalDate targetDate = LocalDate.of(2022, 9, 7);
+            final String penaltyCharge1AddedDate = DATE_TIME_FORMATTER.format(targetDate);
+            Integer penalty1LoanChargeId = LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID,
+                    LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(penalty), penaltyCharge1AddedDate, "10"));
+
+            LOAN_TRANSACTION_HELPER.noAccrualTransactionForRepayment(loanID);
+
+            loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+            assertEquals(2, loanSchedule.size());
+            assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue"));
+            assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesOutstanding"));
+            assertEquals(1010.0f, loanSchedule.get(1).get("totalDueForPeriod"));
+            assertEquals(1010.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
+            assertEquals(0, loanSchedule.get(1).get("totalWaivedForPeriod"));
+
+            HashMap loanSummary = LOAN_TRANSACTION_HELPER.getLoanDetail(REQUEST_SPEC, RESPONSE_SPEC, loanID, "summary");
+            assertEquals(10.0f, loanSummary.get("penaltyChargesCharged"));
+            assertEquals(10.0f, loanSummary.get("penaltyChargesOutstanding"));
+            assertEquals(0.0f, loanSummary.get("penaltyChargesWaived"));
+            assertEquals(1010.0f, loanSummary.get("totalOutstanding"));
+            assertEquals(0.0f, loanSummary.get("totalWaived"));
+
+            String externalId = UUID.randomUUID().toString();
+            PostLoansLoanIdChargesChargeIdResponse chargeAdjustmentResponse = LOAN_TRANSACTION_HELPER.chargeAdjustment((long) loanID,
+                    (long) penalty1LoanChargeId,
+                    new PostLoansLoanIdChargesChargeIdRequest().amount(10.0).externalId(externalId).paymentTypeId(1L));
+
+            loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+            assertEquals(2, loanSchedule.size());
+            assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue"));
+            assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesPaid"));
+            assertEquals(0.0f, loanSchedule.get(1).get("penaltyChargesOutstanding"));
+            assertEquals(1010.0f, loanSchedule.get(1).get("totalDueForPeriod"));
+            assertEquals(1000.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
+            assertEquals(10.0f, loanSchedule.get(1).get("totalPaidForPeriod"));
+
+            loanSummary = LOAN_TRANSACTION_HELPER.getLoanDetail(REQUEST_SPEC, RESPONSE_SPEC, loanID, "summary");
+            assertEquals(10.0f, loanSummary.get("penaltyChargesCharged"));
+            assertEquals(0.0f, loanSummary.get("penaltyChargesOutstanding"));
+            assertEquals(10.0f, loanSummary.get("penaltyChargesPaid"));
+            assertEquals(1000.0f, loanSummary.get("totalOutstanding"));
+
+            GetLoansLoanIdTransactionsTransactionIdResponse chargeAdjustmentTransaction = LOAN_TRANSACTION_HELPER
+                    .getLoanTransactionDetails((long) loanID, chargeAdjustmentResponse.getSubResourceId());
+            assertEquals(10.0, chargeAdjustmentTransaction.getAmount());
+            assertEquals(10.0, chargeAdjustmentTransaction.getPenaltyChargesPortion());
+            assertEquals("loanTransactionType.chargeAdjustment", chargeAdjustmentTransaction.getType().getCode());
+            assertEquals(externalId, chargeAdjustmentTransaction.getExternalId());
+            GetLoanTransactionRelation transactionRelation = chargeAdjustmentTransaction.getTransactionRelations().iterator().next();
+            assertEquals(chargeAdjustmentResponse.getSubResourceId(), transactionRelation.getFromLoanTransaction());
+            assertEquals((long) penalty1LoanChargeId, transactionRelation.getToLoanCharge());
+            assertEquals("CHARGE_ADJUSTMENT", transactionRelation.getRelationType());
+            assertEquals(1L, chargeAdjustmentTransaction.getPaymentDetailData().getPaymentType().getId());
+
+            PostLoansLoanIdTransactionsResponse repaymentResult = LOAN_TRANSACTION_HELPER.makeLoanRepayment((long) loanID,
+                    new PostLoansLoanIdTransactionsRequest().dateFormat(DATETIME_PATTERN).transactionDate("06 September 2022").locale("en")
+                            .transactionAmount(5.0));
+
+            loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+            assertEquals(2, loanSchedule.size());
+            assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue"));
+            assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesPaid"));
+            assertEquals(0.0f, loanSchedule.get(1).get("penaltyChargesOutstanding"));
+            assertEquals(1000.0f, loanSchedule.get(1).get("principalDue"));
+            assertEquals(5.0f, loanSchedule.get(1).get("principalPaid"));
+            assertEquals(995.0f, loanSchedule.get(1).get("principalOutstanding"));
+            assertEquals(1010.0f, loanSchedule.get(1).get("totalDueForPeriod"));
+            assertEquals(995.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
+            assertEquals(15.0f, loanSchedule.get(1).get("totalPaidForPeriod"));
+
+            loanSummary = LOAN_TRANSACTION_HELPER.getLoanDetail(REQUEST_SPEC, RESPONSE_SPEC, loanID, "summary");
+            assertEquals(10.0f, loanSummary.get("penaltyChargesCharged"));
+            assertEquals(0.0f, loanSummary.get("penaltyChargesOutstanding"));
+            assertEquals(10.0f, loanSummary.get("penaltyChargesPaid"));
+            assertEquals(1000.0f, loanSummary.get("principalDisbursed"));
+            assertEquals(995.0f, loanSummary.get("principalOutstanding"));
+            assertEquals(5.0f, loanSummary.get("principalPaid"));
+            assertEquals(995.0f, loanSummary.get("totalOutstanding"));
+
+            GetLoansLoanIdResponse loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+            GetLoansLoanIdTransactions replayedTransaction = loanDetails.getTransactions().stream()
+                    .filter(t -> externalId.equals(t.getExternalId())).findFirst().get();
+
+            assertEquals(10.0, replayedTransaction.getAmount());
+            assertEquals(5.0, replayedTransaction.getPenaltyChargesPortion());
+            assertEquals(5.0, replayedTransaction.getPrincipalPortion());
+            assertEquals("loanTransactionType.chargeAdjustment", replayedTransaction.getType().getCode());
+            assertEquals(externalId, replayedTransaction.getExternalId());
+
+            Set<GetLoansLoanIdLoanTransactionRelation> transactionRelations = replayedTransaction.getTransactionRelations();
+            for (GetLoansLoanIdLoanTransactionRelation loanTransactionRelation : transactionRelations) {
+                if ("CHARGE_ADJUSTMENT".equals(loanTransactionRelation.getRelationType())) {
+                    assertEquals(replayedTransaction.getId(), loanTransactionRelation.getFromLoanTransaction());
+                    assertEquals((long) penalty1LoanChargeId, loanTransactionRelation.getToLoanCharge());
+                }
+            }
+
+            String uuid = UUID.randomUUID().toString();
+            LOAN_TRANSACTION_HELPER.reverseLoanTransaction((long) loanID, replayedTransaction.getId(),
+                    new PostLoansLoanIdTransactionsTransactionIdRequest().dateFormat(DATETIME_PATTERN).transactionDate("08 September 2022")
+                            .transactionAmount(0.0).locale("en").reversalExternalId(uuid));
+
+            // Should fail due to external id collusion
+            assertThrows(CallFailedRuntimeException.class,
+                    () -> LOAN_TRANSACTION_HELPER.reverseLoanTransaction((long) loanID, repaymentResult.getResourceId(),
+                            new PostLoansLoanIdTransactionsTransactionIdRequest().dateFormat(DATETIME_PATTERN)
+                                    .transactionDate("08 September 2022").transactionAmount(0.0).locale("en").reversalExternalId(uuid)));
+
+            loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+            assertEquals(2, loanSchedule.size());
+            assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue"));
+            assertEquals(5.0f, loanSchedule.get(1).get("penaltyChargesPaid"));
+            assertEquals(5.0f, loanSchedule.get(1).get("penaltyChargesOutstanding"));
+            assertEquals(1000.0f, loanSchedule.get(1).get("principalDue"));
+            assertEquals(0, loanSchedule.get(1).get("principalPaid"));
+            assertEquals(1000.0f, loanSchedule.get(1).get("principalOutstanding"));
+            assertEquals(1010.0f, loanSchedule.get(1).get("totalDueForPeriod"));
+            assertEquals(1005.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
+            assertEquals(5.0f, loanSchedule.get(1).get("totalPaidForPeriod"));
+
+            loanSummary = LOAN_TRANSACTION_HELPER.getLoanDetail(REQUEST_SPEC, RESPONSE_SPEC, loanID, "summary");
+            assertEquals(10.0f, loanSummary.get("penaltyChargesCharged"));
+            assertEquals(5.0f, loanSummary.get("penaltyChargesOutstanding"));
+            assertEquals(5.0f, loanSummary.get("penaltyChargesPaid"));
+            assertEquals(1000.0f, loanSummary.get("principalDisbursed"));
+            assertEquals(1000.0f, loanSummary.get("principalOutstanding"));
+            assertEquals(0.0f, loanSummary.get("principalPaid"));
+            assertEquals(1005.0f, loanSummary.get("totalOutstanding"));
+        } finally {
+            GlobalConfigurationHelper.updateIsBusinessDateEnabled(REQUEST_SPEC, RESPONSE_SPEC, Boolean.FALSE);
+        }
+    }
+
+    @Test
+    public void chargeAdjustmentAccountingValidation() {
+        try {
+            GlobalConfigurationHelper.updateIsBusinessDateEnabled(REQUEST_SPEC, RESPONSE_SPEC, Boolean.TRUE);
+            BUSINESS_DATE_HELPER.updateBusinessDate(new BusinessDateRequest().type(BusinessDateType.BUSINESS_DATE.getName())
+                    .date("01 November 2022").dateFormat(DATETIME_PATTERN).locale("en"));
+            final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
+            final Account assetFeeAndPenaltyAccount = ACCOUNT_HELPER.createAssetAccount();
+            final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
+            final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
+            final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
+            final PostGLAccountsResponse uniqueIncomeAccountForFee = ACCOUNT_HELPER.createGLAccount(new PostGLAccountsRequest()
+                    .type(GLAccountType.INCOME.getValue())
+                    .glCode(Utils.uniqueRandomStringGenerator("UNIQUE_FEE_INCOME" + Calendar.getInstance().getTimeInMillis(), 5))
+                    .manualEntriesAllowed(true)
+                    .name(Utils.uniqueRandomStringGenerator("UNIQUE_FEE_INCOME" + Calendar.getInstance().getTimeInMillis(), 5)).usage(1));
+            final PostGLAccountsResponse uniqueIncomeAccountForPenalty = ACCOUNT_HELPER.createGLAccount(new PostGLAccountsRequest()
+                    .type(GLAccountType.INCOME.getValue())
+                    .glCode(Utils.uniqueRandomStringGenerator("UNIQUE_PENALTY_INCOME" + Calendar.getInstance().getTimeInMillis(), 5))
+                    .manualEntriesAllowed(true)
+                    .name(Utils.uniqueRandomStringGenerator("UNIQUE_PENALTY_INCOME" + Calendar.getInstance().getTimeInMillis(), 5))
+                    .usage(1));
+
+            PostChargesResponse penaltyCharge = CHARGES_HELPER.createCharges(new PostChargesRequest().penalty(true).amount(10.0)
+                    .chargeCalculationType(ChargeCalculationType.FLAT.getValue())
+                    .chargeTimeType(ChargeTimeType.SPECIFIED_DUE_DATE.getValue()).chargePaymentMode(ChargePaymentMode.REGULAR.getValue())
+                    .currencyCode("USD").name(Utils.randomStringGenerator("PENALTY_" + Calendar.getInstance().getTimeInMillis(), 5))
+                    .chargeAppliesTo(1).locale("en").active(true));
+
+            PostChargesResponse feeCharge = CHARGES_HELPER.createCharges(new PostChargesRequest().penalty(false).amount(9.0)
+                    .chargeCalculationType(ChargeCalculationType.FLAT.getValue())
+                    .chargeTimeType(ChargeTimeType.SPECIFIED_DUE_DATE.getValue()).chargePaymentMode(ChargePaymentMode.REGULAR.getValue())
+                    .currencyCode("USD").name(Utils.randomStringGenerator("FEE_" + Calendar.getInstance().getTimeInMillis(), 5))
+                    .chargeAppliesTo(1).locale("en").active(true));
+
+            final String loanProductJSON = new LoanProductTestBuilder().withPrincipal("1000").withRepaymentTypeAsMonth()
+                    .withRepaymentAfterEvery("1").withNumberOfRepayments("1").withRepaymentTypeAsMonth().withinterestRatePerPeriod("0")
+                    .withInterestRateFrequencyTypeAsMonths().withAmortizationTypeAsEqualPrincipalPayment().withInterestTypeAsFlat()
+                    .withAccountingRulePeriodicAccrual(new Account[] { assetAccount, incomeAccount, expenseAccount, overpaymentAccount })
+                    .withDaysInMonth("30").withDaysInYear("365").withMoratorium("0", "0")
+                    .withFeeToIncomeAccountMapping(feeCharge.getResourceId(), uniqueIncomeAccountForFee.getResourceId())
+                    .withPenaltyToIncomeAccountMapping(penaltyCharge.getResourceId(), uniqueIncomeAccountForPenalty.getResourceId())
+                    .withFeeAndPenaltyAssetAccount(assetFeeAndPenaltyAccount).build(null);
+            final Integer loanProductID = LOAN_TRANSACTION_HELPER.getLoanProductId(loanProductJSON);
+
+            final PostClientsResponse client = CLIENT_HELPER.createClient(ClientHelper.defaultClientCreationRequest());
+
+            final Integer loanID = applyForLoanApplication(client.getClientId().intValue(), loanProductID);
+
+            HashMap<String, Object> loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+            LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+            loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("02 September 2022", loanID);
+            LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+            LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+            loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("03 September 2022", loanID, "1000");
+            LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+            GetLoansLoanIdResponse loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+            List<GetLoansLoanIdRepaymentPeriod> loanSchedulePeriods = loanDetails.getRepaymentSchedule().getPeriods();
+            assertEquals(2, loanSchedulePeriods.size());
+            assertEquals(0.0, loanSchedulePeriods.get(1).getPenaltyChargesDue());
+            assertEquals(0.0, loanSchedulePeriods.get(1).getPenaltyChargesOutstanding());
+            assertEquals(1000.0, loanSchedulePeriods.get(1).getTotalDueForPeriod());
+            assertEquals(1000.0, loanSchedulePeriods.get(1).getTotalOutstandingForPeriod());
+
+            LocalDate targetDate = LocalDate.of(2022, 9, 7);
+            final String penaltyCharge1AddedDate = DATE_TIME_FORMATTER.format(targetDate);
+            Integer penaltyLoanChargeId = LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper
+                    .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(penaltyCharge.getResourceId()), penaltyCharge1AddedDate, "10"));
+
+            final String penalty1LoanChargeDate = DATE_TIME_FORMATTER.format(targetDate);
+            PERIODIC_ACCRUAL_ACCOUNTING_HELPER.runPeriodicAccrualAccounting(penalty1LoanChargeDate);
+
+            loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+            List<GetLoansLoanIdTransactions> transactions = loanDetails.getTransactions();
+            assertEquals(10.0, transactions.get(1).getAmount());
+            assertTrue(transactions.get(1).getType().getAccrual());
+            assertEquals(10.0, transactions.get(1).getPenaltyChargesPortion());
+            Long accrualTransactionId = transactions.get(1).getId();
+
+            List<HashMap> journalEntries = JOURNAL_ENTRY_HELPER.getJournalEntriesByTransactionId("L" + accrualTransactionId);
+            assertEquals(10.0f, (float) journalEntries.get(0).get("amount"));
+            assertEquals(uniqueIncomeAccountForPenalty.getResourceId().intValue(), (int) journalEntries.get(0).get("glAccountId"));
+            assertEquals("CREDIT", ((HashMap) journalEntries.get(0).get("entryType")).get("value"));
+            assertEquals(10.0f, (float) journalEntries.get(1).get("amount"));
+            assertEquals(assetFeeAndPenaltyAccount.getAccountID(), (int) journalEntries.get(1).get("glAccountId"));
+            assertEquals("DEBIT", ((HashMap) journalEntries.get(1).get("entryType")).get("value"));
+
+            loanSchedulePeriods = loanDetails.getRepaymentSchedule().getPeriods();
+            assertEquals(2, loanSchedulePeriods.size());
+            assertEquals(10.0, loanSchedulePeriods.get(1).getPenaltyChargesDue());
+            assertEquals(10.0, loanSchedulePeriods.get(1).getPenaltyChargesOutstanding());
+            assertEquals(1010.0, loanSchedulePeriods.get(1).getTotalDueForPeriod());
+            assertEquals(1010.0, loanSchedulePeriods.get(1).getTotalOutstandingForPeriod());
+
+            GetLoansLoanIdSummary loanSummary = loanDetails.getSummary();
+            assertEquals(10.0, loanSummary.getPenaltyChargesCharged());
+            assertEquals(10.0, loanSummary.getPenaltyChargesOutstanding());
+            assertEquals(1010.0, loanSummary.getTotalOutstanding());
+
+            String externalId = UUID.randomUUID().toString();
+            PostLoansLoanIdChargesChargeIdResponse chargeAdjustmentResponse = LOAN_TRANSACTION_HELPER.chargeAdjustment((long) loanID,
+                    (long) penaltyLoanChargeId, new PostLoansLoanIdChargesChargeIdRequest().amount(10.0).externalId(externalId));
+
+            loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+
+            loanSchedulePeriods = loanDetails.getRepaymentSchedule().getPeriods();
+            assertEquals(2, loanSchedulePeriods.size());
+            assertEquals(10.0, loanSchedulePeriods.get(1).getPenaltyChargesDue());
+            assertEquals(10.0, loanSchedulePeriods.get(1).getPenaltyChargesPaid());
+            assertEquals(0.0, loanSchedulePeriods.get(1).getPenaltyChargesOutstanding());
+            assertEquals(1010.0, loanSchedulePeriods.get(1).getTotalDueForPeriod());
+            assertEquals(1000.0, loanSchedulePeriods.get(1).getTotalOutstandingForPeriod());
+            assertEquals(10.0, loanSchedulePeriods.get(1).getTotalPaidForPeriod());
+
+            loanSummary = loanDetails.getSummary();
+            assertEquals(10.0, loanSummary.getPenaltyChargesCharged());
+            assertEquals(0.0, loanSummary.getPenaltyChargesOutstanding());
+            assertEquals(10.0, loanSummary.getPenaltyChargesPaid());
+            assertEquals(1000.0, loanSummary.getTotalOutstanding());
+
+            transactions = loanDetails.getTransactions();
+            assertEquals(10.0, transactions.get(2).getAmount());
+            assertTrue(transactions.get(2).getType().getChargeAdjustment());
+            assertEquals(10.0, transactions.get(2).getPenaltyChargesPortion());
+            Long chargeAdjustmentTransactionId = transactions.get(2).getId();
+
+            journalEntries = JOURNAL_ENTRY_HELPER.getJournalEntriesByTransactionId("L" + chargeAdjustmentTransactionId);
+            assertEquals(10.0f, (float) journalEntries.get(0).get("amount"));
+            assertEquals(uniqueIncomeAccountForPenalty.getResourceId().intValue(), (int) journalEntries.get(0).get("glAccountId"));
+            assertEquals("DEBIT", ((HashMap) journalEntries.get(0).get("entryType")).get("value"));
+            assertEquals(10.0f, (float) journalEntries.get(1).get("amount"));
+            assertEquals(assetFeeAndPenaltyAccount.getAccountID(), (int) journalEntries.get(1).get("glAccountId"));
+            assertEquals("CREDIT", ((HashMap) journalEntries.get(1).get("entryType")).get("value"));
+
+            String uuid = UUID.randomUUID().toString();
+            LOAN_TRANSACTION_HELPER.reverseLoanTransaction((long) loanID, chargeAdjustmentTransactionId,
+                    new PostLoansLoanIdTransactionsTransactionIdRequest().dateFormat(DATETIME_PATTERN).transactionDate("08 September 2022")
+                            .transactionAmount(0.0).locale("en").reversalExternalId(uuid));
+
+            journalEntries = JOURNAL_ENTRY_HELPER.getJournalEntriesByTransactionId("L" + chargeAdjustmentTransactionId);
+            assertEquals(10.0f, (float) journalEntries.get(0).get("amount"));
+            assertEquals(uniqueIncomeAccountForPenalty.getResourceId().intValue(), (int) journalEntries.get(0).get("glAccountId"));
+            assertEquals("CREDIT", ((HashMap) journalEntries.get(0).get("entryType")).get("value"));
+            assertEquals(10.0f, (float) journalEntries.get(1).get("amount"));
+            assertEquals(assetFeeAndPenaltyAccount.getAccountID(), (int) journalEntries.get(1).get("glAccountId"));
+            assertEquals("DEBIT", ((HashMap) journalEntries.get(1).get("entryType")).get("value"));
+            assertEquals(10.0f, (float) journalEntries.get(2).get("amount"));
+            assertEquals(uniqueIncomeAccountForPenalty.getResourceId().intValue(), (int) journalEntries.get(2).get("glAccountId"));
+            assertEquals("DEBIT", ((HashMap) journalEntries.get(2).get("entryType")).get("value"));
+            assertEquals(10.0f, (float) journalEntries.get(3).get("amount"));
+            assertEquals(assetFeeAndPenaltyAccount.getAccountID(), (int) journalEntries.get(3).get("glAccountId"));
+            assertEquals("CREDIT", ((HashMap) journalEntries.get(3).get("entryType")).get("value"));
+
+            targetDate = LocalDate.of(2022, 9, 10);
+            final String feeCharge1AddedDate = DATE_TIME_FORMATTER.format(targetDate);
+            Integer feeLoanChargeId = LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper
+                    .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(feeCharge.getResourceId()), feeCharge1AddedDate, "3"));
+
+            GlobalConfigurationHelper.manageConfigurations(REQUEST_SPEC, RESPONSE_SPEC,
+                    GlobalConfigurationHelper.ENABLE_AUTOGENERATED_EXTERNAL_ID, true);
+            final String feeLoanChargeDate = DATE_TIME_FORMATTER.format(targetDate);
+            PERIODIC_ACCRUAL_ACCOUNTING_HELPER.runPeriodicAccrualAccounting(feeLoanChargeDate);
+
+            loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+            transactions = loanDetails.getTransactions();
+            assertEquals(3.0, transactions.get(2).getAmount());
+            assertTrue(transactions.get(2).getType().getAccrual());
+            assertEquals(3.0, transactions.get(2).getFeeChargesPortion());
+            assertTrue(StringUtils.isNotBlank(transactions.get(2).getExternalId()));
+            accrualTransactionId = transactions.get(2).getId();
+
+            journalEntries = JOURNAL_ENTRY_HELPER.getJournalEntriesByTransactionId("L" + accrualTransactionId);
+            assertEquals(3.0f, (float) journalEntries.get(0).get("amount"));
+            assertEquals(uniqueIncomeAccountForFee.getResourceId().intValue(), (int) journalEntries.get(0).get("glAccountId"));
+            assertEquals("CREDIT", ((HashMap) journalEntries.get(0).get("entryType")).get("value"));
+            assertEquals(3.0f, (float) journalEntries.get(1).get("amount"));
+            assertEquals(assetFeeAndPenaltyAccount.getAccountID(), (int) journalEntries.get(1).get("glAccountId"));
+            assertEquals("DEBIT", ((HashMap) journalEntries.get(1).get("entryType")).get("value"));
+
+            loanSchedulePeriods = loanDetails.getRepaymentSchedule().getPeriods();
+            assertEquals(2, loanSchedulePeriods.size());
+            assertEquals(10.0, loanSchedulePeriods.get(1).getPenaltyChargesDue());
+            assertEquals(10.0, loanSchedulePeriods.get(1).getPenaltyChargesOutstanding());
+            assertEquals(3.0, loanSchedulePeriods.get(1).getFeeChargesDue());
+            assertEquals(3.0, loanSchedulePeriods.get(1).getFeeChargesOutstanding());
+            assertEquals(1013.0, loanSchedulePeriods.get(1).getTotalDueForPeriod());
+            assertEquals(1013.0, loanSchedulePeriods.get(1).getTotalOutstandingForPeriod());
+
+            loanSummary = loanDetails.getSummary();
+            assertEquals(10.0, loanSummary.getPenaltyChargesCharged());
+            assertEquals(10.0, loanSummary.getPenaltyChargesOutstanding());
+            assertEquals(3.0, loanSummary.getFeeChargesCharged());
+            assertEquals(3.0, loanSummary.getFeeChargesOutstanding());
+            assertEquals(1013.0, loanSummary.getTotalOutstanding());
+
+            LOAN_TRANSACTION_HELPER.makeLoanRepayment((long) loanID, new PostLoansLoanIdTransactionsRequest().dateFormat(DATETIME_PATTERN)
+                    .transactionDate("11 September 2022").locale("en").transactionAmount(5.0));
+
+            externalId = UUID.randomUUID().toString();
+            chargeAdjustmentResponse = LOAN_TRANSACTION_HELPER.chargeAdjustment((long) loanID, (long) feeLoanChargeId,
+                    new PostLoansLoanIdChargesChargeIdRequest().amount(2.0).externalId(externalId));
+
+            loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+
+            loanSchedulePeriods = loanDetails.getRepaymentSchedule().getPeriods();
+            assertEquals(2, loanSchedulePeriods.size());
+            assertEquals(10.0, loanSchedulePeriods.get(1).getPenaltyChargesDue());
+            assertEquals(7.0, loanSchedulePeriods.get(1).getPenaltyChargesPaid());
+            assertEquals(3.0, loanSchedulePeriods.get(1).getPenaltyChargesOutstanding());
+            assertEquals(3.0, loanSchedulePeriods.get(1).getFeeChargesDue());
+            assertEquals(0.0, loanSchedulePeriods.get(1).getFeeChargesPaid());
+            assertEquals(3.0, loanSchedulePeriods.get(1).getFeeChargesOutstanding());
+            assertEquals(1000.0, loanSchedulePeriods.get(1).getPrincipalDue());
+            assertEquals(0.0, loanSchedulePeriods.get(1).getPrincipalPaid());
+            assertEquals(1000.0, loanSchedulePeriods.get(1).getPrincipalOutstanding());
+            assertEquals(1013.0, loanSchedulePeriods.get(1).getTotalDueForPeriod());
+            assertEquals(1006.0, loanSchedulePeriods.get(1).getTotalOutstandingForPeriod());
+            assertEquals(7.0, loanSchedulePeriods.get(1).getTotalPaidForPeriod());
+
+            loanSummary = loanDetails.getSummary();
+            assertEquals(10.0, loanSummary.getPenaltyChargesCharged());
+            assertEquals(3.0, loanSummary.getPenaltyChargesOutstanding());
+            assertEquals(7.0, loanSummary.getPenaltyChargesPaid());
+            assertEquals(3.0, loanSummary.getFeeChargesCharged());
+            assertEquals(3.0, loanSummary.getFeeChargesOutstanding());
+            assertEquals(0.0, loanSummary.getFeeChargesPaid());
+            assertEquals(1000.0, loanSummary.getPrincipalOutstanding());
+            assertEquals(0.0, loanSummary.getPrincipalPaid());
+            assertEquals(7.0, loanSummary.getTotalRepayment());
+            assertEquals(1006.0, loanSummary.getTotalOutstanding());
+
+            transactions = loanDetails.getTransactions();
+            assertEquals(2.0, transactions.get(5).getAmount());
+            assertTrue(transactions.get(4).getType().getChargeAdjustment());
+            assertEquals(2.0, transactions.get(5).getPenaltyChargesPortion());
+            assertEquals(0.0, transactions.get(5).getFeeChargesPortion());
+            assertEquals(0.0, transactions.get(5).getPrincipalPortion());
+            chargeAdjustmentTransactionId = transactions.get(5).getId();
+
+            journalEntries = JOURNAL_ENTRY_HELPER.getJournalEntriesByTransactionId("L" + chargeAdjustmentTransactionId);
+            assertEquals(2.0f, (float) journalEntries.get(0).get("amount"));
+            assertEquals(uniqueIncomeAccountForFee.getResourceId().intValue(), (int) journalEntries.get(0).get("glAccountId"));
+            assertEquals("DEBIT", ((HashMap) journalEntries.get(0).get("entryType")).get("value"));
+            assertEquals(2.0f, (float) journalEntries.get(1).get("amount"));
+            assertEquals(assetFeeAndPenaltyAccount.getAccountID(), (int) journalEntries.get(1).get("glAccountId"));
+            assertEquals("CREDIT", ((HashMap) journalEntries.get(1).get("entryType")).get("value"));
+
+            externalId = UUID.randomUUID().toString();
+            chargeAdjustmentResponse = LOAN_TRANSACTION_HELPER.chargeAdjustment((long) loanID, (long) penaltyLoanChargeId,
+                    new PostLoansLoanIdChargesChargeIdRequest().amount(7.0).externalId(externalId));
+
+            loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+
+            loanSchedulePeriods = loanDetails.getRepaymentSchedule().getPeriods();
+            assertEquals(2, loanSchedulePeriods.size());
+            assertEquals(10.0, loanSchedulePeriods.get(1).getPenaltyChargesDue());
+            assertEquals(10.0, loanSchedulePeriods.get(1).getPenaltyChargesPaid());
+            assertEquals(0.0, loanSchedulePeriods.get(1).getPenaltyChargesOutstanding());
+            assertEquals(3.0, loanSchedulePeriods.get(1).getFeeChargesDue());
+            assertEquals(3.0, loanSchedulePeriods.get(1).getFeeChargesPaid());
+            assertEquals(0.0, loanSchedulePeriods.get(1).getFeeChargesOutstanding());
+            assertEquals(1000.0, loanSchedulePeriods.get(1).getPrincipalDue());
+            assertEquals(1.0, loanSchedulePeriods.get(1).getPrincipalPaid());
+            assertEquals(999.0, loanSchedulePeriods.get(1).getPrincipalOutstanding());
+            assertEquals(1013.0, loanSchedulePeriods.get(1).getTotalDueForPeriod());
+            assertEquals(999.0, loanSchedulePeriods.get(1).getTotalOutstandingForPeriod());
+            assertEquals(14.0, loanSchedulePeriods.get(1).getTotalPaidForPeriod());
+
+            loanSummary = loanDetails.getSummary();
+            assertEquals(10.0, loanSummary.getPenaltyChargesCharged());
+            assertEquals(0.0, loanSummary.getPenaltyChargesOutstanding());
+            assertEquals(10.0, loanSummary.getPenaltyChargesPaid());
+            assertEquals(3.0, loanSummary.getFeeChargesCharged());
+            assertEquals(0.0, loanSummary.getFeeChargesOutstanding());
+            assertEquals(3.0, loanSummary.getFeeChargesPaid());
+            assertEquals(999.0, loanSummary.getPrincipalOutstanding());
+            assertEquals(1.0, loanSummary.getPrincipalPaid());
+            assertEquals(14.0, loanSummary.getTotalRepayment());
+            assertEquals(999.0, loanSummary.getTotalOutstanding());
+
+            transactions = loanDetails.getTransactions();
+            assertEquals(7.0, transactions.get(6).getAmount());
+            assertTrue(transactions.get(6).getType().getChargeAdjustment());
+            assertEquals(3.0, transactions.get(6).getPenaltyChargesPortion());
+            assertEquals(3.0, transactions.get(6).getFeeChargesPortion());
+            assertEquals(1.0, transactions.get(6).getPrincipalPortion());
+            chargeAdjustmentTransactionId = transactions.get(6).getId();
+
+            journalEntries = JOURNAL_ENTRY_HELPER.getJournalEntriesByTransactionId("L" + chargeAdjustmentTransactionId);
+            assertEquals(7.0f, (float) journalEntries.get(0).get("amount"));
+            assertEquals(uniqueIncomeAccountForPenalty.getResourceId().intValue(), (int) journalEntries.get(0).get("glAccountId"));
+            assertEquals("DEBIT", ((HashMap) journalEntries.get(0).get("entryType")).get("value"));
+            if (assetAccount.getAccountID() == (int) journalEntries.get(1).get("glAccountId")) {
+                assertEquals(1.0f, (float) journalEntries.get(1).get("amount"));
+                assertEquals(assetAccount.getAccountID(), (int) journalEntries.get(1).get("glAccountId"));
+                assertEquals("CREDIT", ((HashMap) journalEntries.get(1).get("entryType")).get("value"));
+
+                assertEquals(6.0f, (float) journalEntries.get(2).get("amount"));
+                assertEquals(assetFeeAndPenaltyAccount.getAccountID(), (int) journalEntries.get(2).get("glAccountId"));
+                assertEquals("CREDIT", ((HashMap) journalEntries.get(2).get("entryType")).get("value"));
+            } else {
+                assertEquals(1.0f, (float) journalEntries.get(2).get("amount"));
+                assertEquals(assetAccount.getAccountID(), (int) journalEntries.get(2).get("glAccountId"));
+                assertEquals("CREDIT", ((HashMap) journalEntries.get(2).get("entryType")).get("value"));
+
+                assertEquals(6.0f, (float) journalEntries.get(1).get("amount"));
+                assertEquals(assetFeeAndPenaltyAccount.getAccountID(), (int) journalEntries.get(1).get("glAccountId"));
+                assertEquals("CREDIT", ((HashMap) journalEntries.get(1).get("entryType")).get("value"));
+            }
+
+            LOAN_TRANSACTION_HELPER.makeLoanRepayment((long) loanID, new PostLoansLoanIdTransactionsRequest().dateFormat(DATETIME_PATTERN)
+                    .transactionDate("13 September 2022").locale("en").transactionAmount(998.0));
+
+            externalId = UUID.randomUUID().toString();
+            chargeAdjustmentResponse = LOAN_TRANSACTION_HELPER.chargeAdjustment((long) loanID, (long) feeLoanChargeId,
+                    new PostLoansLoanIdChargesChargeIdRequest().amount(1.0).externalId(externalId));
+
+            loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+
+            loanSchedulePeriods = loanDetails.getRepaymentSchedule().getPeriods();
+            assertEquals(2, loanSchedulePeriods.size());
+            assertEquals(10.0, loanSchedulePeriods.get(1).getPenaltyChargesDue());
+            assertEquals(10.0, loanSchedulePeriods.get(1).getPenaltyChargesPaid());
+            assertEquals(0.0, loanSchedulePeriods.get(1).getPenaltyChargesOutstanding());
+            assertEquals(3.0, loanSchedulePeriods.get(1).getFeeChargesDue());
+            assertEquals(3.0, loanSchedulePeriods.get(1).getFeeChargesPaid());
+            assertEquals(0.0, loanSchedulePeriods.get(1).getFeeChargesOutstanding());
+            assertEquals(1000.0, loanSchedulePeriods.get(1).getPrincipalDue());
+            assertEquals(1000.0, loanSchedulePeriods.get(1).getPrincipalPaid());
+            assertEquals(0.0, loanSchedulePeriods.get(1).getPrincipalOutstanding());
+            assertEquals(1013.0, loanSchedulePeriods.get(1).getTotalDueForPeriod());
+            assertEquals(0.0, loanSchedulePeriods.get(1).getTotalOutstandingForPeriod());
+            assertEquals(1013.0, loanSchedulePeriods.get(1).getTotalPaidForPeriod());
+
+            loanSummary = loanDetails.getSummary();
+            assertEquals(10.0, loanSummary.getPenaltyChargesCharged());
+            assertEquals(0.0, loanSummary.getPenaltyChargesOutstanding());
+            assertEquals(10.0, loanSummary.getPenaltyChargesPaid());
+            assertEquals(3.0, loanSummary.getFeeChargesCharged());
+            assertEquals(0.0, loanSummary.getFeeChargesOutstanding());
+            assertEquals(3.0, loanSummary.getFeeChargesPaid());
+            assertEquals(0.0, loanSummary.getPrincipalOutstanding());
+            assertEquals(1000.0, loanSummary.getPrincipalPaid());
+            assertEquals(1013.0, loanSummary.getTotalRepayment());
+            assertEquals(0.0, loanSummary.getTotalOutstanding());
+
+            transactions = loanDetails.getTransactions();
+            assertEquals(1.0, transactions.get(8).getAmount());
+            assertTrue(transactions.get(8).getType().getChargeAdjustment());
+            assertEquals(0.0, transactions.get(8).getPenaltyChargesPortion());
+            assertEquals(0.0, transactions.get(8).getFeeChargesPortion());
+            assertEquals(1.0, transactions.get(8).getPrincipalPortion());
+            chargeAdjustmentTransactionId = transactions.get(8).getId();
+
+            journalEntries = JOURNAL_ENTRY_HELPER.getJournalEntriesByTransactionId("L" + chargeAdjustmentTransactionId);
+            assertEquals(1.0f, (float) journalEntries.get(0).get("amount"));
+            assertEquals(uniqueIncomeAccountForFee.getResourceId().intValue(), (int) journalEntries.get(0).get("glAccountId"));
+            assertEquals("DEBIT", ((HashMap) journalEntries.get(0).get("entryType")).get("value"));
+            assertEquals(1.0f, (float) journalEntries.get(1).get("amount"));
+            assertEquals(assetAccount.getAccountID(), (int) journalEntries.get(1).get("glAccountId"));
+            assertEquals("CREDIT", ((HashMap) journalEntries.get(1).get("entryType")).get("value"));
+
+            assertTrue(loanDetails.getStatus().getClosedObligationsMet());
+
+            externalId = UUID.randomUUID().toString();
+            chargeAdjustmentResponse = LOAN_TRANSACTION_HELPER.chargeAdjustment((long) loanID, (long) penaltyLoanChargeId,
+                    new PostLoansLoanIdChargesChargeIdRequest().amount(1.0).externalId(externalId));
+
+            loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+
+            transactions = loanDetails.getTransactions();
+            assertEquals(1.0, transactions.get(9).getAmount());
+            assertTrue(transactions.get(9).getType().getChargeAdjustment());
+            assertEquals(0.0, transactions.get(9).getPenaltyChargesPortion());
+            assertEquals(0.0, transactions.get(9).getFeeChargesPortion());
+            assertEquals(0.0, transactions.get(9).getPrincipalPortion());
+            assertEquals(1.0, transactions.get(9).getOverpaymentPortion());
+            chargeAdjustmentTransactionId = transactions.get(9).getId();
+
+            journalEntries = JOURNAL_ENTRY_HELPER.getJournalEntriesByTransactionId("L" + chargeAdjustmentTransactionId);
+            assertEquals(1.0f, (float) journalEntries.get(0).get("amount"));
+            assertEquals(uniqueIncomeAccountForPenalty.getResourceId().intValue(), (int) journalEntries.get(0).get("glAccountId"));
+            assertEquals("DEBIT", ((HashMap) journalEntries.get(0).get("entryType")).get("value"));
+            assertEquals(1.0f, (float) journalEntries.get(1).get("amount"));
+            assertEquals(overpaymentAccount.getAccountID(), (int) journalEntries.get(1).get("glAccountId"));
+            assertEquals("CREDIT", ((HashMap) journalEntries.get(1).get("entryType")).get("value"));
+
+            assertTrue(loanDetails.getStatus().getOverpaid());
+        } finally {
+            GlobalConfigurationHelper.updateIsBusinessDateEnabled(REQUEST_SPEC, RESPONSE_SPEC, Boolean.FALSE);
+        }
+    }
+
+    @Test
+    public void undoWaivedChargeWaiveTransactionDoesNotExist() {
+        final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
+        final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
+        final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
+        final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
+
+        final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterest(assetAccount, incomeAccount, expenseAccount,
+                overpaymentAccount);
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC, "01 January 2011");
+
+        final Integer loanID = applyForLoanApplication(clientID, loanProductID);
+
+        HashMap<String, Object> loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("02 September 2022", loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("03 September 2022", loanID, "1000");
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        final Integer loanTransactionId = (Integer) ((Map) ((List) JsonPath.from(loanDetails).get("transactions")).get(0)).get("id");
+        LoanTransactionHelper loanTransactionHelper = new LoanTransactionHelper(REQUEST_SPEC, createResponseSpecification(403));
+        HashMap response = loanTransactionHelper.undoWaiveChargesForLoan(loanID, loanTransactionId, "");
+        assertEquals("error.msg.loan.transaction.undo.waive.charge",
+                ((Map) ((List) response.get("errors")).get(0)).get("userMessageGlobalisationCode"));
+        assertEquals("Transaction is not a waive charge type.", ((Map) ((List) response.get("errors")).get(0)).get("defaultUserMessage"));
+    }
+
+    @Test
+    public void undoWaivedCharge() {
+        final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
+        final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
+        final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
+        final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
+
+        Integer penalty = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "10", true));
+        final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterest(assetAccount, incomeAccount, expenseAccount,
+                overpaymentAccount);
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC, "01 January 2011");
+
+        final Integer loanID = applyForLoanApplication(clientID, loanProductID);
+
+        HashMap<String, Object> loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("02 September 2022", loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("03 September 2022", loanID, "1000");
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        assertEquals(2, loanSchedule.size());
+        assertEquals(0, loanSchedule.get(1).get("feeChargesDue"));
+        assertEquals(0, loanSchedule.get(1).get("feeChargesOutstanding"));
+        assertEquals(0, loanSchedule.get(1).get("penaltyChargesDue"));
+        assertEquals(0, loanSchedule.get(1).get("penaltyChargesOutstanding"));
+        assertEquals(1000.0f, loanSchedule.get(1).get("totalDueForPeriod"));
+        assertEquals(1000.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
+        LocalDate targetDate = LocalDate.of(2022, 9, 7);
+        final String penaltyCharge1AddedDate = DATE_TIME_FORMATTER.format(targetDate);
+        Integer penalty1LoanChargeId = LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID,
+                LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(penalty), penaltyCharge1AddedDate, "10"));
+
+        LOAN_TRANSACTION_HELPER.noAccrualTransactionForRepayment(loanID);
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        assertEquals(2, loanSchedule.size());
+        assertEquals(0, loanSchedule.get(1).get("feeChargesDue"));
+        assertEquals(0, loanSchedule.get(1).get("feeChargesOutstanding"));
+        assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue"));
+        assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesOutstanding"));
+        assertEquals(1010.0f, loanSchedule.get(1).get("totalDueForPeriod"));
+        assertEquals(1010.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
+        assertEquals(0, loanSchedule.get(1).get("totalWaivedForPeriod"));
+
+        HashMap loanSummary = LOAN_TRANSACTION_HELPER.getLoanDetail(REQUEST_SPEC, RESPONSE_SPEC, loanID, "summary");
+        assertEquals(10.0f, loanSummary.get("penaltyChargesCharged"));
+        assertEquals(10.0f, loanSummary.get("penaltyChargesOutstanding"));
+        assertEquals(0.0f, loanSummary.get("penaltyChargesWaived"));
+        assertEquals(0.0f, loanSummary.get("feeChargesCharged"));
+        assertEquals(0.0f, loanSummary.get("feeChargesOutstanding"));
+        assertEquals(0.0f, loanSummary.get("feeChargesWaived"));
+        assertEquals(1010.0f, loanSummary.get("totalOutstanding"));
+        assertEquals(0.0f, loanSummary.get("totalWaived"));
+
+        LOAN_TRANSACTION_HELPER.waiveChargesForLoan(loanID, penalty1LoanChargeId, "");
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        assertEquals(2, loanSchedule.size());
+        assertEquals(0, loanSchedule.get(1).get("feeChargesDue"));
+        assertEquals(0, loanSchedule.get(1).get("feeChargesOutstanding"));
+        assertEquals(0, loanSchedule.get(1).get("feeChargesWaived"));
+        assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue"));
+        assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesWaived"));
+        assertEquals(0.0f, loanSchedule.get(1).get("penaltyChargesOutstanding"));
+        assertEquals(1010.0f, loanSchedule.get(1).get("totalDueForPeriod"));
+        assertEquals(1000.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
+        assertEquals(10.0f, loanSchedule.get(1).get("totalWaivedForPeriod"));
+
+        loanSummary = LOAN_TRANSACTION_HELPER.getLoanDetail(REQUEST_SPEC, RESPONSE_SPEC, loanID, "summary");
+        assertEquals(10.0f, loanSummary.get("penaltyChargesCharged"));
+        assertEquals(0.0f, loanSummary.get("penaltyChargesOutstanding"));
+        assertEquals(10.0f, loanSummary.get("penaltyChargesWaived"));
+        assertEquals(0.0f, loanSummary.get("feeChargesCharged"));
+        assertEquals(0.0f, loanSummary.get("feeChargesOutstanding"));
+        assertEquals(0.0f, loanSummary.get("feeChargesWaived"));
+        assertEquals(1000.0f, loanSummary.get("totalOutstanding"));
+        assertEquals(10.0f, loanSummary.get("totalWaived"));
+
+        List<HashMap> transactions = LOAN_TRANSACTION_HELPER.getLoanDetail(REQUEST_SPEC, RESPONSE_SPEC, loanID, "transactions");
+        assertEquals(10.0f, (float) transactions.get(1).get("amount"));
+        assertEquals(9, (int) ((HashMap) transactions.get(1).get("type")).get("id"));
+        Integer waiveTransactionId = (int) transactions.get(1).get("id");
+        LOAN_TRANSACTION_HELPER.undoWaiveChargesForLoan(loanID, waiveTransactionId, "");
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        assertEquals(2, loanSchedule.size());
+        assertEquals(0, loanSchedule.get(1).get("feeChargesDue"));
+        assertEquals(0, loanSchedule.get(1).get("feeChargesOutstanding"));
+        assertEquals(0, loanSchedule.get(1).get("feeChargesWaived"));
+        assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue"));
+        assertEquals(0.0f, loanSchedule.get(1).get("penaltyChargesWaived"));
+        assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesOutstanding"));
+        assertEquals(1010.0f, loanSchedule.get(1).get("totalDueForPeriod"));
+        assertEquals(1010.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
+        assertEquals(0.0f, loanSchedule.get(1).get("totalWaivedForPeriod"));
+
+        loanSummary = LOAN_TRANSACTION_HELPER.getLoanDetail(REQUEST_SPEC, RESPONSE_SPEC, loanID, "summary");
+        assertEquals(10.0f, loanSummary.get("penaltyChargesCharged"));
+        assertEquals(10.0f, loanSummary.get("penaltyChargesOutstanding"));
+        assertEquals(0.0f, loanSummary.get("penaltyChargesWaived"));
+        assertEquals(0.0f, loanSummary.get("feeChargesCharged"));
+        assertEquals(0.0f, loanSummary.get("feeChargesOutstanding"));
+        assertEquals(0.0f, loanSummary.get("feeChargesWaived"));
+        assertEquals(1010.0f, loanSummary.get("totalOutstanding"));
+        assertEquals(0.0f, loanSummary.get("totalWaived"));
+
+        transactions = LOAN_TRANSACTION_HELPER.getLoanDetail(REQUEST_SPEC, RESPONSE_SPEC, loanID, "transactions");
+        assertEquals(10.0f, (float) transactions.get(1).get("amount"));
+        assertEquals(9, (int) ((HashMap) transactions.get(1).get("type")).get("id"));
+        assertEquals(true, transactions.get(1).get("manuallyReversed"));
+
+        Integer fee = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "10", false));
+
+        final String feeCharge1AddedDate = DATE_TIME_FORMATTER.format(targetDate);
+        Integer fee1LoanChargeId = LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID,
+                LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(fee), feeCharge1AddedDate, "10"));
+
+        PERIODIC_ACCRUAL_ACCOUNTING_HELPER.runPeriodicAccrualAccounting(feeCharge1AddedDate);
+
+        transactions = LOAN_TRANSACTION_HELPER.getLoanDetail(REQUEST_SPEC, RESPONSE_SPEC, loanID, "transactions");
+        assertEquals(10, (int) ((HashMap) transactions.get(2).get("type")).get("id"));
+        assertEquals(20.0f, (float) transactions.get(2).get("amount"));
+        Integer accrualTransactionId = (int) transactions.get(2).get("id");
+
+        List<HashMap> journalEntries = JOURNAL_ENTRY_HELPER.getJournalEntriesByTransactionId("L" + accrualTransactionId);
+        assertEquals(10.0f, (float) journalEntries.get(0).get("amount"));
+        assertEquals(incomeAccount.getAccountID(), (int) journalEntries.get(0).get("glAccountId"));
+        assertEquals("CREDIT", ((HashMap) journalEntries.get(0).get("entryType")).get("value"));
+        assertEquals(10.0f, (float) journalEntries.get(1).get("amount"));
+        assertEquals(assetAccount.getAccountID(), (int) journalEntries.get(1).get("glAccountId"));
+        assertEquals("DEBIT", ((HashMap) journalEntries.get(1).get("entryType")).get("value"));
+        assertEquals(10.0f, (float) journalEntries.get(2).get("amount"));
+        assertEquals(incomeAccount.getAccountID(), (int) journalEntries.get(2).get("glAccountId"));
+        assertEquals("CREDIT", ((HashMap) journalEntries.get(2).get("entryType")).get("value"));
+        assertEquals(10.0f, (float) journalEntries.get(3).get("amount"));
+        assertEquals(assetAccount.getAccountID(), (int) journalEntries.get(3).get("glAccountId"));
+        assertEquals("DEBIT", ((HashMap) journalEntries.get(3).get("entryType")).get("value"));
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        assertEquals(2, loanSchedule.size());
+        assertEquals(10.0f, loanSchedule.get(1).get("feeChargesDue"));
+        assertEquals(10.0f, loanSchedule.get(1).get("feeChargesOutstanding"));
+        assertEquals(0, loanSchedule.get(1).get("feeChargesWaived"));
+        assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue"));
+        assertEquals(0, loanSchedule.get(1).get("penaltyChargesWaived"));
+        assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesOutstanding"));
+        assertEquals(1020.0f, loanSchedule.get(1).get("totalDueForPeriod"));
+        assertEquals(1020.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
+        assertEquals(0, loanSchedule.get(1).get("totalWaivedForPeriod"));
+
+        loanSummary = LOAN_TRANSACTION_HELPER.getLoanDetail(REQUEST_SPEC, RESPONSE_SPEC, loanID, "summary");
+        assertEquals(10.0f, loanSummary.get("penaltyChargesCharged"));
+        assertEquals(10.0f, loanSummary.get("penaltyChargesOutstanding"));
+        assertEquals(0.0f, loanSummary.get("penaltyChargesWaived"));
+        assertEquals(10.0f, loanSummary.get("feeChargesCharged"));
+        assertEquals(10.0f, loanSummary.get("feeChargesOutstanding"));
+        assertEquals(0.0f, loanSummary.get("feeChargesWaived"));
+        assertEquals(1020.0f, loanSummary.get("totalOutstanding"));
+        assertEquals(0.0f, loanSummary.get("totalWaived"));
+
+        LOAN_TRANSACTION_HELPER.waiveChargesForLoan(loanID, fee1LoanChargeId, "");
+
+        transactions = LOAN_TRANSACTION_HELPER.getLoanDetail(REQUEST_SPEC, RESPONSE_SPEC, loanID, "transactions");
+        assertEquals(10.0f, (float) transactions.get(3).get("amount"));
+        assertEquals(9, (int) ((HashMap) transactions.get(3).get("type")).get("id"));
+        Integer waive2TransactionId = (int) transactions.get(3).get("id");
+
+        journalEntries = JOURNAL_ENTRY_HELPER.getJournalEntriesByTransactionId("L" + waive2TransactionId);
+        assertEquals(10.0f, (float) journalEntries.get(0).get("amount"));
+        assertEquals(expenseAccount.getAccountID(), (int) journalEntries.get(0).get("glAccountId"));
+        assertEquals("DEBIT", ((HashMap) journalEntries.get(0).get("entryType")).get("value"));
+        assertEquals(10.0f, (float) journalEntries.get(1).get("amount"));
+        assertEquals(assetAccount.getAccountID(), (int) journalEntries.get(1).get("glAccountId"));
+        assertEquals("CREDIT", ((HashMap) journalEntries.get(1).get("entryType")).get("value"));
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        assertEquals(2, loanSchedule.size());
+        assertEquals(10.0f, loanSchedule.get(1).get("feeChargesDue"));
+        assertEquals(0.0f, loanSchedule.get(1).get("feeChargesOutstanding"));
+        assertEquals(10.0f, loanSchedule.get(1).get("feeChargesWaived"));
+        assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue"));
+        assertEquals(0, loanSchedule.get(1).get("penaltyChargesWaived"));
+        assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesOutstanding"));
+        assertEquals(1020.0f, loanSchedule.get(1).get("totalDueForPeriod"));
+        assertEquals(1010.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
+        assertEquals(10.0f, loanSchedule.get(1).get("totalWaivedForPeriod"));
+
+        loanSummary = LOAN_TRANSACTION_HELPER.getLoanDetail(REQUEST_SPEC, RESPONSE_SPEC, loanID, "summary");
+        assertEquals(10.0f, loanSummary.get("penaltyChargesCharged"));
+        assertEquals(10.0f, loanSummary.get("penaltyChargesOutstanding"));
+        assertEquals(0.0f, loanSummary.get("penaltyChargesWaived"));
+        assertEquals(10.0f, loanSummary.get("feeChargesCharged"));
+        assertEquals(0.0f, loanSummary.get("feeChargesOutstanding"));
+        assertEquals(10.0f, loanSummary.get("feeChargesWaived"));
+        assertEquals(1010.0f, loanSummary.get("totalOutstanding"));
+        assertEquals(10.0f, loanSummary.get("totalWaived"));
+
+        LOAN_TRANSACTION_HELPER.undoWaiveChargesForLoan(loanID, waive2TransactionId, "");
+
+        transactions = LOAN_TRANSACTION_HELPER.getLoanDetail(REQUEST_SPEC, RESPONSE_SPEC, loanID, "transactions");
+        assertEquals(10.0f, (float) transactions.get(3).get("amount"));
+        assertEquals(9, (int) ((HashMap) transactions.get(3).get("type")).get("id"));
+        assertEquals(true, transactions.get(3).get("manuallyReversed"));
+
+        journalEntries = JOURNAL_ENTRY_HELPER.getJournalEntriesByTransactionId("L" + waive2TransactionId);
+        assertEquals(10.0f, (float) journalEntries.get(0).get("amount"));
+        assertEquals(expenseAccount.getAccountID(), (int) journalEntries.get(0).get("glAccountId"));
+        assertEquals("CREDIT", ((HashMap) journalEntries.get(0).get("entryType")).get("value"));
+        assertEquals(10.0f, (float) journalEntries.get(1).get("amount"));
+        assertEquals(assetAccount.getAccountID(), (int) journalEntries.get(1).get("glAccountId"));
+        assertEquals("DEBIT", ((HashMap) journalEntries.get(1).get("entryType")).get("value"));
+        assertEquals(10.0f, (float) journalEntries.get(2).get("amount"));
+        assertEquals(expenseAccount.getAccountID(), (int) journalEntries.get(2).get("glAccountId"));
+        assertEquals("DEBIT", ((HashMap) journalEntries.get(2).get("entryType")).get("value"));
+        assertEquals(10.0f, (float) journalEntries.get(3).get("amount"));
+        assertEquals(assetAccount.getAccountID(), (int) journalEntries.get(3).get("glAccountId"));
+        assertEquals("CREDIT", ((HashMap) journalEntries.get(3).get("entryType")).get("value"));
+
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        assertEquals(2, loanSchedule.size());
+        assertEquals(10.0f, loanSchedule.get(1).get("feeChargesDue"));
+        assertEquals(10.0f, loanSchedule.get(1).get("feeChargesOutstanding"));
+        assertEquals(0.0f, loanSchedule.get(1).get("feeChargesWaived"));
+        assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue"));
+        assertEquals(0, loanSchedule.get(1).get("penaltyChargesWaived"));
+        assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesOutstanding"));
+        assertEquals(1020.0f, loanSchedule.get(1).get("totalDueForPeriod"));
+        assertEquals(1020.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
+        assertEquals(0.0f, loanSchedule.get(1).get("totalWaivedForPeriod"));
+
+        loanSummary = LOAN_TRANSACTION_HELPER.getLoanDetail(REQUEST_SPEC, RESPONSE_SPEC, loanID, "summary");
+        assertEquals(10.0f, loanSummary.get("penaltyChargesCharged"));
+        assertEquals(10.0f, loanSummary.get("penaltyChargesOutstanding"));
+        assertEquals(0.0f, loanSummary.get("penaltyChargesWaived"));
+        assertEquals(10.0f, loanSummary.get("feeChargesCharged"));
+        assertEquals(10.0f, loanSummary.get("feeChargesOutstanding"));
+        assertEquals(0.0f, loanSummary.get("feeChargesWaived"));
+        assertEquals(1020.0f, loanSummary.get("totalOutstanding"));
+        assertEquals(0.0f, loanSummary.get("totalWaived"));
+    }
+
+    @Test
+    public void chargeOff() {
+        try {
+            GlobalConfigurationHelper.updateIsAutomaticExternalIdGenerationEnabled(REQUEST_SPEC, RESPONSE_SPEC, true);
+            GlobalConfigurationHelper.updateIsBusinessDateEnabled(REQUEST_SPEC, RESPONSE_SPEC, true);
+            BUSINESS_DATE_HELPER.updateBusinessDate(new BusinessDateRequest().type(BusinessDateType.BUSINESS_DATE.getName())
+                    .date("30 September 2022").dateFormat(DATETIME_PATTERN).locale("en"));
+            final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
+            final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
+            final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
+            final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
+            String randomText = UUID.randomUUID().toString();
+            Integer chargeOffReasonId = CodeHelper.createChargeOffCodeValue(REQUEST_SPEC, RESPONSE_SPEC, randomText, 1);
+            final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterestMultiDisbursement(assetAccount,
+                    incomeAccount, expenseAccount, overpaymentAccount);
+
+            final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC, "01 January 2011");
+
+            final Integer loanID = applyForLoanApplication(clientID, loanProductID);
+
+            HashMap<String, Object> loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+            LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+            ResponseSpecification errorResponseSpec = new ResponseSpecBuilder().expectStatusCode(403).build();
+            LoanTransactionHelper errorLoanTransactionHelper = new LoanTransactionHelper(REQUEST_SPEC, errorResponseSpec);
+
+            CallFailedRuntimeException exception = assertThrows(CallFailedRuntimeException.class, () -> {
+                errorLoanTransactionHelper.chargeOffLoan((long) loanID,
+                        new PostLoansLoanIdTransactionsRequest().transactionDate("4 September 2022").locale("en")
+                                .dateFormat(DATETIME_PATTERN).externalId(UUID.randomUUID().toString())
+                                .chargeOffReasonId((long) chargeOffReasonId));
+            });
+
+            assertEquals(403, exception.getResponse().code());
+            assertTrue(exception.getMessage().contains("error.msg.loan.is.not.active"));
+
+            exception = assertThrows(CallFailedRuntimeException.class, () -> {
+                LOAN_TRANSACTION_HELPER.undoChargeOffLoan((long) loanID, new PostLoansLoanIdTransactionsRequest());
+            });
+            assertEquals(403, exception.getResponse().code());
+            assertTrue(exception.getMessage().contains("error.msg.loan.is.not.active"));
+
+            loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("02 September 2022", loanID);
+            LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+            LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+            loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithTransactionAmount("02 September 2022", loanID, "1000");
+            loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithTransactionAmount("03 September 2022", loanID, "1000");
+            LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+            exception = assertThrows(CallFailedRuntimeException.class, () -> {
+                LOAN_TRANSACTION_HELPER.chargeOffLoan((long) loanID,
+                        new PostLoansLoanIdTransactionsRequest().transactionDate("1 October 2022").locale("en").dateFormat(DATETIME_PATTERN)
+                                .chargeOffReasonId((long) chargeOffReasonId));
+            });
+            assertEquals(403, exception.getResponse().code());
+            assertTrue(exception.getMessage().contains("error.msg.loan.transaction.cannot.be.a.future.date"));
+
+            GetLoansLoanIdResponse loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+            assertTrue(loanDetails.getStatus().getActive());
+            assertEquals(2000.0, loanDetails.getSummary().getTotalOutstanding());
+            assertFalse(loanDetails.getChargedOff());
+            assertNull(loanDetails.getSummary().getChargeOffReasonId());
+            assertNull(loanDetails.getSummary().getChargeOffReason());
+            assertNull(loanDetails.getTimeline().getChargedOffOnDate());
+            assertNull(loanDetails.getTimeline().getChargedOffByUsername());
+            assertNull(loanDetails.getTimeline().getChargedOffByFirstname());
+            assertNull(loanDetails.getTimeline().getChargedOffByLastname());
+
+            Integer flatPenaltySpecifiedDueDate = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                    ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "3", true));
+            LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper
+                    .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatPenaltySpecifiedDueDate), "04 September 2022", "3"));
+            Integer chargeId = LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID, LoanTransactionHelper
+                    .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatPenaltySpecifiedDueDate), "04 September 2022", "5"));
+
+            PostLoansLoanIdChargesChargeIdResponse waiveChargeResponse = LOAN_TRANSACTION_HELPER.waiveLoanCharge((long) loanID,
+                    (long) chargeId, new PostLoansLoanIdChargesChargeIdRequest());
+
+            String transactionExternalId = UUID.randomUUID().toString();
+            LOAN_TRANSACTION_HELPER.chargeOffLoan((long) loanID,
+                    new PostLoansLoanIdTransactionsRequest().transactionDate("4 September 2022").locale("en").dateFormat(DATETIME_PATTERN)
+                            .externalId(transactionExternalId).chargeOffReasonId((long) chargeOffReasonId));
+
+            loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+            assertTrue(loanDetails.getStatus().getActive());
+            assertEquals(2003.0, loanDetails.getSummary().getTotalOutstanding());
+            assertTrue(loanDetails.getChargedOff());
+            assertEquals((long) chargeOffReasonId, loanDetails.getSummary().getChargeOffReasonId());
+            assertEquals(randomText, loanDetails.getSummary().getChargeOffReason());
+            assertEquals(LocalDate.of(2022, 9, 4), loanDetails.getTimeline().getChargedOffOnDate());
+            assertEquals("mifos", loanDetails.getTimeline().getChargedOffByUsername());
+            assertEquals("App", loanDetails.getTimeline().getChargedOffByFirstname());
+            assertEquals("Administrator", loanDetails.getTimeline().getChargedOffByLastname());
+
+            GetLoansLoanIdTransactions chargeOffTransaction = loanDetails.getTransactions().get(loanDetails.getTransactions().size() - 1);
+
+            assertEquals(2003.0, chargeOffTransaction.getAmount());
+            assertEquals(2000.0, chargeOffTransaction.getPrincipalPortion());
+            assertEquals(3.0, chargeOffTransaction.getPenaltyChargesPortion());
+
+            exception = assertThrows(CallFailedRuntimeException.class, () -> {
+                errorLoanTransactionHelper.chargeOffLoan((long) loanID,
+                        new PostLoansLoanIdTransactionsRequest().transactionDate("4 September 2022").locale("en")
+                                .dateFormat(DATETIME_PATTERN).externalId(UUID.randomUUID().toString())
+                                .chargeOffReasonId((long) chargeOffReasonId));
+            });
+            assertEquals(403, exception.getResponse().code());
+            assertTrue(exception.getMessage().contains("error.msg.loan.is.already.charged.off"));
+
+            HashMap chargeAddingError = errorLoanTransactionHelper.addChargesForLoanGetFullResponse(loanID, LoanTransactionHelper
+                    .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatPenaltySpecifiedDueDate), "04 September 2022", "3"));
+
+            assertEquals("error.msg.loan.is.charged.off",
+                    ((Map) ((List) chargeAddingError.get("errors")).get(0)).get("userMessageGlobalisationCode"));
+
+            exception = assertThrows(CallFailedRuntimeException.class, () -> {
+                errorLoanTransactionHelper.undoWaiveLoanCharge((long) loanID, waiveChargeResponse.getSubResourceId(),
+                        new PutChargeTransactionChangesRequest());
+            });
+            assertEquals(403, exception.getResponse().code());
+            assertTrue(exception.getMessage().contains("error.msg.transaction.date.cannot.be.earlier.than.charge.off.date"));
+
+            LOAN_TRANSACTION_HELPER.undoChargeOffLoan((long) loanID, new PostLoansLoanIdTransactionsRequest());
+
+            loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+            assertFalse(loanDetails.getChargedOff());
+            assertNull(loanDetails.getSummary().getChargeOffReasonId());
+            assertNull(loanDetails.getSummary().getChargeOffReason());
+            assertNull(loanDetails.getTimeline().getChargedOffOnDate());
+
+            GetLoansLoanIdTransactions undoChargeOffTransaction = loanDetails.getTransactions()
+                    .get(loanDetails.getTransactions().size() - 1);
+            assertTrue(undoChargeOffTransaction.getType().getChargeoff());
+            assertTrue(undoChargeOffTransaction.getManuallyReversed());
+
+            exception = assertThrows(CallFailedRuntimeException.class, () -> {
+                errorLoanTransactionHelper.undoChargeOffLoan((long) loanID, new PostLoansLoanIdTransactionsRequest());
+            });
+            assertEquals(403, exception.getResponse().code());
+            assertTrue(exception.getMessage().contains("error.msg.loan.is.not.charged.off"));
+
+            PostLoansLoanIdTransactionsResponse loanRepaymentResponse = LOAN_TRANSACTION_HELPER.makeLoanRepayment((long) loanID,
+                    new PostLoansLoanIdTransactionsRequest().dateFormat(DATETIME_PATTERN).transactionDate("05 September 2022").locale("en")
+                            .transactionAmount(5.0));
+
+            exception = assertThrows(CallFailedRuntimeException.class, () -> {
+                errorLoanTransactionHelper.chargeOffLoan((long) loanID,
+                        new PostLoansLoanIdTransactionsRequest().transactionDate("04 September 2022").locale("en")
+                                .dateFormat(DATETIME_PATTERN).externalId(UUID.randomUUID().toString())
+                                .chargeOffReasonId((long) chargeOffReasonId));
+            });
+
+            assertEquals(403, exception.getResponse().code());
+            assertTrue(exception.getMessage().contains("error.msg.loan.charge.off.is.before.than.the.last.user.transaction"));
+
+            LOAN_TRANSACTION_HELPER.chargeOffLoan((long) loanID,
+                    new PostLoansLoanIdTransactionsRequest().transactionDate("06 September 2022").locale("en").dateFormat(DATETIME_PATTERN)
+                            .externalId(UUID.randomUUID().toString()).chargeOffReasonId((long) chargeOffReasonId));
+
+            loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+            chargeOffTransaction = loanDetails.getTransactions().get(loanDetails.getTransactions().size() - 1);
+
+            assertEquals(1998.0, chargeOffTransaction.getAmount());
+            assertEquals(1998.0, chargeOffTransaction.getPrincipalPortion());
+
+            LOAN_TRANSACTION_HELPER.makeLoanRepayment((long) loanID, new PostLoansLoanIdTransactionsRequest().dateFormat(DATETIME_PATTERN)
+                    .transactionDate("07 September 2022").locale("en").transactionAmount(5.0));
+
+            exception = assertThrows(CallFailedRuntimeException.class, () -> {
+                errorLoanTransactionHelper.undoChargeOffLoan((long) loanID, new PostLoansLoanIdTransactionsRequest());
+            });
+            assertEquals(403, exception.getResponse().code());
+            assertTrue(exception.getMessage().contains("error.msg.loan.charge.off.is.not.the.last.user.transaction"));
+
+            exception = assertThrows(CallFailedRuntimeException.class, () -> {
+                errorLoanTransactionHelper.makeWriteoff((long) loanID, new PostLoansLoanIdTransactionsRequest().dateFormat(DATETIME_PATTERN)
+                        .transactionDate("05 September 2022").locale("en"));
+            });
+            assertEquals(403, exception.getResponse().code());
+            assertTrue(exception.getMessage().contains("error.msg.transaction.date.cannot.be.earlier.than.charge.off.date"));
+
+            exception = assertThrows(CallFailedRuntimeException.class, () -> {
+                errorLoanTransactionHelper.closeLoan((long) loanID, new PostLoansLoanIdTransactionsRequest().dateFormat(DATETIME_PATTERN)
+                        .transactionDate("05 September 2022").locale("en"));
+            });
+            assertEquals(403, exception.getResponse().code());
+            assertTrue(exception.getMessage().contains("error.msg.transaction.date.cannot.be.earlier.than.charge.off.date"));
+
+            exception = assertThrows(CallFailedRuntimeException.class, () -> {
+                errorLoanTransactionHelper.forecloseLoan((long) loanID, new PostLoansLoanIdTransactionsRequest()
+                        .dateFormat(DATETIME_PATTERN).transactionDate("05 September 2022").locale("en"));
+            });
+            assertEquals(403, exception.getResponse().code());
+            assertTrue(exception.getMessage().contains("error.msg.transaction.date.cannot.be.earlier.than.charge.off.date"));
+
+            exception = assertThrows(CallFailedRuntimeException.class, () -> {
+                errorLoanTransactionHelper.closeRescheduledLoan((long) loanID, new PostLoansLoanIdTransactionsRequest()
+                        .dateFormat(DATETIME_PATTERN).transactionDate("05 September 2022").locale("en"));
+            });
+            assertEquals(403, exception.getResponse().code());
+            assertTrue(exception.getMessage().contains("error.msg.loan.is.charged.off"));
+
+            HashMap disbursementDetailREsponse = (HashMap) errorLoanTransactionHelper.addAndDeleteDisbursementDetail(loanID, "1000",
+                    "03 September 2022", List.of(LOAN_TRANSACTION_HELPER.createTrancheDetail(null, "05 September 2022", "200")), "");
+
+            assertEquals("error.msg.loan.is.charged.off",
+                    ((Map) ((List) disbursementDetailREsponse.get("errors")).get(0)).get("userMessageGlobalisationCode"));
+
+            exception = assertThrows(CallFailedRuntimeException.class, () -> {
+                errorLoanTransactionHelper.undoLastDisbursalLoan((long) loanID, new PostLoansLoanIdRequest());
+            });
+            assertEquals(403, exception.getResponse().code());
+            assertTrue(exception.getMessage().contains("error.msg.loan.is.charged.off"));
+
+            exception = assertThrows(CallFailedRuntimeException.class, () -> {
+                errorLoanTransactionHelper.undoDisbursalLoan((long) loanID, new PostLoansLoanIdRequest());
+            });
+            assertEquals(403, exception.getResponse().code());
+            assertTrue(exception.getMessage().contains("error.msg.loan.is.charged.off"));
+
+            exception = assertThrows(CallFailedRuntimeException.class, () -> {
+                errorLoanTransactionHelper.makeCreditBalanceRefund((long) loanID, new PostLoansLoanIdTransactionsRequest()
+                        .dateFormat(DATETIME_PATTERN).transactionDate("05 September 2022").locale("en").transactionAmount(5.0));
+            });
+            assertEquals(403, exception.getResponse().code());
+            assertTrue(exception.getMessage().contains("error.msg.transaction.date.cannot.be.earlier.than.charge.off.date"));
+
+            exception = assertThrows(CallFailedRuntimeException.class, () -> {
+                errorLoanTransactionHelper.disburseLoan((long) loanID,
+                        new PostLoansLoanIdRequest().actualDisbursementDate("4 September 2022").transactionAmount(new BigDecimal("10"))
+                                .locale("en").dateFormat(DATETIME_PATTERN));
+            });
+            assertEquals(403, exception.getResponse().code());
+            assertTrue(exception.getMessage().contains("error.msg.transaction.date.cannot.be.earlier.than.charge.off.date"));
+
+            LOAN_TRANSACTION_HELPER.makeLoanRepayment((long) loanID, new PostLoansLoanIdTransactionsRequest().dateFormat(DATETIME_PATTERN)
+                    .transactionDate("07 September 2022").locale("en").transactionAmount(5000.0));
+
+            exception = assertThrows(CallFailedRuntimeException.class, () -> {
+                errorLoanTransactionHelper.makeRefundByCash((long) loanID, new PostLoansLoanIdTransactionsRequest()
+                        .dateFormat(DATETIME_PATTERN).transactionDate("05 September 2022").locale("en").transactionAmount(5.0));
+            });
+            assertEquals(403, exception.getResponse().code());
+            assertTrue(exception.getMessage().contains("error.msg.transaction.date.cannot.be.earlier.than.charge.off.date"));
+
+            LOAN_TRANSACTION_HELPER.makeCreditBalanceRefund((long) loanID, new PostLoansLoanIdTransactionsRequest()
+                    .dateFormat(DATETIME_PATTERN).transactionDate("08 September 2022").locale("en").transactionAmount(3007.0));
+        } finally {
+            GlobalConfigurationHelper.updateIsBusinessDateEnabled(REQUEST_SPEC, RESPONSE_SPEC, Boolean.FALSE);
+        }
+    }
+
+    @Test
+    public void testCloseOpenMaturityDate() {
+        GlobalConfigurationHelper.updateIsAutomaticExternalIdGenerationEnabled(REQUEST_SPEC, RESPONSE_SPEC, true);
+        final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
+        final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
+        final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
+        final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
+
+        final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterest(assetAccount, incomeAccount, expenseAccount,
+                overpaymentAccount);
+
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC, "01 January 2011");
+
+        final Integer loanID = applyForLoanApplication(clientID, loanProductID);
+
+        HashMap<String, Object> loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("02 September 2022", loanID);
+        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("03 September 2022", loanID, "1000");
+        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+        GetLoansLoanIdResponse loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+        LocalDate expectedMaturityDate = loanDetails.getTimeline().getExpectedMaturityDate();
+        LocalDate actualMaturityDate = loanDetails.getTimeline().getActualMaturityDate();
+
+        assertTrue(expectedMaturityDate.isEqual(actualMaturityDate));
+
+        LOAN_TRANSACTION_HELPER.makeRepayment("04 September 2022", Float.parseFloat("500"), loanID);
+        LOAN_TRANSACTION_HELPER.makeRepayment("05 September 2022", Float.parseFloat("700"), loanID);
+
+        loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+
+        expectedMaturityDate = loanDetails.getTimeline().getExpectedMaturityDate();
+        actualMaturityDate = loanDetails.getTimeline().getActualMaturityDate();
+
+        assertNotNull(expectedMaturityDate);
+        assertNull(actualMaturityDate);
+
+        LOAN_TRANSACTION_HELPER.reverseLoanTransaction((long) loanID, loanDetails.getTransactions().get(1).getId(),
+                new PostLoansLoanIdTransactionsTransactionIdRequest().dateFormat(DATETIME_PATTERN).transactionDate("04 September 2022")
+                        .transactionAmount(0.0).locale("en"));
+
+        loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+
+        expectedMaturityDate = loanDetails.getTimeline().getExpectedMaturityDate();
+        actualMaturityDate = loanDetails.getTimeline().getActualMaturityDate();
+
+        assertNotNull(expectedMaturityDate);
+        assertNotNull(actualMaturityDate);
+
+        assertTrue(expectedMaturityDate.isEqual(actualMaturityDate));
+
+    }
+
+    @Test
+    public void testReverseReplay() {
+        try {
+            GlobalConfigurationHelper.updateIsAutomaticExternalIdGenerationEnabled(REQUEST_SPEC, RESPONSE_SPEC, true);
+            final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
+            final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
+            final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
+            final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
+
+            final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterest(assetAccount, incomeAccount,
+                    expenseAccount, overpaymentAccount);
+
+            final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC, "01 January 2011");
+
+            final Integer loanID = applyForLoanApplication(clientID, loanProductID);
+
+            HashMap<String, Object> loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+            LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+            loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("02 September 2022", loanID);
+            LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+            LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+            loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("03 September 2022", loanID, "1000");
+            LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+            LOAN_TRANSACTION_HELPER.makeRepayment("04 September 2022", Float.parseFloat("500"), loanID);
+            LOAN_TRANSACTION_HELPER.makeRepayment("05 September 2022", Float.parseFloat("10"), loanID);
+            LOAN_TRANSACTION_HELPER.makeRepayment("06 September 2022", Float.parseFloat("400"), loanID);
+            LOAN_TRANSACTION_HELPER.makeRepayment("07 September 2022", Float.parseFloat("390"), loanID);
+
+            GetLoansLoanIdResponse loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+
+            assertEquals(300.0, loanDetails.getTotalOverpaid());
+
+            assertEquals(500.0, loanDetails.getTransactions().get(1).getAmount());
+            assertEquals(500.0, loanDetails.getTransactions().get(1).getPrincipalPortion());
+            assertEquals(LocalDate.of(2022, 9, 4), loanDetails.getTransactions().get(1).getDate());
+
+            assertEquals(10.0, loanDetails.getTransactions().get(2).getAmount());
+            assertEquals(10.0, loanDetails.getTransactions().get(2).getPrincipalPortion());
+            assertEquals(LocalDate.of(2022, 9, 5), loanDetails.getTransactions().get(2).getDate());
+
+            assertEquals(400.0, loanDetails.getTransactions().get(3).getAmount());
+            assertEquals(400.0, loanDetails.getTransactions().get(3).getPrincipalPortion());
+            assertEquals(LocalDate.of(2022, 9, 6), loanDetails.getTransactions().get(3).getDate());
+
+            assertEquals(390.0, loanDetails.getTransactions().get(4).getAmount());
+            assertEquals(90.0, loanDetails.getTransactions().get(4).getPrincipalPortion());
+            assertEquals(300.0, loanDetails.getTransactions().get(4).getOverpaymentPortion());
+            assertEquals(LocalDate.of(2022, 9, 7), loanDetails.getTransactions().get(4).getDate());
+
+            LOAN_TRANSACTION_HELPER.reverseLoanTransaction((long) loanID, loanDetails.getTransactions().get(2).getId(),
+                    new PostLoansLoanIdTransactionsTransactionIdRequest().dateFormat(DATETIME_PATTERN).transactionDate("05 September 2022")
+                            .transactionAmount(0.0).locale("en"));
+
+            loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+
+            assertEquals(290.0, loanDetails.getTotalOverpaid());
+
+            assertEquals(500.0, loanDetails.getTransactions().get(1).getAmount());
+            assertEquals(500.0, loanDetails.getTransactions().get(1).getPrincipalPortion());
+            assertEquals(LocalDate.of(2022, 9, 4), loanDetails.getTransactions().get(1).getDate());
+
+            assertEquals(10.0, loanDetails.getTransactions().get(2).getAmount());
+            assertEquals(10.0, loanDetails.getTransactions().get(2).getPrincipalPortion());
+            assertEquals(LocalDate.of(2022, 9, 5), loanDetails.getTransactions().get(2).getDate());
+            assertTrue(loanDetails.getTransactions().get(2).getManuallyReversed());
+
+            assertEquals(400.0, loanDetails.getTransactions().get(3).getAmount());
+            assertEquals(400.0, loanDetails.getTransactions().get(3).getPrincipalPortion());
+            assertEquals(LocalDate.of(2022, 9, 6), loanDetails.getTransactions().get(3).getDate());
+
+            assertEquals(390.0, loanDetails.getTransactions().get(4).getAmount());
+            assertEquals(100.0, loanDetails.getTransactions().get(4).getPrincipalPortion());
+            assertEquals(290.0, loanDetails.getTransactions().get(4).getOverpaymentPortion());
+            assertEquals(LocalDate.of(2022, 9, 7), loanDetails.getTransactions().get(4).getDate());
+
+            LOAN_TRANSACTION_HELPER.reverseLoanTransaction((long) loanID, loanDetails.getTransactions().get(1).getId(),
+                    new PostLoansLoanIdTransactionsTransactionIdRequest().dateFormat(DATETIME_PATTERN).transactionDate("05 September 2022")
+                            .transactionAmount(0.0).locale("en"));
+
+            loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+
+            assertEquals(210.0, loanDetails.getSummary().getTotalOutstanding());
+
+            assertEquals(500.0, loanDetails.getTransactions().get(1).getAmount());
+            assertEquals(500.0, loanDetails.getTransactions().get(1).getPrincipalPortion());
+            assertEquals(LocalDate.of(2022, 9, 4), loanDetails.getTransactions().get(1).getDate());
+            assertTrue(loanDetails.getTransactions().get(2).getManuallyReversed());
+
+            assertEquals(10.0, loanDetails.getTransactions().get(2).getAmount());
+            assertEquals(10.0, loanDetails.getTransactions().get(2).getPrincipalPortion());
+            assertEquals(LocalDate.of(2022, 9, 5), loanDetails.getTransactions().get(2).getDate());
+            assertTrue(loanDetails.getTransactions().get(2).getManuallyReversed());
+
+            assertEquals(400.0, loanDetails.getTransactions().get(3).getAmount());
+            assertEquals(400.0, loanDetails.getTransactions().get(3).getPrincipalPortion());
+            assertEquals(LocalDate.of(2022, 9, 6), loanDetails.getTransactions().get(3).getDate());
+
+            assertEquals(390.0, loanDetails.getTransactions().get(4).getAmount());
+            assertEquals(390.0, loanDetails.getTransactions().get(4).getPrincipalPortion());
+            assertEquals(LocalDate.of(2022, 9, 7), loanDetails.getTransactions().get(4).getDate());
+
+            LOAN_TRANSACTION_HELPER.makeRepayment("04 September 2022", Float.parseFloat("500"), loanID);
+
+            loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+
+            assertEquals(290.0, loanDetails.getTotalOverpaid());
+
+            assertEquals(500.0, loanDetails.getTransactions().get(1).getAmount());
+            assertEquals(500.0, loanDetails.getTransactions().get(1).getPrincipalPortion());
+            assertEquals(LocalDate.of(2022, 9, 4), loanDetails.getTransactions().get(1).getDate());
+            assertTrue(loanDetails.getTransactions().get(1).getManuallyReversed());
+
+            assertEquals(500.0, loanDetails.getTransactions().get(2).getAmount());
+            assertEquals(500.0, loanDetails.getTransactions().get(2).getPrincipalPortion());
+            assertEquals(LocalDate.of(2022, 9, 4), loanDetails.getTransactions().get(2).getDate());
+
+            assertEquals(10.0, loanDetails.getTransactions().get(3).getAmount());
+            assertEquals(10.0, loanDetails.getTransactions().get(3).getPrincipalPortion());
+            assertEquals(LocalDate.of(2022, 9, 5), loanDetails.getTransactions().get(3).getDate());
+            assertTrue(loanDetails.getTransactions().get(3).getManuallyReversed());
+
+            assertEquals(400.0, loanDetails.getTransactions().get(4).getAmount());
+            assertEquals(400.0, loanDetails.getTransactions().get(4).getPrincipalPortion());
+            assertEquals(LocalDate.of(2022, 9, 6), loanDetails.getTransactions().get(4).getDate());
+
+            assertEquals(390.0, loanDetails.getTransactions().get(5).getAmount());
+            assertEquals(100.0, loanDetails.getTransactions().get(5).getPrincipalPortion());
+            assertEquals(290.0, loanDetails.getTransactions().get(5).getOverpaymentPortion());
+            assertEquals(LocalDate.of(2022, 9, 7), loanDetails.getTransactions().get(5).getDate());
+        } finally {
+            GlobalConfigurationHelper.updateIsAutomaticExternalIdGenerationEnabled(REQUEST_SPEC, RESPONSE_SPEC, false);
+        }
+    }
+
+    @Test
+    public void testCreditBalanceRefundAfterMaturityWithReverseReplayOfRepayments() {
+        try {
+            GlobalConfigurationHelper.updateIsAutomaticExternalIdGenerationEnabled(REQUEST_SPEC, RESPONSE_SPEC, true);
+            GlobalConfigurationHelper.updateIsBusinessDateEnabled(REQUEST_SPEC, RESPONSE_SPEC, true);
+            BUSINESS_DATE_HELPER.updateBusinessDate(new BusinessDateRequest().type(BusinessDateType.BUSINESS_DATE.getName())
+                    .date("10 October 2022").dateFormat(DATETIME_PATTERN).locale("en"));
+
+            final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
+            final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
+            final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
+            final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
+
+            final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterest(assetAccount, incomeAccount,
+                    expenseAccount, overpaymentAccount);
+
+            final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC, "01 January 2011");
+
+            final Integer loanID = applyForLoanApplication(clientID, loanProductID);
+
+            HashMap<String, Object> loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+            LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+            loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("02 September 2022", loanID);
+            LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+            LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+            loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("03 September 2022", loanID, "1000");
+            LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+            LOAN_TRANSACTION_HELPER.makeRepayment("04 September 2022", Float.parseFloat("100"), loanID);
+            LOAN_TRANSACTION_HELPER.makeRepayment("05 September 2022", Float.parseFloat("1100"), loanID);
+
+            GetLoansLoanIdResponse loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+            assertEquals(200.0, loanDetails.getTotalOverpaid());
+            assertTrue(loanDetails.getStatus().getOverpaid());
+
+            LOAN_TRANSACTION_HELPER.makeCreditBalanceRefund((long) loanID, new PostLoansLoanIdTransactionsRequest().transactionAmount(200.0)
+                    .transactionDate("10 October 2022").dateFormat(DATETIME_PATTERN).locale("en").paymentTypeId(1L));
+
+            loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+            assertTrue(loanDetails.getStatus().getClosedObligationsMet());
+
+            assertEquals(2, loanDetails.getRepaymentSchedule().getPeriods().size());
+            assertEquals(1000, loanDetails.getRepaymentSchedule().getPeriods().get(1).getPrincipalDue());
+
+            assertEquals(100.0, loanDetails.getTransactions().get(1).getAmount());
+            assertEquals(100.0, loanDetails.getTransactions().get(1).getPrincipalPortion());
+            assertEquals(LocalDate.of(2022, 9, 4), loanDetails.getTransactions().get(1).getDate());
+            assertEquals(900.0, loanDetails.getTransactions().get(1).getOutstandingLoanBalance());
+            assertEquals(1100.0, loanDetails.getTransactions().get(2).getAmount());
+            assertEquals(900.0, loanDetails.getTransactions().get(2).getPrincipalPortion());
+            assertEquals(200.0, loanDetails.getTransactions().get(2).getOverpaymentPortion());
+            assertEquals(LocalDate.of(2022, 9, 5), loanDetails.getTransactions().get(2).getDate());
+            assertEquals(0.0, loanDetails.getTransactions().get(2).getOutstandingLoanBalance());
+            assertEquals(200.0, loanDetails.getTransactions().get(3).getAmount());
+            assertEquals(200.0, loanDetails.getTransactions().get(3).getOverpaymentPortion());
+            assertEquals(LocalDate.of(2022, 10, 10), loanDetails.getTransactions().get(3).getDate());
+            assertEquals(0.0, loanDetails.getTransactions().get(3).getOutstandingLoanBalance());
+            assertEquals(1L, loanDetails.getTransactions().get(3).getPaymentDetailData().getPaymentType().getId());
+            GetJournalEntriesTransactionIdResponse journalEntriesForTransaction = JOURNAL_ENTRY_HELPER
+                    .getJournalEntries("L" + loanDetails.getTransactions().get(3).getId());
+            List<JournalEntryTransactionItem> journalItems = journalEntriesForTransaction.getPageItems();
+            assertEquals(2, journalItems.size());
+            assertEquals(200.0,
+                    journalItems.stream()
+                            .filter(j -> "DEBIT".equalsIgnoreCase(j.getEntryType().getValue())
+                                    && j.getGlAccountId().equals(overpaymentAccount.getAccountID().longValue()))
+                            .findFirst().get().getAmount());
+            assertEquals(200.0, journalItems.stream().filter(j -> "CREDIT".equalsIgnoreCase(j.getEntryType().getValue())
+                    && j.getGlAccountId().equals(assetAccount.getAccountID().longValue())).findFirst().get().getAmount());
+
+            LOAN_TRANSACTION_HELPER.reverseLoanTransaction(loanDetails.getId(), loanDetails.getTransactions().get(1).getId(),
+                    new PostLoansLoanIdTransactionsTransactionIdRequest().dateFormat(DATETIME_PATTERN).transactionAmount(0.0)
+                            .transactionDate("10 October 2022").locale("en"));
+
+            loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+
+            assertEquals(100.0, loanDetails.getTransactions().get(1).getAmount());
+            assertEquals(100.0, loanDetails.getTransactions().get(1).getPrincipalPortion());
+            assertEquals(LocalDate.of(2022, 9, 4), loanDetails.getTransactions().get(1).getDate());
+            assertTrue(loanDetails.getTransactions().get(1).getManuallyReversed());
+
+            assertEquals(1100.0, loanDetails.getTransactions().get(2).getAmount());
+            assertEquals(1000.0, loanDetails.getTransactions().get(2).getPrincipalPortion());
+            assertEquals(100.0, loanDetails.getTransactions().get(2).getOverpaymentPortion());
+            assertEquals(LocalDate.of(2022, 9, 5), loanDetails.getTransactions().get(2).getDate());
+            assertEquals(0.0, loanDetails.getTransactions().get(2).getOutstandingLoanBalance());
+            assertEquals(1, loanDetails.getTransactions().get(2).getTransactionRelations().size());
+
+            assertEquals(200.0, loanDetails.getTransactions().get(3).getAmount());
+            assertEquals(100.0, loanDetails.getTransactions().get(3).getPrincipalPortion());
+            assertEquals(100.0, loanDetails.getTransactions().get(3).getOverpaymentPortion());
+            assertEquals(100.0, loanDetails.getTransactions().get(3).getOutstandingLoanBalance());
+            assertEquals(LocalDate.of(2022, 10, 10), loanDetails.getTransactions().get(3).getDate());
+            assertEquals(1, loanDetails.getTransactions().get(3).getTransactionRelations().size());
+
+            assertTrue(loanDetails.getStatus().getActive());
+
+            assertEquals(3, loanDetails.getRepaymentSchedule().getPeriods().size());
+            assertEquals(1000, loanDetails.getRepaymentSchedule().getPeriods().get(1).getPrincipalDue());
+            assertTrue(loanDetails.getRepaymentSchedule().getPeriods().get(1).getComplete());
+            assertEquals(200, loanDetails.getRepaymentSchedule().getPeriods().get(2).getPrincipalDue());
+            assertFalse(loanDetails.getRepaymentSchedule().getPeriods().get(2).getComplete());
+            assertEquals(100.0, loanDetails.getRepaymentSchedule().getPeriods().get(2).getPrincipalPaid());
+            assertEquals(100.0, loanDetails.getRepaymentSchedule().getPeriods().get(2).getPrincipalOutstanding());
+
+            journalEntriesForTransaction = JOURNAL_ENTRY_HELPER.getJournalEntries("L" + loanDetails.getTransactions().get(3).getId());
+            journalItems = journalEntriesForTransaction.getPageItems();
+            assertEquals(3, journalItems.size());
+            assertEquals(1,
+                    journalItems.stream().filter(item -> item.getAmount() == 200.0d)
+                            .filter(j -> "CREDIT".equalsIgnoreCase(j.getEntryType().getValue())
+                                    && j.getGlAccountId().equals(assetAccount.getAccountID().longValue()))
+                            .count());
+            assertEquals(1,
+                    journalItems.stream().filter(item -> item.getAmount() == 100.0d)
+                            .filter(j -> "DEBIT".equalsIgnoreCase(j.getEntryType().getValue())
+                                    && j.getGlAccountId().equals(overpaymentAccount.getAccountID().longValue()))
+                            .count());
+            assertEquals(1,
+                    journalItems.stream().filter(item -> item.getAmount() == 100.0d)
+                            .filter(j -> "DEBIT".equalsIgnoreCase(j.getEntryType().getValue())
+                                    && j.getGlAccountId().equals(assetAccount.getAccountID().longValue()))
+                            .count());
+
+        } finally {
+            GlobalConfigurationHelper.updateIsAutomaticExternalIdGenerationEnabled(REQUEST_SPEC, RESPONSE_SPEC, false);
+            GlobalConfigurationHelper.updateIsBusinessDateEnabled(REQUEST_SPEC, RESPONSE_SPEC, false);
+        }
+    }
+
+    @Test
+    public void testCreditBalanceRefundBeforeMaturityWithReverseReplayOfRepaymentsAndRefund() {
+        try {
+            GlobalConfigurationHelper.updateIsAutomaticExternalIdGenerationEnabled(REQUEST_SPEC, RESPONSE_SPEC, true);
+            GlobalConfigurationHelper.updateIsBusinessDateEnabled(REQUEST_SPEC, RESPONSE_SPEC, true);
+            BUSINESS_DATE_HELPER.updateBusinessDate(new BusinessDateRequest().type(BusinessDateType.BUSINESS_DATE.getName())
+                    .date("10 October 2022").dateFormat(DATETIME_PATTERN).locale("en"));
+
+            final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
+            final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
+            final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
+            final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
+
+            final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterest(assetAccount, incomeAccount,
+                    expenseAccount, overpaymentAccount);
+
+            final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC, "01 January 2011");
+
+            final Integer loanID = applyForLoanApplication(clientID, loanProductID);
+
+            HashMap<String, Object> loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+            LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+            loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("02 September 2022", loanID);
+            LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+            LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+            loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("03 September 2022", loanID, "1000");
+            LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+            LOAN_TRANSACTION_HELPER.makeRepayment("04 September 2022", Float.parseFloat("500"), loanID);
+            LOAN_TRANSACTION_HELPER.makeRepayment("05 September 2022", Float.parseFloat("700"), loanID);
+
+            GetLoansLoanIdResponse loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+            assertEquals(200.0, loanDetails.getTotalOverpaid());
+            assertTrue(loanDetails.getStatus().getOverpaid());
+
+            LOAN_TRANSACTION_HELPER.makeCreditBalanceRefund((long) loanID, new PostLoansLoanIdTransactionsRequest().transactionAmount(200.0)
+                    .transactionDate("06 September 2022").dateFormat(DATETIME_PATTERN).locale("en"));
+
+            LOAN_TRANSACTION_HELPER.makeMerchantIssuedRefund((long) loanID, new PostLoansLoanIdTransactionsRequest().locale("en")
+                    .dateFormat(DATETIME_PATTERN).transactionDate("07 September 2022").transactionAmount(500.0));
+
+            LOAN_TRANSACTION_HELPER.makeCreditBalanceRefund((long) loanID, new PostLoansLoanIdTransactionsRequest().transactionAmount(500.0)
+                    .transactionDate("08 September 2022").dateFormat(DATETIME_PATTERN).locale("en"));
+
+            loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+            assertTrue(loanDetails.getStatus().getClosedObligationsMet());
+
+            assertEquals(2, loanDetails.getRepaymentSchedule().getPeriods().size());
+            assertEquals(1000, loanDetails.getRepaymentSchedule().getPeriods().get(1).getPrincipalDue());
+
+            assertEquals(500.0, loanDetails.getTransactions().get(1).getAmount());
+            assertEquals(500.0, loanDetails.getTransactions().get(1).getPrincipalPortion());
+            assertEquals(LocalDate.of(2022, 9, 4), loanDetails.getTransactions().get(1).getDate());
+            assertEquals(500.0, loanDetails.getTransactions().get(1).getOutstandingLoanBalance());
+
+            assertEquals(700.0, loanDetails.getTransactions().get(2).getAmount());
+            assertEquals(500.0, loanDetails.getTransactions().get(2).getPrincipalPortion());
+            assertEquals(200.0, loanDetails.getTransactions().get(2).getOverpaymentPortion());
+            assertEquals(LocalDate.of(2022, 9, 5), loanDetails.getTransactions().get(2).getDate());
+            assertEquals(0.0, loanDetails.getTransactions().get(2).getOutstandingLoanBalance());
+
+            assertEquals(200.0, loanDetails.getTransactions().get(3).getAmount());
+            assertEquals(200.0, loanDetails.getTransactions().get(3).getOverpaymentPortion());
+            assertEquals(LocalDate.of(2022, 9, 6), loanDetails.getTransactions().get(3).getDate());
+            assertEquals(0.0, loanDetails.getTransactions().get(3).getOutstandingLoanBalance());
+
+            assertEquals(500.0, loanDetails.getTransactions().get(4).getAmount());
+            assertEquals(500.0, loanDetails.getTransactions().get(4).getOverpaymentPortion());
+            assertEquals(LocalDate.of(2022, 9, 7), loanDetails.getTransactions().get(4).getDate());
+            assertEquals(0.0, loanDetails.getTransactions().get(4).getOutstandingLoanBalance());
+
+            assertEquals(500.0, loanDetails.getTransactions().get(5).getAmount());
+            assertEquals(500.0, loanDetails.getTransactions().get(5).getOverpaymentPortion());
+            assertEquals(LocalDate.of(2022, 9, 8), loanDetails.getTransactions().get(5).getDate());
+            assertEquals(0.0, loanDetails.getTransactions().get(5).getOutstandingLoanBalance());
+
+            LOAN_TRANSACTION_HELPER.reverseLoanTransaction(loanDetails.getId(), loanDetails.getTransactions().get(2).getId(),
+                    new PostLoansLoanIdTransactionsTransactionIdRequest().dateFormat(DATETIME_PATTERN).transactionAmount(0.0)
+                            .transactionDate("07 September 2022").locale("en"));
+
+            loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+
+            assertEquals(500.0, loanDetails.getTransactions().get(1).getAmount());
+            assertEquals(500.0, loanDetails.getTransactions().get(1).getPrincipalPortion());
+            assertEquals(LocalDate.of(2022, 9, 4), loanDetails.getTransactions().get(1).getDate());
+            assertEquals(500.0, loanDetails.getTransactions().get(1).getOutstandingLoanBalance());
+
+            assertEquals(700.0, loanDetails.getTransactions().get(2).getAmount());
+            assertEquals(500.0, loanDetails.getTransactions().get(2).getPrincipalPortion());
+            assertEquals(200.0, loanDetails.getTransactions().get(2).getOverpaymentPortion());
+            assertEquals(LocalDate.of(2022, 9, 5), loanDetails.getTransactions().get(2).getDate());
+            assertEquals(0.0, loanDetails.getTransactions().get(2).getOutstandingLoanBalance());
+            assertTrue(loanDetails.getTransactions().get(2).getManuallyReversed());
+
+            assertEquals(200.0, loanDetails.getTransactions().get(3).getAmount());
+            assertEquals(200.0, loanDetails.getTransactions().get(3).getPrincipalPortion());
+            assertEquals(LocalDate.of(2022, 9, 6), loanDetails.getTransactions().get(3).getDate());
+            assertEquals(700.0, loanDetails.getTransactions().get(3).getOutstandingLoanBalance());
+            assertEquals(1, loanDetails.getTransactions().get(3).getTransactionRelations().size());
+
+            assertEquals(500.0, loanDetails.getTransactions().get(4).getAmount());
+            assertEquals(500.0, loanDetails.getTransactions().get(4).getPrincipalPortion());
+            assertEquals(LocalDate.of(2022, 9, 7), loanDetails.getTransactions().get(4).getDate());
+            assertEquals(200.0, loanDetails.getTransactions().get(4).getOutstandingLoanBalance());
+            assertEquals(1, loanDetails.getTransactions().get(4).getTransactionRelations().size());
+
+            assertEquals(500.0, loanDetails.getTransactions().get(5).getAmount());
+            assertEquals(500.0, loanDetails.getTransactions().get(5).getPrincipalPortion());
+            assertEquals(LocalDate.of(2022, 9, 8), loanDetails.getTransactions().get(5).getDate());
+            assertEquals(700.0, loanDetails.getTransactions().get(5).getOutstandingLoanBalance());
+            assertEquals(1, loanDetails.getTransactions().get(5).getTransactionRelations().size());
+
+            assertTrue(loanDetails.getStatus().getActive());
+
+            assertEquals(2, loanDetails.getRepaymentSchedule().getPeriods().size());
+            assertEquals(1700, loanDetails.getRepaymentSchedule().getPeriods().get(1).getPrincipalDue());
+            assertFalse(loanDetails.getRepaymentSchedule().getPeriods().get(1).getComplete());
+            assertEquals(1000.0, loanDetails.getRepaymentSchedule().getPeriods().get(1).getPrincipalPaid());
+            assertEquals(700.0, loanDetails.getRepaymentSchedule().getPeriods().get(1).getPrincipalOutstanding());
+
+        } finally {
+            GlobalConfigurationHelper.updateIsAutomaticExternalIdGenerationEnabled(REQUEST_SPEC, RESPONSE_SPEC, false);
+            GlobalConfigurationHelper.updateIsBusinessDateEnabled(REQUEST_SPEC, RESPONSE_SPEC, false);
+        }
+    }
+
+    @Test
+    public void accrualIsCalculatedWhenTheLoanIsClosed() {
+        try {
+            GlobalConfigurationHelper.updateIsAutomaticExternalIdGenerationEnabled(REQUEST_SPEC, RESPONSE_SPEC, true);
+            GlobalConfigurationHelper.updateIsBusinessDateEnabled(REQUEST_SPEC, RESPONSE_SPEC, true);
+            BUSINESS_DATE_HELPER.updateBusinessDate(new BusinessDateRequest().type(BusinessDateType.BUSINESS_DATE.getName())
+                    .date("10 October 2022").dateFormat(DATETIME_PATTERN).locale("en"));
+
+            final Account assetAccount = ACCOUNT_HELPER.createAssetAccount();
+            final Account incomeAccount = ACCOUNT_HELPER.createIncomeAccount();
+            final Account expenseAccount = ACCOUNT_HELPER.createExpenseAccount();
+            final Account overpaymentAccount = ACCOUNT_HELPER.createLiabilityAccount();
+
+            final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterest(assetAccount, incomeAccount,
+                    expenseAccount, overpaymentAccount);
+
+            final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC, "01 January 2011");
+            List<HashMap> charges = new ArrayList<>();
+            Integer installmentFee = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                    ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "10", false));
+            addCharges(charges, installmentFee, "10", null);
+
+            final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges);
+
+            HashMap<String, Object> loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+            LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+
+            loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan("02 September 2022", loanID);
+            LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+            LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
+
+            loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount("03 September 2022", loanID, "1000");
+            LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+
+            LOAN_TRANSACTION_HELPER.makeRepayment("04 September 2022", Float.parseFloat("5"), loanID);
+
+            PERIODIC_ACCRUAL_ACCOUNTING_HELPER.runPeriodicAccrualAccounting("04 September 2022");
+
+            Integer penalty = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                    ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "11", true));
+            LocalDate targetDate = LocalDate.of(2022, 9, 6);
+            final String penaltyCharge1AddedDate = DATE_TIME_FORMATTER.format(targetDate);
+
+            Integer penalty1LoanChargeId = LOAN_TRANSACTION_HELPER.addChargesForLoan(loanID,
+                    LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(penalty), penaltyCharge1AddedDate, "11"));
+
+            LOAN_TRANSACTION_HELPER.waiveLoanCharge((long) loanID, (long) penalty1LoanChargeId,
+                    new PostLoansLoanIdChargesChargeIdRequest());
+
+            LOAN_TRANSACTION_HELPER.makeRepayment("08 September 2022", Float.parseFloat("1010"), loanID);
+
+            GetLoansLoanIdResponse loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails((long) loanID);
+
+            GetLoansLoanIdTransactions lastAccrualTransaction = loanDetails.getTransactions().stream()
+                    .filter(t -> Boolean.TRUE.equals(t.getType().getAccrual())).findFirst().get();
+            assertEquals(15, lastAccrualTransaction.getAmount());
+            assertEquals(5, lastAccrualTransaction.getPenaltyChargesPortion());
+            assertEquals(10, lastAccrualTransaction.getFeeChargesPortion());
+
+            GetLoansLoanIdTransactionsTransactionIdResponse accrualTransactionDetails = LOAN_TRANSACTION_HELPER
+                    .getLoanTransactionDetails((long) loanID, lastAccrualTransaction.getId());
+
+            assertEquals(2, accrualTransactionDetails.getLoanChargePaidByList().size());
+            accrualTransactionDetails.getLoanChargePaidByList().forEach(loanCharge -> {
+                if (loanCharge.getChargeId().equals((long) penalty1LoanChargeId)) {
+                    assertEquals(5, loanCharge.getAmount());
+                } else {
+                    assertEquals(10, loanCharge.getAmount());
+                }
+            });
+
+        } finally {
+            GlobalConfigurationHelper.updateIsAutomaticExternalIdGenerationEnabled(REQUEST_SPEC, RESPONSE_SPEC, false);
+            GlobalConfigurationHelper.updateIsBusinessDateEnabled(REQUEST_SPEC, RESPONSE_SPEC, false);
+        }
+    }
+
+    @Test
+    public void testLoanTransactionOrderAfterReverseReplay() {
+        try {
+            GlobalConfigurationHelper.updateEnabledFlagForGlobalConfiguration(REQUEST_SPEC, RESPONSE_SPEC, "42", true);
+            GlobalConfigurationHelper.updateIsBusinessDateEnabled(REQUEST_SPEC, RESPONSE_SPEC, Boolean.TRUE);
+            BUSINESS_DATE_HELPER.updateBusinessDate(new BusinessDateRequest().type(BusinessDateType.BUSINESS_DATE.getName())
+                    .date("01 January 2023").dateFormat(DATETIME_PATTERN).locale("en"));
+            LOG.info("-----------------------------------NEW CLIENT-----------------------------------------");
+            final PostClientsRequest newClient = createRandomClientWithDate("01 January 2023");
+            final PostClientsResponse clientResponse = CLIENT_HELPER.createClient(newClient);
+            LOG.info("-----------------------------------NEW LOAN PRODUCT-----------------------------------------");
+            PostLoanProductsRequest loanProductsRequest = createOnePeriod30DaysLongNoInterestPeriodicAccrualProduct();
+            final PostLoanProductsResponse loanProductResponse = LOAN_PRODUCT_HELPER.createLoanProduct(loanProductsRequest);
+            LOG.info("-----------------------------------CREATE CHARGES-----------------------------------------");
+            PostChargesResponse penaltyCharge = CHARGES_HELPER.createCharges(new PostChargesRequest().penalty(true).amount(10.0)
+                    .chargeCalculationType(ChargeCalculationType.FLAT.getValue())
+                    .chargeTimeType(ChargeTimeType.SPECIFIED_DUE_DATE.getValue()).chargePaymentMode(ChargePaymentMode.REGULAR.getValue())
+                    .currencyCode("USD").name(Utils.randomStringGenerator("PENALTY_" + Calendar.getInstance().getTimeInMillis(), 5))
+                    .chargeAppliesTo(1).locale("en").active(true));
+            LOG.info("-----------------------------------SUBMIT LOAN-----------------------------------------");
+            final PostLoansResponse loanApplicationResult = applyForLoanApplicationForOnePeriod30DaysLongNoInterestPeriodicAccrual(
+                    clientResponse.getResourceId(), loanProductResponse.getResourceId(), "01 January 2023",
+                    LoanApplicationTestBuilder.DUE_PENALTY_INTEREST_PRINCIPAL_FEE_IN_ADVANCE_PENALTY_INTEREST_PRINCIPAL_FEE_STRATEGY);
+            LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
+            PostLoansLoanIdResponse approvedLoanResult = LOAN_TRANSACTION_HELPER.approveLoan(loanApplicationResult.getResourceId(),
+                    new PostLoansLoanIdRequest().approvedLoanAmount(BigDecimal.valueOf(1000.0)).dateFormat(DATETIME_PATTERN)
+                            .approvedOnDate("01 January 2023").locale("en"));
+            LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
+            String loanDisbursementUUID = UUID.randomUUID().toString();
+            PostLoansLoanIdResponse disbursedLoanResult = LOAN_TRANSACTION_HELPER.disburseLoan(loanApplicationResult.getResourceId(),
+                    new PostLoansLoanIdRequest().actualDisbursementDate("01 January 2023").dateFormat(DATETIME_PATTERN)
+                            .transactionAmount(BigDecimal.valueOf(1000.00)).locale("en").externalId(loanDisbursementUUID));
+            Long loanId = disbursedLoanResult.getResourceId();
+            LOG.info("-------------------------------ADD CHARGES-------------------------------------------");
+            PostLoansLoanIdChargesResponse penaltyLoanChargeResult = LOAN_TRANSACTION_HELPER.addChargesForLoan(loanId,
+                    new PostLoansLoanIdChargesRequest().chargeId(penaltyCharge.getResourceId()).dateFormat(DATETIME_PATTERN).locale("en")
+                            .amount(10.0).dueDate("10 January 2023"));
+            LOG.info("-------------------------------DO SOME PARTIAL REPAYMENTS-------------------------------------------");
+            BUSINESS_DATE_HELPER.updateBusinessDate(new BusinessDateRequest().type(BusinessDateType.BUSINESS_DATE.getName())
+                    .date("07 January 2023").dateFormat(DATETIME_PATTERN).locale("en"));
+            String firstRepaymentUUID = UUID.randomUUID().toString();
+            PostLoansLoanIdTransactionsResponse firstRepaymentResult = LOAN_TRANSACTION_HELPER.makeLoanRepayment(loanId,
+                    new PostLoansLoanIdTransactionsRequest().dateFormat(DATETIME_PATTERN).transactionDate("07 January 2023").locale("en")
+                            .transactionAmount(9.0).externalId(firstRepaymentUUID));
+            String secondRepaymentUUID = UUID.randomUUID().toString();
+            PostLoansLoanIdTransactionsResponse secondRepaymentResult = LOAN_TRANSACTION_HELPER.makeLoanRepayment(loanId,
+                    new PostLoansLoanIdTransactionsRequest().dateFormat(DATETIME_PATTERN).transactionDate("07 January 2023").locale("en")
+                            .transactionAmount(8.0).externalId(secondRepaymentUUID));
+            String thirdRepaymentUUID = UUID.randomUUID().toString();
+            PostLoansLoanIdTransactionsResponse thirdRepaymentResult = LOAN_TRANSACTION_HELPER.makeLoanRepayment(loanId,
+                    new PostLoansLoanIdTransactionsRequest().dateFormat(DATETIME_PATTERN).transactionDate("07 January 2023").locale("en")
+                            .transactionAmount(7.0).externalId(thirdRepaymentUUID));
+            LOG.info("-------------------------------CHECK LOAN TRANSACTION ORDER-------------------------------------------");
+            checkLoanTransactionOrder(loanId, loanDisbursementUUID, firstRepaymentUUID, secondRepaymentUUID, thirdRepaymentUUID);
+            LOG.info(
+                    "-------------------------------REVERT FIRST REPAYMENT AND CHECK LOAN TRANSACTION ORDER-------------------------------------------");
+            LOAN_TRANSACTION_HELPER.reverseLoanTransaction(loanId, firstRepaymentUUID, new PostLoansLoanIdTransactionsTransactionIdRequest()
+                    .dateFormat(DATETIME_PATTERN).transactionDate("07 January 2023").transactionAmount(0.0).locale("en"));
+            checkLoanTransactionOrder(loanId, loanDisbursementUUID, firstRepaymentUUID, secondRepaymentUUID, thirdRepaymentUUID);
+            LOG.info(
+                    "-------------------------------REVERT SECOND REPAYMENT AND CHECK LOAN TRANSACTION ORDER-------------------------------------------");
+            LOAN_TRANSACTION_HELPER.reverseLoanTransaction(loanId, secondRepaymentUUID,
+                    new PostLoansLoanIdTransactionsTransactionIdRequest().dateFormat(DATETIME_PATTERN).transactionDate("07 January 2023")
+                            .transactionAmount(0.0).locale("en"));
+            checkLoanTransactionOrder(loanId, loanDisbursementUUID, firstRepaymentUUID, secondRepaymentUUID, thirdRepaymentUUID);
+        } finally {
+            GlobalConfigurationHelper.updateIsBusinessDateEnabled(REQUEST_SPEC, RESPONSE_SPEC, Boolean.FALSE);
+            GlobalConfigurationHelper.updateEnabledFlagForGlobalConfiguration(REQUEST_SPEC, RESPONSE_SPEC, "42", false);
+        }
+    }
+
+    private void checkLoanTransactionOrder(Long loanId, String... transactionUUIDs) {
+        LOG.info("-------------------------------CHECK LOAN TRANSACTION ORDER-------------------------------------------");
+        GetLoansLoanIdResponse loanDetailsResult = LOAN_TRANSACTION_HELPER.getLoanDetails(loanId);
+        for (int i = 0; i < transactionUUIDs.length; i++) {
+            assertEquals(transactionUUIDs[i], loanDetailsResult.getTransactions().get(i).getExternalId());
+        }
+    }
+
+    private PostClientsRequest createRandomClientWithDate(String date) {
+        return new PostClientsRequest().officeId(1).legalFormId(1).firstname(Utils.randomStringGenerator("", 5))
+                .lastname(Utils.randomStringGenerator("", 5)).active(true).locale("en").activationDate(date).dateFormat(DATETIME_PATTERN);
+    }
+
+    private Integer applyForLoanApplication(final Integer clientID, final Integer loanProductID, final List<HashMap> charges) {
+        LOG.info("--------------------------------APPLYING FOR LOAN APPLICATION--------------------------------");
+        final String loanApplicationJSON = new LoanApplicationTestBuilder().withPrincipal("1000").withLoanTermFrequency("1")
+                .withLoanTermFrequencyAsMonths().withNumberOfRepayments("1").withRepaymentEveryAfter("1")
+                .withRepaymentFrequencyTypeAsMonths().withInterestRatePerPeriod("0").withInterestTypeAsFlatBalance()
+                .withAmortizationTypeAsEqualPrincipalPayments().withInterestCalculationPeriodTypeSameAsRepaymentPeriod()
+                .withCharges(charges).withExpectedDisbursementDate("03 September 2022").withSubmittedOnDate("01 September 2022")
+                .withLoanType("individual").build(clientID.toString(), loanProductID.toString(), null);
+        return LOAN_TRANSACTION_HELPER.getLoanId(loanApplicationJSON);
+    }
+
+    private Integer applyForLoanApplication(final Integer clientID, final Integer loanProductID) {
+        LOG.info("--------------------------------APPLYING FOR LOAN APPLICATION--------------------------------");
+        final String loanApplicationJSON = new LoanApplicationTestBuilder().withPrincipal("1000").withLoanTermFrequency("1")
+                .withLoanTermFrequencyAsMonths().withNumberOfRepayments("1").withRepaymentEveryAfter("1")
+                .withRepaymentFrequencyTypeAsMonths().withInterestRatePerPeriod("0").withInterestTypeAsFlatBalance()
+                .withAmortizationTypeAsEqualPrincipalPayments().withInterestCalculationPeriodTypeSameAsRepaymentPeriod()
+                .withExpectedDisbursementDate("03 September 2022").withSubmittedOnDate("01 September 2022").withLoanType("individual")
+                .build(clientID.toString(), loanProductID.toString(), null);
+        return LOAN_TRANSACTION_HELPER.getLoanId(loanApplicationJSON);
+    }
+
+    private Integer createLoanProductWithPeriodicAccrualAccountingNoInterest(final Account... accounts) {
+        LOG.info("------------------------------CREATING NEW LOAN PRODUCT ---------------------------------------");
+        final String loanProductJSON = new LoanProductTestBuilder().withPrincipal("1000").withRepaymentTypeAsMonth()
+                .withRepaymentAfterEvery("1").withNumberOfRepayments("1").withRepaymentTypeAsMonth().withinterestRatePerPeriod("0")
+                .withInterestRateFrequencyTypeAsMonths().withAmortizationTypeAsEqualPrincipalPayment().withInterestTypeAsFlat()
+                .withAccountingRulePeriodicAccrual(accounts).withDaysInMonth("30").withDaysInYear("365").withMoratorium("0", "0")
+                .build(null);
+        return LOAN_TRANSACTION_HELPER.getLoanProductId(loanProductJSON);
+    }
+
+    private Integer createLoanProductWithPeriodicAccrualAccountingNoInterestMultiDisbursement(final Account... accounts) {
+        LOG.info("------------------------------CREATING NEW LOAN PRODUCT ---------------------------------------");
+        final String loanProductJSON = new LoanProductTestBuilder().withPrincipal("1000").withRepaymentTypeAsMonth()
+                .withRepaymentAfterEvery("1").withNumberOfRepayments("1").withRepaymentTypeAsMonth().withinterestRatePerPeriod("0")
+                .withInterestRateFrequencyTypeAsMonths().withAmortizationTypeAsEqualPrincipalPayment().withInterestTypeAsDecliningBalance()
+                .withAccountingRulePeriodicAccrual(accounts).withInterestCalculationPeriodTypeAsRepaymentPeriod(true).withDaysInMonth("30")
+                .withDaysInYear("365").withMoratorium("0", "0").withMultiDisburse().withDisallowExpectedDisbursements(true).build(null);
+        return LOAN_TRANSACTION_HELPER.getLoanProductId(loanProductJSON);
+    }
+
+    private void validateIfValuesAreNotOverridden(Integer loanID, Integer loanProductID) {
+        String loanProductDetails = LOAN_TRANSACTION_HELPER.getLoanProductDetails(REQUEST_SPEC, RESPONSE_SPEC, loanProductID);
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        List<String> comparisonAttributes = Arrays.asList("amortizationType", "interestType", "transactionProcessingStrategyCode",
+                "interestCalculationPeriodType", "repaymentFrequencyType", "graceOnPrincipalPayment", "graceOnInterestPayment",
+                "inArrearsTolerance", "graceOnArrearsAgeing");
+
+        for (String comparisonAttribute : comparisonAttributes) {
+            Object val1 = JsonPath.from(loanProductDetails).get(comparisonAttribute);
+            Object val2 = JsonPath.from(loanDetails).get(comparisonAttribute);
+            assertEquals(val1, val2);
+        }
+    }
+
+    private JsonObject createLoanProductConfigurationDetail(JsonObject loanProductConfiguration, Boolean bool) {
+        loanProductConfiguration.addProperty("amortizationType", bool);
+        loanProductConfiguration.addProperty("interestType", bool);
+        loanProductConfiguration.addProperty("transactionProcessingStrategyCode", bool);
+        loanProductConfiguration.addProperty("interestCalculationPeriodType", bool);
+        loanProductConfiguration.addProperty("inArrearsTolerance", bool);
+        loanProductConfiguration.addProperty("repaymentEvery", bool);
+        loanProductConfiguration.addProperty("graceOnPrincipalAndInterestPayment", bool);
+        loanProductConfiguration.addProperty("graceOnArrearsAgeing", bool);
+        return loanProductConfiguration;
+    }
+
+    private Integer applyForLoanApplicationWithProductConfigurationAsTrue(final Integer clientID, final Integer loanProductID,
+            String principal) {
+        LOG.info("--------------------------------APPLYING FOR LOAN APPLICATION--------------------------------");
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
+        Assertions.assertNotNull(collateralId);
+        List<HashMap> collaterals = new ArrayList<>();
+
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
+                String.valueOf(clientID), collateralId);
+        Assertions.assertNotNull(clientCollateralId);
+        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
+        final String loanApplicationJSON = new LoanApplicationTestBuilder() //
+                .withPrincipal(principal) //
+                .withRepaymentEveryAfter("1") //
+                .withLoanTermFrequency("4") //
+                .withLoanTermFrequencyAsMonths() //
+                .withNumberOfRepayments("4") //
+                .withRepaymentFrequencyTypeAsMonths() //
+                .withInterestRatePerPeriod("2") //
+                .withInterestCalculationPeriodTypeSameAsRepaymentPeriod() //
+                .withExpectedDisbursementDate("01 March 2014") //
+                .withSubmittedOnDate("01 March 2014") //
+                .withCollaterals(collaterals).build(clientID.toString(), loanProductID.toString(), null);
+        return LOAN_TRANSACTION_HELPER.getLoanId(loanApplicationJSON);
+    }
+
+    private Integer applyForLoanApplicationWithProductConfigurationAsFalse(final Integer clientID, final Integer loanProductID,
+            String principal) {
+        LOG.info("--------------------------------APPLYING FOR LOAN APPLICATION--------------------------------");
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
+        Assertions.assertNotNull(collateralId);
+        List<HashMap> collaterals = new ArrayList<>();
+
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
+                String.valueOf(clientID), collateralId);
+        Assertions.assertNotNull(clientCollateralId);
+        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
+        final String loanApplicationJSON = new LoanApplicationTestBuilder()
+                //
+                .withPrincipal(principal)
+                //
+                .withRepaymentEveryAfter("2")
+                //
+                .withAmortizationTypeAsEqualPrincipalPayments().withRepaymentFrequencyTypeAsWeeks()
+                .withRepaymentStrategy(LoanProductTestBuilder.RBI_INDIA_STRATEGY).withInterestTypeAsFlatBalance()
+                .withInterestCalculationPeriodTypeSameAsRepaymentPeriod().withPrincipalGrace("1").withInterestGrace("1")
+                .withLoanTermFrequency("4") //
+                .withLoanTermFrequencyAsMonths() //
+                .withNumberOfRepayments("4") //
+                .withRepaymentFrequencyTypeAsMonths() //
+                .withInterestRatePerPeriod("2") //
+                .withInterestCalculationPeriodTypeSameAsRepaymentPeriod() //
+                .withExpectedDisbursementDate("01 March 2014") //
+                .withSubmittedOnDate("01 March 2014") //
+                .withCollaterals(collaterals).build(clientID.toString(), loanProductID.toString(), null);
+
+        return LOAN_TRANSACTION_HELPER.getLoanId(loanApplicationJSON);
+    }
+
+    private Integer getDayOfWeek(Calendar date) {
+        int dayOfWeek = 0;
+        if (null != date) {
+            dayOfWeek = date.get(Calendar.DAY_OF_WEEK) - 1;
+            if (dayOfWeek == 0) {
+                dayOfWeek = 7;
+            }
+        }
+        return dayOfWeek;
+    }
+
+    private Integer getDayOfMonth(Calendar date) {
+        int dayOfMonth = 0;
+        if (null != date) {
+            dayOfMonth = date.get(Calendar.DAY_OF_MONTH);
+            if (dayOfMonth > 28) {
+                dayOfMonth = 28;
+            }
+        }
+
+        return dayOfMonth;
+    }
+
     private void validateCharge(Integer amountPercentage, final List<HashMap> loanCharges, final String amount, final String outstanding,
             String amountPaid, String amountWaived) {
         HashMap chargeDetail = getloanCharge(amountPercentage, loanCharges);
@@ -1209,7 +7079,7 @@ public class ClientLoanIntegrationTest {
             builder = builder.withInterestCalculationPeriodTypeAsRepaymentPeriod(true);
         }
         final String loanProductJSON = builder.build(null);
-        return this.loanTransactionHelper.getLoanProductId(loanProductJSON);
+        return LOAN_TRANSACTION_HELPER.getLoanProductId(loanProductJSON);
     }
 
     private Integer createLoanProduct(final String inMultiplesOf, final String digitsAfterDecimal, final String repaymentStrategy) {
@@ -1225,7 +7095,7 @@ public class ClientLoanIntegrationTest {
                 .withAmortizationTypeAsEqualPrincipalPayment() //
                 .withInterestTypeAsDecliningBalance() //
                 .currencyDetails(digitsAfterDecimal, inMultiplesOf).build(null);
-        return this.loanTransactionHelper.getLoanProductId(loanProductJSON);
+        return LOAN_TRANSACTION_HELPER.getLoanProductId(loanProductJSON);
     }
 
     private Integer createLoanProduct(final String inMultiplesOf, final String digitsAfterDecimal, final String repaymentStrategy,
@@ -1242,7 +7112,7 @@ public class ClientLoanIntegrationTest {
                 .withAmortizationTypeAsEqualPrincipalPayment() //
                 .withInterestTypeAsDecliningBalance() //
                 .currencyDetails(digitsAfterDecimal, inMultiplesOf).withAccounting(accountingRule, accounts).build(null);
-        return this.loanTransactionHelper.getLoanProductId(loanProductJSON);
+        return LOAN_TRANSACTION_HELPER.getLoanProductId(loanProductJSON);
     }
 
     private Integer applyForLoanApplication(final Integer clientID, final Integer loanProductID, String graceOnPrincipalPayment,
@@ -1262,7 +7132,7 @@ public class ClientLoanIntegrationTest {
                 .withPrincipalGrace(graceOnPrincipalPayment).withExpectedDisbursementDate("02 June 2014") //
                 .withSubmittedOnDate("02 June 2014") //
                 .withCollaterals(collaterals).build(clientID.toString(), loanProductID.toString(), null);
-        return this.loanTransactionHelper.getLoanId(loanApplicationJSON);
+        return LOAN_TRANSACTION_HELPER.getLoanId(loanApplicationJSON);
     }
 
     private Integer applyForLoanApplication(final Integer clientID, final Integer loanProductID, List<HashMap> charges,
@@ -1282,11 +7152,12 @@ public class ClientLoanIntegrationTest {
                 .withExpectedDisbursementDate("20 September 2011") //
                 .withSubmittedOnDate("20 September 2011") //
                 .withCollaterals(collaterals).withCharges(charges).build(clientID.toString(), loanProductID.toString(), savingsId);
-        return this.loanTransactionHelper.getLoanId(loanApplicationJSON);
+        return LOAN_TRANSACTION_HELPER.getLoanId(loanApplicationJSON);
     }
 
-    private Integer applyForLoanApplicationWithExternalId(RequestSpecification requestSpec, ResponseSpecification responseSpec,
-            final Integer clientID, final Integer loanProductID, String principal, final String externalId) {
+    private Integer applyForLoanApplicationWithExternalId(RequestSpecification requestSpecification,
+            ResponseSpecification responseSpecification, final Integer clientID, final Integer loanProductID, String principal,
+            final String externalId) {
         LOG.info("------------------------APPLYING FOR LOAN APPLICATION WITH EXTERNALID------------------------");
         final String loanApplicationJSON = new LoanApplicationTestBuilder() //
                 .withPrincipal(principal) //
@@ -1303,7 +7174,7 @@ public class ClientLoanIntegrationTest {
                 .withExpectedDisbursementDate("20 September 2011") //
                 .withSubmittedOnDate("20 September 2011") //
                 .build(clientID.toString(), loanProductID.toString(), null);
-        return this.loanTransactionHelper.getLoanId(loanApplicationJSON, requestSpec, responseSpec);
+        return LOAN_TRANSACTION_HELPER.getLoanId(loanApplicationJSON, requestSpecification, responseSpecification);
     }
 
     private Integer applyForLoanApplicationWithTranches(final Integer clientID, final Integer loanProductID, List<HashMap> charges,
@@ -1324,7 +7195,7 @@ public class ClientLoanIntegrationTest {
                 .withCollaterals(collaterals).withTranches(tranches) //
                 .withSubmittedOnDate("01 March 2014") //
                 .withCharges(charges).build(clientID.toString(), loanProductID.toString(), savingsId);
-        return this.loanTransactionHelper.getLoanId(loanApplicationJSON);
+        return LOAN_TRANSACTION_HELPER.getLoanId(loanApplicationJSON);
     }
 
     private String updateLoanJson(final Integer clientID, final Integer loanProductID, List<HashMap> charges, String savingsId,
@@ -1365,7 +7236,7 @@ public class ClientLoanIntegrationTest {
                 .withSubmittedOnDate("20 September 2011") //
                 .withRepaymentStrategy(repaymentStrategy) //
                 .withCollaterals(collaterals).withCharges(charges).build(clientID.toString(), loanProductID.toString(), savingsId);
-        return this.loanTransactionHelper.getLoanId(loanApplicationJSON);
+        return LOAN_TRANSACTION_HELPER.getLoanId(loanApplicationJSON);
     }
 
     private Integer applyForLoanApplicationWithPaymentStrategyAndPastMonth(final Integer clientID, final Integer loanProductID,
@@ -1375,7 +7246,7 @@ public class ClientLoanIntegrationTest {
 
         Calendar fourMonthsfromNowCalendar = Calendar.getInstance(Utils.getTimeZoneOfTenant());
         fourMonthsfromNowCalendar.add(Calendar.MONTH, month);
-        DateFormat dateFormat = new SimpleDateFormat("dd MMMMMM yyyy");
+        DateFormat dateFormat = new SimpleDateFormat(DATETIME_PATTERN);
         dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
         String fourMonthsfromNow = dateFormat.format(fourMonthsfromNowCalendar.getTime());
         final String loanApplicationJSON = new LoanApplicationTestBuilder() //
@@ -1393,7 +7264,7 @@ public class ClientLoanIntegrationTest {
                 .withSubmittedOnDate(fourMonthsfromNow) //
                 .withRepaymentStrategy(repaymentStrategy) //
                 .withCollaterals(collaterals).withCharges(charges).build(clientID.toString(), loanProductID.toString(), savingsId);
-        return this.loanTransactionHelper.getLoanId(loanApplicationJSON);
+        return LOAN_TRANSACTION_HELPER.getLoanId(loanApplicationJSON);
     }
 
     private void verifyLoanRepaymentSchedule(final ArrayList<HashMap> loanSchedule) {
@@ -1597,3104 +7468,18 @@ public class ClientLoanIntegrationTest {
         return detail;
     }
 
-    /***
-     * Test case for checking CashBasedAccounting functionality adding charges with calculation type flat
-     */
-    @Test
-    public void loanWithFlatCahargesAndCashBasedAccountingEnabled() {
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-
-        // Add charges with payment mode regular
-        List<HashMap> charges = new ArrayList<>();
-        Integer flatDisbursement = ChargesHelper.createCharges(requestSpec, responseSpec, ChargesHelper.getLoanDisbursementJSON());
-        addCharges(charges, flatDisbursement, "100", null);
-        Integer flatSpecifiedDueDate = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "100", false));
-        addCharges(charges, flatSpecifiedDueDate, "100", "29 September 2011");
-        Integer flatInstallmentFee = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "50", false));
-        addCharges(charges, flatInstallmentFee, "50", null);
-
-        final Account assetAccount = this.accountHelper.createAssetAccount();
-        final Account incomeAccount = this.accountHelper.createIncomeAccount();
-        final Account expenseAccount = this.accountHelper.createExpenseAccount();
-        final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
-
-        List<HashMap> collaterals = new ArrayList<>();
-
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
-
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
-                String.valueOf(clientID), collateralId);
-        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
-
-        final Integer loanProductID = createLoanProduct(false, CASH_BASED, assetAccount, incomeAccount, expenseAccount, overpaymentAccount);
-
-        final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges, null, "12,000.00", collaterals);
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        verifyLoanRepaymentSchedule(loanSchedule);
-
-        List<HashMap> loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(flatDisbursement, loanCharges, "100", "100.00", "0.0", "0.0");
-        validateCharge(flatSpecifiedDueDate, loanCharges, "100", "100.00", "0.0", "0.0");
-        validateCharge(flatInstallmentFee, loanCharges, "50", "200.00", "0.0", "0.0");
-
-        // check for disbursement fee
-        HashMap disbursementDetail = loanSchedule.get(0);
-        validateNumberForEqual("100.00", String.valueOf(disbursementDetail.get("feeChargesDue")));
-
-        // check for charge at specified date and installment fee
-        HashMap firstInstallment = loanSchedule.get(1);
-        validateNumberForEqual("150.00", String.valueOf(firstInstallment.get("feeChargesDue")));
-
-        // check for installment fee
-        HashMap secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("50.00", String.valueOf(secondInstallment.get("feeChargesDue")));
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan("20 September 2011", loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(Float.parseFloat("100.00"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.DEBIT) };
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 September 2011", assetAccountInitialEntry);
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 September 2011",
-                new JournalEntry(Float.parseFloat("100.00"), JournalEntry.TransactionType.CREDIT));
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(flatDisbursement, loanCharges, "100", "0.00", "100.0", "0.0");
-
-        LOG.info("-------------Make repayment 1-----------");
-        this.loanTransactionHelper.makeRepayment("20 October 2011", Float.parseFloat("3301.49"), loanID);
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(flatDisbursement, loanCharges, "100", "0.00", "100.0", "0.0");
-        validateCharge(flatSpecifiedDueDate, loanCharges, "100", "0.00", "100.0", "0.0");
-        validateCharge(flatInstallmentFee, loanCharges, "50", "150.00", "50.0", "0.0");
-
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
-                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("2911.49"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 October 2011",
-                new JournalEntry(Float.parseFloat("150.00"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("240.00"), JournalEntry.TransactionType.CREDIT));
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper
-                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatSpecifiedDueDate), "29 October 2011", "100"));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("150.00", String.valueOf(secondInstallment.get("feeChargesDue")));
-        this.loanTransactionHelper.waiveChargesForLoan(loanID, (Integer) getloanCharge(flatInstallmentFee, loanCharges).get("id"),
-                LoanTransactionHelper.getWaiveChargeJSON(String.valueOf(2)));
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(flatInstallmentFee, loanCharges, "50", "100.00", "50.0", "50.0");
-
-        LOG.info("----------Make repayment 2------------");
-        this.loanTransactionHelper.makeRepayment("20 November 2011", Float.parseFloat("3251.49"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("3251.49"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("2969.72"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("100.00"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("181.77"), JournalEntry.TransactionType.CREDIT));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("0", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("--------------Waive interest---------------");
-        this.loanTransactionHelper.waiveInterest("20 December 2011", String.valueOf(61.79), loanID);
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap thirdInstallment = loanSchedule.get(3);
-        validateNumberForEqual("60.59", String.valueOf(thirdInstallment.get("interestOutstanding")));
-
-        Integer flatPenaltySpecifiedDueDate = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "100", true));
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper
-                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatPenaltySpecifiedDueDate), "29 September 2011", "100"));
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(flatPenaltySpecifiedDueDate, loanCharges, "100", "0.00", "100.0", "0.0");
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("100", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
-
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
-                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("2811.49"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 October 2011",
-                new JournalEntry(Float.parseFloat("100.00"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("150.00"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("240"), JournalEntry.TransactionType.CREDIT));
-
-        LOG.info("----------Make repayment 3 advance------------");
-        this.loanTransactionHelper.makeRepayment("20 November 2011", Float.parseFloat("3301.49"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3129.11"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("50.00"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("122.38"), JournalEntry.TransactionType.CREDIT));
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper
-                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatPenaltySpecifiedDueDate), "10 January 2012", "100"));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap fourthInstallment = loanSchedule.get(4);
-        validateNumberForEqual("100", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
-        validateNumberForEqual("3239.68", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("----------Pay applied penalty ------------");
-        this.loanTransactionHelper.makeRepayment("20 January 2012", Float.parseFloat("100"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("100"), JournalEntry.TransactionType.DEBIT));
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("100.00"), JournalEntry.TransactionType.CREDIT));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        fourthInstallment = loanSchedule.get(4);
-        validateNumberForEqual("0", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
-        validateNumberForEqual("3139.68", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("----------Make repayment 4 ------------");
-        this.loanTransactionHelper.makeRepayment("20 January 2012", Float.parseFloat("3139.68"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("3139.68"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3089.68"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("50.00"), JournalEntry.TransactionType.CREDIT));
-    }
-
-    /***
-     * Test case for checking CashBasedAccounting functionality adding charges with calculation type percentage of
-     * amount
-     */
-    @Test
-    public void loanWithCahargesOfTypeAmountPercentageAndCashBasedAccountingEnabled() {
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-
-        // Add charges with payment mode regular
-        List<HashMap> charges = new ArrayList<>();
-        Integer percentageDisbursementCharge = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanDisbursementJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1"));
-        addCharges(charges, percentageDisbursementCharge, "1", null);
-
-        Integer percentageSpecifiedDueDateCharge = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", false));
-        addCharges(charges, percentageSpecifiedDueDateCharge, "1", "29 September 2011");
-
-        Integer percentageInstallmentFee = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", false));
-        addCharges(charges, percentageInstallmentFee, "1", "29 September 2011");
-
-        final Account assetAccount = this.accountHelper.createAssetAccount();
-        final Account incomeAccount = this.accountHelper.createIncomeAccount();
-        final Account expenseAccount = this.accountHelper.createExpenseAccount();
-        final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
-
-        List<HashMap> collaterals = new ArrayList<>();
-
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
-        Assertions.assertNotNull(collateralId);
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
-                clientID.toString(), collateralId);
-        Assertions.assertNotNull(clientCollateralId);
-        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
-
-        final Integer loanProductID = createLoanProduct(false, CASH_BASED, assetAccount, incomeAccount, expenseAccount, overpaymentAccount);
-        final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges, null, "12,000.00", collaterals);
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        verifyLoanRepaymentSchedule(loanSchedule);
-
-        List<HashMap> loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(percentageDisbursementCharge, loanCharges, "1", "120.00", "0.0", "0.0");
-        validateCharge(percentageSpecifiedDueDateCharge, loanCharges, "1", "120.00", "0.0", "0.0");
-        validateCharge(percentageInstallmentFee, loanCharges, "1", "120.00", "0.0", "0.0");
-
-        // check for disbursement fee
-        HashMap disbursementDetail = loanSchedule.get(0);
-        validateNumberForEqual("120.00", String.valueOf(disbursementDetail.get("feeChargesDue")));
-
-        // check for charge at specified date and installment fee
-        HashMap firstInstallment = loanSchedule.get(1);
-        validateNumberForEqual("149.11", String.valueOf(firstInstallment.get("feeChargesDue")));
-
-        // check for installment fee
-        HashMap secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("29.70", String.valueOf(secondInstallment.get("feeChargesDue")));
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan("20 September 2011", loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.DEBIT) };
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 September 2011", assetAccountInitialEntry);
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 September 2011",
-                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.CREDIT));
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(percentageDisbursementCharge, loanCharges, "1", "0.0", "120.00", "0.0");
-
-        LOG.info("-------------Make repayment 1-----------");
-        this.loanTransactionHelper.makeRepayment("20 October 2011", Float.parseFloat("3300.60"), loanID);
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(percentageDisbursementCharge, loanCharges, "1", "0.00", "120.00", "0.0");
-        validateCharge(percentageSpecifiedDueDateCharge, loanCharges, "1", "0.00", "120.0", "0.0");
-        validateCharge(percentageInstallmentFee, loanCharges, "1", "90.89", "29.11", "0.0");
-
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
-                new JournalEntry(Float.parseFloat("3300.60"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("2911.49"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 October 2011",
-                new JournalEntry(Float.parseFloat("149.11"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("240.00"), JournalEntry.TransactionType.CREDIT));
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper
-                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(percentageSpecifiedDueDateCharge), "29 October 2011", "1"));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("149.70", String.valueOf(secondInstallment.get("feeChargesDue")));
-        this.loanTransactionHelper.waiveChargesForLoan(loanID, (Integer) getloanCharge(percentageInstallmentFee, loanCharges).get("id"),
-                LoanTransactionHelper.getWaiveChargeJSON(String.valueOf(2)));
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(percentageInstallmentFee, loanCharges, "1", "61.19", "29.11", "29.70");
-
-        LOG.info("----------Make repayment 2------------");
-        this.loanTransactionHelper.makeRepayment("20 November 2011", Float.parseFloat("3271.49"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("3271.49"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("2969.72"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("181.77"), JournalEntry.TransactionType.CREDIT));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("0", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("--------------Waive interest---------------");
-        this.loanTransactionHelper.waiveInterest("20 December 2011", String.valueOf(61.79), loanID);
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap thirdInstallment = loanSchedule.get(3);
-        validateNumberForEqual("60.59", String.valueOf(thirdInstallment.get("interestOutstanding")));
-
-        Integer percentagePenaltySpecifiedDueDate = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", true));
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper
-                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(percentagePenaltySpecifiedDueDate), "29 September 2011", "1"));
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(percentagePenaltySpecifiedDueDate, loanCharges, "1", "0.00", "120.0", "0.0");
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("120", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
-
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
-                new JournalEntry(Float.parseFloat("3300.60"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("2791.49"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 October 2011",
-                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("149.11"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("240"), JournalEntry.TransactionType.CREDIT));
-
-        LOG.info("----------Make repayment 3 advance------------");
-        this.loanTransactionHelper.makeRepayment("20 November 2011", Float.parseFloat("3301.78"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("3301.78"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3149.11"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("30.29"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("122.38"), JournalEntry.TransactionType.CREDIT));
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper
-                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(percentagePenaltySpecifiedDueDate), "10 January 2012", "1"));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap fourthInstallment = loanSchedule.get(4);
-        validateNumberForEqual("120", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
-        validateNumberForEqual("3240.58", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("----------Pay applied penalty ------------");
-        this.loanTransactionHelper.makeRepayment("20 January 2012", Float.parseFloat("120"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("120"), JournalEntry.TransactionType.DEBIT));
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.CREDIT));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        fourthInstallment = loanSchedule.get(4);
-        validateNumberForEqual("0", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
-        validateNumberForEqual("3120.58", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("----------Make repayment 4 ------------");
-        this.loanTransactionHelper.makeRepayment("20 January 2012", Float.parseFloat("3120.58"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("3120.58"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3089.68"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("30.90"), JournalEntry.TransactionType.CREDIT));
-    }
-
-    /***
-     * Test case for checking CashBasedAccounting functionality adding charges with calculation type percentage of
-     * amount plus interest
-     */
-    @Test
-    public void loanWithCahargesOfTypeAmountPlusInterestPercentageAndCashBasedAccountingEnabled() {
-        this.journalEntryHelper = new JournalEntryHelper(this.requestSpec, this.responseSpec);
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-
-        // Add charges with payment mode regular
-        List<HashMap> charges = new ArrayList<>();
-        Integer amountPlusInterestPercentageDisbursementCharge = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanDisbursementJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT_AND_INTEREST, "1"));
-        addCharges(charges, amountPlusInterestPercentageDisbursementCharge, "1", null);
-
-        Integer amountPlusInterestPercentageSpecifiedDueDateCharge = ChargesHelper.createCharges(requestSpec, responseSpec, ChargesHelper
-                .getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT_AND_INTEREST, "1", false));
-        addCharges(charges, amountPlusInterestPercentageSpecifiedDueDateCharge, "1", "29 September 2011");
-
-        Integer amountPlusInterestPercentageInstallmentFee = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT_AND_INTEREST, "1", false));
-        addCharges(charges, amountPlusInterestPercentageInstallmentFee, "1", "29 September 2011");
-
-        final Account assetAccount = this.accountHelper.createAssetAccount();
-        final Account incomeAccount = this.accountHelper.createIncomeAccount();
-        final Account expenseAccount = this.accountHelper.createExpenseAccount();
-        final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
-
-        List<HashMap> collaterals = new ArrayList<>();
-
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
-
-        Assertions.assertNotNull(collateralId);
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
-                clientID.toString(), collateralId);
-        Assertions.assertNotNull(collateralId);
-        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
-
-        final Integer loanProductID = createLoanProduct(false, CASH_BASED, assetAccount, incomeAccount, expenseAccount, overpaymentAccount);
-        final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges, null, "12,000.00", collaterals);
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        verifyLoanRepaymentSchedule(loanSchedule);
-
-        List<HashMap> loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(amountPlusInterestPercentageDisbursementCharge, loanCharges, "1", "126.06", "0.0", "0.0");
-        validateCharge(amountPlusInterestPercentageSpecifiedDueDateCharge, loanCharges, "1", "126.06", "0.0", "0.0");
-        validateCharge(amountPlusInterestPercentageInstallmentFee, loanCharges, "1", "126.04", "0.0", "0.0");
-
-        // check for disbursement fee
-        HashMap disbursementDetail = loanSchedule.get(0);
-        validateNumberForEqual("126.06", String.valueOf(disbursementDetail.get("feeChargesDue")));
-
-        // check for charge at specified date and installment fee
-        HashMap firstInstallment = loanSchedule.get(1);
-        validateNumberForEqual("157.57", String.valueOf(firstInstallment.get("feeChargesDue")));
-
-        // check for installment fee
-        HashMap secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("31.51", String.valueOf(secondInstallment.get("feeChargesDue")));
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan("20 September 2011", loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(Float.parseFloat("126.06"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.DEBIT) };
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 September 2011", assetAccountInitialEntry);
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 September 2011",
-                new JournalEntry(Float.parseFloat("126.06"), JournalEntry.TransactionType.CREDIT));
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(amountPlusInterestPercentageDisbursementCharge, loanCharges, "1", "0.0", "126.06", "0.0");
-
-        LOG.info("-------------Make repayment 1-----------");
-        this.loanTransactionHelper.makeRepayment("20 October 2011", Float.parseFloat("3309.06"), loanID);
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(amountPlusInterestPercentageDisbursementCharge, loanCharges, "1", "0.00", "126.06", "0.0");
-        validateCharge(amountPlusInterestPercentageSpecifiedDueDateCharge, loanCharges, "1", "0.00", "126.06", "0.0");
-        validateCharge(amountPlusInterestPercentageInstallmentFee, loanCharges, "1", "94.53", "31.51", "0.0");
-
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
-                new JournalEntry(Float.parseFloat("3309.06"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("2911.49"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 October 2011",
-                new JournalEntry(Float.parseFloat("157.57"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("240.00"), JournalEntry.TransactionType.CREDIT));
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(
-                String.valueOf(amountPlusInterestPercentageSpecifiedDueDateCharge), "29 October 2011", "1"));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("157.57", String.valueOf(secondInstallment.get("feeChargesDue")));
-        this.loanTransactionHelper.waiveChargesForLoan(loanID,
-                (Integer) getloanCharge(amountPlusInterestPercentageInstallmentFee, loanCharges).get("id"),
-                LoanTransactionHelper.getWaiveChargeJSON(String.valueOf(2)));
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(amountPlusInterestPercentageInstallmentFee, loanCharges, "1", "63.02", "31.51", "31.51");
-
-        LOG.info("----------Make repayment 2------------");
-        this.loanTransactionHelper.makeRepayment("20 November 2011", Float.parseFloat("3277.55"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("3277.55"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("2969.72"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("126.06"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("181.77"), JournalEntry.TransactionType.CREDIT));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("0", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("--------------Waive interest---------------");
-        this.loanTransactionHelper.waiveInterest("20 December 2011", String.valueOf(61.79), loanID);
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap thirdInstallment = loanSchedule.get(3);
-        validateNumberForEqual("60.59", String.valueOf(thirdInstallment.get("interestOutstanding")));
-
-        Integer amountPlusInterestPercentagePenaltySpecifiedDueDate = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", true));
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(
-                String.valueOf(amountPlusInterestPercentagePenaltySpecifiedDueDate), "29 September 2011", "1"));
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(amountPlusInterestPercentagePenaltySpecifiedDueDate, loanCharges, "1", "0.0", "120.0", "0.0");
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("120", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
-
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
-                new JournalEntry(Float.parseFloat("3309.06"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("2791.49"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 October 2011",
-                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("157.57"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("240"), JournalEntry.TransactionType.CREDIT));
-
-        LOG.info("----------Make repayment 3 advance------------");
-        this.loanTransactionHelper.makeRepayment("20 November 2011", Float.parseFloat("3303"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("3303"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3149.11"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("31.51"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("122.38"), JournalEntry.TransactionType.CREDIT));
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(
-                String.valueOf(amountPlusInterestPercentagePenaltySpecifiedDueDate), "10 January 2012", "1"));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap fourthInstallment = loanSchedule.get(4);
-        validateNumberForEqual("120", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
-        validateNumberForEqual("3241.19", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("----------Pay applied penalty ------------");
-        this.loanTransactionHelper.makeRepayment("20 January 2012", Float.parseFloat("120"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("120"), JournalEntry.TransactionType.DEBIT));
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.CREDIT));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        fourthInstallment = loanSchedule.get(4);
-        validateNumberForEqual("0", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
-        validateNumberForEqual("3121.19", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("----------Make repayment 4 ------------");
-        this.loanTransactionHelper.makeRepayment("20 January 2012", Float.parseFloat("3121.19"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("3121.19"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3089.68"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("31.51"), JournalEntry.TransactionType.CREDIT));
-    }
-
-    /***
-     * Test case for checking AccuralUpfrontAccounting functionality adding charges with calculation type flat
-     */
-    @Test
-    public void loanWithFlatCahargesAndUpfrontAccrualAccountingEnabled() {
-        this.journalEntryHelper = new JournalEntryHelper(this.requestSpec, this.responseSpec);
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-
-        // Add charges with payment mode regular
-        List<HashMap> charges = new ArrayList<>();
-        Integer flatDisbursement = ChargesHelper.createCharges(requestSpec, responseSpec, ChargesHelper.getLoanDisbursementJSON());
-        addCharges(charges, flatDisbursement, "100", null);
-        Integer flatSpecifiedDueDate = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "100", false));
-
-        Integer flatInstallmentFee = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "50", false));
-        addCharges(charges, flatInstallmentFee, "50", null);
-
-        final Account assetAccount = this.accountHelper.createAssetAccount();
-        final Account incomeAccount = this.accountHelper.createIncomeAccount();
-        final Account expenseAccount = this.accountHelper.createExpenseAccount();
-        final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
-
-        List<HashMap> collaterals = new ArrayList<>();
-
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
-        Assertions.assertNotNull(collateralId);
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
-                String.valueOf(clientID), collateralId);
-        Assertions.assertNotNull(clientCollateralId);
-        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
-
-        final Integer loanProductID = createLoanProduct(false, ACCRUAL_UPFRONT, assetAccount, incomeAccount, expenseAccount,
-                overpaymentAccount);
-        final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges, null, "12,000.00", collaterals);
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        verifyLoanRepaymentSchedule(loanSchedule);
-
-        List<HashMap> loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(flatDisbursement, loanCharges, "100", "100.00", "0.0", "0.0");
-        validateCharge(flatInstallmentFee, loanCharges, "50", "200.00", "0.0", "0.0");
-
-        // check for disbursement fee
-        HashMap disbursementDetail = loanSchedule.get(0);
-        validateNumberForEqual("100.00", String.valueOf(disbursementDetail.get("feeChargesDue")));
-
-        // check for charge at specified date and installment fee
-        HashMap firstInstallment = loanSchedule.get(1);
-        validateNumberForEqual("50.00", String.valueOf(firstInstallment.get("feeChargesDue")));
-
-        // check for installment fee
-        HashMap secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("50.00", String.valueOf(secondInstallment.get("feeChargesDue")));
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan("20 September 2011", loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(Float.parseFloat("605.94"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("100.00"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("200.00"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.DEBIT) };
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 September 2011", assetAccountInitialEntry);
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 September 2011",
-                new JournalEntry(Float.parseFloat("605.94"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("100.00"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("200.00"), JournalEntry.TransactionType.CREDIT));
-
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper
-                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatSpecifiedDueDate), "29 September 2011", "100"));
-
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(flatDisbursement, loanCharges, "100", "0.00", "100.0", "0.0");
-        validateCharge(flatSpecifiedDueDate, loanCharges, "100", "100.00", "0.0", "0.0");
-
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "29 September 2011",
-                new JournalEntry(Float.parseFloat("100.00"), JournalEntry.TransactionType.DEBIT));
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "29 September 2011",
-                new JournalEntry(Float.parseFloat("100.00"), JournalEntry.TransactionType.CREDIT));
-
-        LOG.info("-------------Make repayment 1-----------");
-        this.loanTransactionHelper.makeRepayment("20 October 2011", Float.parseFloat("3301.49"), loanID);
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(flatDisbursement, loanCharges, "100", "0.00", "100.0", "0.0");
-        validateCharge(flatSpecifiedDueDate, loanCharges, "100", "0.00", "100.0", "0.0");
-        validateCharge(flatInstallmentFee, loanCharges, "50", "150.00", "50.0", "0.0");
-
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
-                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.CREDIT));
-
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper
-                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatSpecifiedDueDate), "29 October 2011", "100"));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("150.00", String.valueOf(secondInstallment.get("feeChargesDue")));
-        LOG.info("----------- Waive installment charge for 2nd installment ---------");
-        this.loanTransactionHelper.waiveChargesForLoan(loanID, (Integer) getloanCharge(flatInstallmentFee, loanCharges).get("id"),
-                LoanTransactionHelper.getWaiveChargeJSON(String.valueOf(2)));
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(flatInstallmentFee, loanCharges, "50", "100.00", "50.0", "50.0");
-
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("50.0"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForExpenseAccount(expenseAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("50.0"), JournalEntry.TransactionType.DEBIT));
-
-        LOG.info("----------Make repayment 2------------");
-        this.loanTransactionHelper.makeRepayment("20 November 2011", Float.parseFloat("3251.49"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("3251.49"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3251.49"), JournalEntry.TransactionType.CREDIT));
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("0", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("--------------Waive interest---------------");
-        this.loanTransactionHelper.waiveInterest("20 December 2011", String.valueOf(61.79), loanID);
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap thirdInstallment = loanSchedule.get(3);
-        validateNumberForEqual("60.59", String.valueOf(thirdInstallment.get("interestOutstanding")));
-
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 December 2011",
-                new JournalEntry(Float.parseFloat("61.79"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForExpenseAccount(expenseAccount, "20 December 2011",
-                new JournalEntry(Float.parseFloat("61.79"), JournalEntry.TransactionType.DEBIT));
-
-        Integer flatPenaltySpecifiedDueDate = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "100", true));
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper
-                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatPenaltySpecifiedDueDate), "29 September 2011", "100"));
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(flatPenaltySpecifiedDueDate, loanCharges, "100", "0.00", "100.0", "0.0");
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("100", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
-
-        // checking the journal entry as applied penalty has been collected
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
-                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.CREDIT));
-
-        LOG.info("----------Make repayment 3 advance------------");
-        this.loanTransactionHelper.makeRepayment("20 November 2011", Float.parseFloat("3301.49"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.CREDIT));
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper
-                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatPenaltySpecifiedDueDate), "10 January 2012", "100"));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap fourthInstallment = loanSchedule.get(4);
-        validateNumberForEqual("100", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
-        validateNumberForEqual("3239.68", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("----------Pay applied penalty ------------");
-        this.loanTransactionHelper.makeRepayment("20 January 2012", Float.parseFloat("100"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("100"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("100"), JournalEntry.TransactionType.CREDIT));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        fourthInstallment = loanSchedule.get(4);
-        validateNumberForEqual("0", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
-        validateNumberForEqual("3139.68", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("----------Make over payment for repayment 4 ------------");
-        this.loanTransactionHelper.makeRepayment("20 January 2012", Float.parseFloat("3220.60"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("3220.60"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3139.68"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForLiabilityAccount(overpaymentAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("80.92"), JournalEntry.TransactionType.CREDIT));
-        loanStatusHashMap = (HashMap) this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "status");
-        LoanStatusChecker.verifyLoanAccountIsOverPaid(loanStatusHashMap);
-    }
-
-    /***
-     * Test case for checking AccuralUpfrontAccounting functionality adding charges with calculation type percentage of
-     * amount
-     */
-    @Test
-    public void loanWithCahargesAndUpfrontAccrualAccountingEnabled() {
-        this.journalEntryHelper = new JournalEntryHelper(this.requestSpec, this.responseSpec);
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-
-        // Add charges with payment mode regular
-        List<HashMap> charges = new ArrayList<>();
-        Integer percentageDisbursementCharge = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanDisbursementJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1"));
-        addCharges(charges, percentageDisbursementCharge, "1", null);
-
-        Integer percentageSpecifiedDueDateCharge = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", false));
-        addCharges(charges, percentageSpecifiedDueDateCharge, "1", "29 September 2011");
-
-        Integer percentageInstallmentFee = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", false));
-        addCharges(charges, percentageInstallmentFee, "1", "29 September 2011");
-
-        final Account assetAccount = this.accountHelper.createAssetAccount();
-        final Account incomeAccount = this.accountHelper.createIncomeAccount();
-        final Account expenseAccount = this.accountHelper.createExpenseAccount();
-        final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
-
-        List<HashMap> collaterals = new ArrayList<>();
-
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
-        Assertions.assertNotNull(collateralId);
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
-                String.valueOf(clientID), collateralId);
-        Assertions.assertNotNull(clientCollateralId);
-        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
-
-        final Integer loanProductID = createLoanProduct(false, ACCRUAL_UPFRONT, assetAccount, incomeAccount, expenseAccount,
-                overpaymentAccount);
-        final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges, null, "12,000.00", collaterals);
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        verifyLoanRepaymentSchedule(loanSchedule);
-
-        List<HashMap> loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(percentageDisbursementCharge, loanCharges, "1", "120.00", "0.0", "0.0");
-        validateCharge(percentageSpecifiedDueDateCharge, loanCharges, "1", "120.00", "0.0", "0.0");
-        validateCharge(percentageInstallmentFee, loanCharges, "1", "120.00", "0.0", "0.0");
-
-        // check for disbursement fee
-        HashMap disbursementDetail = loanSchedule.get(0);
-        validateNumberForEqual("120.00", String.valueOf(disbursementDetail.get("feeChargesDue")));
-
-        // check for charge at specified date and installment fee
-        HashMap firstInstallment = loanSchedule.get(1);
-        validateNumberForEqual("149.11", String.valueOf(firstInstallment.get("feeChargesDue")));
-
-        // check for installment fee
-        HashMap secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("29.70", String.valueOf(secondInstallment.get("feeChargesDue")));
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan("20 September 2011", loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(Float.parseFloat("605.94"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.DEBIT) };
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 September 2011", assetAccountInitialEntry);
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 September 2011",
-                new JournalEntry(Float.parseFloat("605.94"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.CREDIT));
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(percentageDisbursementCharge, loanCharges, "1", "0.0", "120.00", "0.0");
-
-        LOG.info("-------------Make repayment 1-----------");
-        this.loanTransactionHelper.makeRepayment("20 October 2011", Float.parseFloat("3300.60"), loanID);
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(percentageDisbursementCharge, loanCharges, "1", "0.00", "120.00", "0.0");
-        validateCharge(percentageSpecifiedDueDateCharge, loanCharges, "1", "0.00", "120.0", "0.0");
-        validateCharge(percentageInstallmentFee, loanCharges, "1", "90.89", "29.11", "0.0");
-
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
-                new JournalEntry(Float.parseFloat("3300.60"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3300.60"), JournalEntry.TransactionType.CREDIT));
-
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper
-                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(percentageSpecifiedDueDateCharge), "29 October 2011", "1"));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("149.70", String.valueOf(secondInstallment.get("feeChargesDue")));
-        LOG.info("----------- Waive installment charge for 2nd installment ---------");
-        this.loanTransactionHelper.waiveChargesForLoan(loanID, (Integer) getloanCharge(percentageInstallmentFee, loanCharges).get("id"),
-                LoanTransactionHelper.getWaiveChargeJSON(String.valueOf(2)));
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(percentageInstallmentFee, loanCharges, "1", "61.19", "29.11", "29.70");
-
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("29.7"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForExpenseAccount(expenseAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("29.7"), JournalEntry.TransactionType.DEBIT));
-
-        LOG.info("----------Make repayment 2------------");
-        this.loanTransactionHelper.makeRepayment("20 November 2011", Float.parseFloat("3271.49"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("3271.49"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3271.49"), JournalEntry.TransactionType.CREDIT));
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("0", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("--------------Waive interest---------------");
-        this.loanTransactionHelper.waiveInterest("20 December 2011", String.valueOf(61.79), loanID);
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap thirdInstallment = loanSchedule.get(3);
-        validateNumberForEqual("60.59", String.valueOf(thirdInstallment.get("interestOutstanding")));
-
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 December 2011",
-                new JournalEntry(Float.parseFloat("61.79"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForExpenseAccount(expenseAccount, "20 December 2011",
-                new JournalEntry(Float.parseFloat("61.79"), JournalEntry.TransactionType.DEBIT));
-
-        Integer percentagePenaltySpecifiedDueDate = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", true));
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper
-                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(percentagePenaltySpecifiedDueDate), "29 September 2011", "1"));
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(percentagePenaltySpecifiedDueDate, loanCharges, "1", "0.00", "120.0", "0.0");
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("120", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
-
-        // checking the journal entry as applied penalty has been collected
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
-                new JournalEntry(Float.parseFloat("3300.60"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3300.60"), JournalEntry.TransactionType.CREDIT));
-
-        LOG.info("----------Make repayment 3 advance------------");
-        this.loanTransactionHelper.makeRepayment("20 November 2011", Float.parseFloat("3301.78"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("3301.78"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3301.78"), JournalEntry.TransactionType.CREDIT));
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper
-                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(percentagePenaltySpecifiedDueDate), "10 January 2012", "1"));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap fourthInstallment = loanSchedule.get(4);
-        validateNumberForEqual("120", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
-        validateNumberForEqual("3240.58", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("----------Pay applied penalty ------------");
-        this.loanTransactionHelper.makeRepayment("20 January 2012", Float.parseFloat("120"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("120"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("120"), JournalEntry.TransactionType.CREDIT));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        fourthInstallment = loanSchedule.get(4);
-        validateNumberForEqual("0", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
-        validateNumberForEqual("3120.58", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("----------Make over payment for repayment 4 ------------");
-        this.loanTransactionHelper.makeRepayment("20 January 2012", Float.parseFloat("3220.58"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("3220.58"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3120.58"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForLiabilityAccount(overpaymentAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("100.00"), JournalEntry.TransactionType.CREDIT));
-        loanStatusHashMap = (HashMap) this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "status");
-        LoanStatusChecker.verifyLoanAccountIsOverPaid(loanStatusHashMap);
-    }
-
-    /***
-     * Test case for checking AccuralUpfrontAccounting functionality adding charges with calculation type percentage of
-     * amount plus interest
-     */
-    @Test
-    public void loanWithCahargesOfTypeAmountPlusInterestPercentageAndUpfrontAccrualAccountingEnabled() {
-        this.journalEntryHelper = new JournalEntryHelper(this.requestSpec, this.responseSpec);
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-
-        // Add charges with payment mode regular
-        List<HashMap> charges = new ArrayList<>();
-        Integer amountPlusInterestPercentageDisbursementCharge = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanDisbursementJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT_AND_INTEREST, "1"));
-        addCharges(charges, amountPlusInterestPercentageDisbursementCharge, "1", null);
-
-        Integer amountPlusInterestPercentageSpecifiedDueDateCharge = ChargesHelper.createCharges(requestSpec, responseSpec, ChargesHelper
-                .getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT_AND_INTEREST, "1", false));
-
-        Integer amountPlusInterestPercentageInstallmentFee = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT_AND_INTEREST, "1", false));
-        addCharges(charges, amountPlusInterestPercentageInstallmentFee, "1", "29 September 2011");
-
-        final Account assetAccount = this.accountHelper.createAssetAccount();
-        final Account incomeAccount = this.accountHelper.createIncomeAccount();
-        final Account expenseAccount = this.accountHelper.createExpenseAccount();
-        final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
-
-        List<HashMap> collaterals = new ArrayList<>();
-
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
-
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
-                String.valueOf(clientID), collateralId);
-        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
-
-        final Integer loanProductID = createLoanProduct(false, ACCRUAL_UPFRONT, assetAccount, incomeAccount, expenseAccount,
-                overpaymentAccount);
-        final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges, null, "12,000.00", collaterals);
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        verifyLoanRepaymentSchedule(loanSchedule);
-
-        List<HashMap> loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(amountPlusInterestPercentageDisbursementCharge, loanCharges, "1", "126.06", "0.0", "0.0");
-        validateCharge(amountPlusInterestPercentageInstallmentFee, loanCharges, "1", "126.04", "0.0", "0.0");
-
-        // check for disbursement fee
-        HashMap disbursementDetail = loanSchedule.get(0);
-        validateNumberForEqual("126.06", String.valueOf(disbursementDetail.get("feeChargesDue")));
-
-        // check for charge at specified date and installment fee
-        HashMap firstInstallment = loanSchedule.get(1);
-        validateNumberForEqual("31.51", String.valueOf(firstInstallment.get("feeChargesDue")));
-
-        // check for installment fee
-        HashMap secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("31.51", String.valueOf(secondInstallment.get("feeChargesDue")));
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan("20 September 2011", loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(Float.parseFloat("605.94"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("126.06"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("126.04"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.DEBIT) };
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 September 2011", assetAccountInitialEntry);
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 September 2011",
-                new JournalEntry(Float.parseFloat("605.94"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("126.06"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("126.04"), JournalEntry.TransactionType.CREDIT));
-
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(
-                String.valueOf(amountPlusInterestPercentageSpecifiedDueDateCharge), "29 September 2011", "1"));
-
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(amountPlusInterestPercentageDisbursementCharge, loanCharges, "1", "0.0", "126.06", "0.0");
-        validateCharge(amountPlusInterestPercentageSpecifiedDueDateCharge, loanCharges, "1", "126.06", "0.0", "0.0");
-
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "29 September 2011",
-                new JournalEntry(Float.parseFloat("126.06"), JournalEntry.TransactionType.DEBIT));
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "29 September 2011",
-                new JournalEntry(Float.parseFloat("126.06"), JournalEntry.TransactionType.CREDIT));
-
-        LOG.info("-------------Make repayment 1-----------");
-        this.loanTransactionHelper.makeRepayment("20 October 2011", Float.parseFloat("3309.06"), loanID);
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(amountPlusInterestPercentageDisbursementCharge, loanCharges, "1", "0.00", "126.06", "0.0");
-        validateCharge(amountPlusInterestPercentageSpecifiedDueDateCharge, loanCharges, "1", "0.00", "126.06", "0.0");
-        validateCharge(amountPlusInterestPercentageInstallmentFee, loanCharges, "1", "94.53", "31.51", "0.0");
-
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
-                new JournalEntry(Float.parseFloat("3309.06"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3309.06"), JournalEntry.TransactionType.CREDIT));
-
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(
-                String.valueOf(amountPlusInterestPercentageSpecifiedDueDateCharge), "29 October 2011", "1"));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("157.57", String.valueOf(secondInstallment.get("feeChargesDue")));
-        LOG.info("----------- Waive installment charge for 2nd installment ---------");
-        this.loanTransactionHelper.waiveChargesForLoan(loanID,
-                (Integer) getloanCharge(amountPlusInterestPercentageInstallmentFee, loanCharges).get("id"),
-                LoanTransactionHelper.getWaiveChargeJSON(String.valueOf(2)));
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(amountPlusInterestPercentageInstallmentFee, loanCharges, "1", "63.02", "31.51", "31.51");
-
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("31.51"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForExpenseAccount(expenseAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("31.51"), JournalEntry.TransactionType.DEBIT));
-
-        LOG.info("----------Make repayment 2------------");
-        this.loanTransactionHelper.makeRepayment("20 November 2011", Float.parseFloat("3277.55"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("3277.55"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3277.55"), JournalEntry.TransactionType.CREDIT));
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("0", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("--------------Waive interest---------------");
-        this.loanTransactionHelper.waiveInterest("20 December 2011", String.valueOf(61.79), loanID);
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap thirdInstallment = loanSchedule.get(3);
-        validateNumberForEqual("60.59", String.valueOf(thirdInstallment.get("interestOutstanding")));
-
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 December 2011",
-                new JournalEntry(Float.parseFloat("61.79"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForExpenseAccount(expenseAccount, "20 December 2011",
-                new JournalEntry(Float.parseFloat("61.79"), JournalEntry.TransactionType.DEBIT));
-
-        Integer amountPlusInterestPercentagePenaltySpecifiedDueDate = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", true));
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(
-                String.valueOf(amountPlusInterestPercentagePenaltySpecifiedDueDate), "29 September 2011", "1"));
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(amountPlusInterestPercentagePenaltySpecifiedDueDate, loanCharges, "1", "0.0", "120.0", "0.0");
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("120", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
-
-        // checking the journal entry as applied penalty has been collected
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
-                new JournalEntry(Float.parseFloat("3309.06"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3309.06"), JournalEntry.TransactionType.CREDIT));
-
-        LOG.info("----------Make repayment 3 advance------------");
-        this.loanTransactionHelper.makeRepayment("20 November 2011", Float.parseFloat("3303"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("3303"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3303"), JournalEntry.TransactionType.CREDIT));
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(
-                String.valueOf(amountPlusInterestPercentagePenaltySpecifiedDueDate), "10 January 2012", "1"));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap fourthInstallment = loanSchedule.get(4);
-        validateNumberForEqual("120", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
-        validateNumberForEqual("3241.19", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("----------Pay applied penalty ------------");
-        this.loanTransactionHelper.makeRepayment("20 January 2012", Float.parseFloat("120"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("120"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("120"), JournalEntry.TransactionType.CREDIT));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        fourthInstallment = loanSchedule.get(4);
-        validateNumberForEqual("0", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
-        validateNumberForEqual("3121.19", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("----------Make over payment for repayment 4 ------------");
-        this.loanTransactionHelper.makeRepayment("20 January 2012", Float.parseFloat("3221.61"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("3221.61"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3121.19"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForLiabilityAccount(overpaymentAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("100.42"), JournalEntry.TransactionType.CREDIT));
-        loanStatusHashMap = (HashMap) this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "status");
-        LoanStatusChecker.verifyLoanAccountIsOverPaid(loanStatusHashMap);
-    }
-
-    /***
-     * Test case for checking AccuralPeriodicAccounting functionality adding charges with calculation type flat
-     */
-    @Test
-    public void loanWithFlatChargesAndPeriodicAccrualAccountingEnabled() throws InterruptedException {
-        this.journalEntryHelper = new JournalEntryHelper(this.requestSpec, this.responseSpec);
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-
-        // Add charges with payment mode regular
-        List<HashMap> charges = new ArrayList<>();
-        Integer flatDisbursement = ChargesHelper.createCharges(requestSpec, responseSpec, ChargesHelper.getLoanDisbursementJSON());
-        addCharges(charges, flatDisbursement, "100", null);
-        Integer flatSpecifiedDueDate = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "100", false));
-        addCharges(charges, flatSpecifiedDueDate, "100", "29 September 2011");
-        Integer flatInstallmentFee = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "50", false));
-        addCharges(charges, flatInstallmentFee, "50", null);
-
-        final Account assetAccount = this.accountHelper.createAssetAccount();
-        final Account incomeAccount = this.accountHelper.createIncomeAccount();
-        final Account expenseAccount = this.accountHelper.createExpenseAccount();
-        final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
-
-        List<HashMap> collaterals = new ArrayList<>();
-
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
-
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
-                String.valueOf(clientID), collateralId);
-        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
-
-        final Integer loanProductID = createLoanProduct(false, ACCRUAL_PERIODIC, assetAccount, incomeAccount, expenseAccount,
-                overpaymentAccount);
-        final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges, null, "12,000.00", collaterals);
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        verifyLoanRepaymentSchedule(loanSchedule);
-
-        List<HashMap> loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(flatDisbursement, loanCharges, "100", "100.00", "0.0", "0.0");
-        validateCharge(flatSpecifiedDueDate, loanCharges, "100", "100.00", "0.0", "0.0");
-        validateCharge(flatInstallmentFee, loanCharges, "50", "200.00", "0.0", "0.0");
-
-        // check for disbursement fee
-        HashMap disbursementDetail = loanSchedule.get(0);
-        validateNumberForEqual("100.00", String.valueOf(disbursementDetail.get("feeChargesDue")));
-
-        // check for charge at specified date and installment fee
-        HashMap firstInstallment = loanSchedule.get(1);
-        validateNumberForEqual("150.00", String.valueOf(firstInstallment.get("feeChargesDue")));
-
-        // check for installment fee
-        HashMap secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("50.00", String.valueOf(secondInstallment.get("feeChargesDue")));
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan("20 September 2011", loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(Float.parseFloat("100.00"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.DEBIT) };
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 September 2011", assetAccountInitialEntry);
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 September 2011",
-                new JournalEntry(Float.parseFloat("100.00"), JournalEntry.TransactionType.CREDIT));
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(flatDisbursement, loanCharges, "100", "0.00", "100.0", "0.0");
-
-        LOG.info("-------------Make repayment 1-----------");
-        this.loanTransactionHelper.makeRepayment("20 October 2011", Float.parseFloat("3301.49"), loanID);
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(flatDisbursement, loanCharges, "100", "0.00", "100.0", "0.0");
-        validateCharge(flatSpecifiedDueDate, loanCharges, "100", "0.00", "100.0", "0.0");
-        validateCharge(flatInstallmentFee, loanCharges, "50", "150.00", "50.0", "0.0");
-
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
-                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.CREDIT));
-
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper
-                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatSpecifiedDueDate), "29 October 2011", "100"));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("150.00", String.valueOf(secondInstallment.get("feeChargesDue")));
-        LOG.info("----------- Waive installment charge for 2nd installment ---------");
-        this.loanTransactionHelper.waiveChargesForLoan(loanID, (Integer) getloanCharge(flatInstallmentFee, loanCharges).get("id"),
-                LoanTransactionHelper.getWaiveChargeJSON(String.valueOf(2)));
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(flatInstallmentFee, loanCharges, "50", "100.00", "50.0", "50.0");
-
-        /*
-         * this.journalEntryHelper.checkJournalEntryForAssetAccount( assetAccount, "20 September 2011", new
-         * JournalEntry(Float.parseFloat("50.0"), JournalEntry.TransactionType.CREDIT));
-         * this.journalEntryHelper.checkJournalEntryForExpenseAccount (expenseAccount, "20 September 2011", new
-         * JournalEntry(Float.parseFloat("50.0"), JournalEntry.TransactionType.DEBIT));
-         */
-        final String jobName = "Add Accrual Transactions";
-
-        this.schedulerJobHelper.executeAndAwaitJob(jobName);
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        checkAccrualTransactions(loanSchedule, loanID);
-
-        LOG.info("----------Make repayment 2------------");
-        this.loanTransactionHelper.makeRepayment("20 November 2011", Float.parseFloat("3251.49"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("3251.49"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3251.49"), JournalEntry.TransactionType.CREDIT));
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("0", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("--------------Waive interest---------------");
-        this.loanTransactionHelper.waiveInterest("20 December 2011", String.valueOf(61.79), loanID);
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap thirdInstallment = loanSchedule.get(3);
-        validateNumberForEqual("60.59", String.valueOf(thirdInstallment.get("interestOutstanding")));
-
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 December 2011",
-                new JournalEntry(Float.parseFloat("61.79"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForExpenseAccount(expenseAccount, "20 December 2011",
-                new JournalEntry(Float.parseFloat("61.79"), JournalEntry.TransactionType.DEBIT));
-
-        Integer flatPenaltySpecifiedDueDate = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "100", true));
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper
-                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatPenaltySpecifiedDueDate), "29 September 2011", "100"));
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(flatPenaltySpecifiedDueDate, loanCharges, "100", "0.00", "100.0", "0.0");
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("100", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
-
-        // checking the journal entry as applied penalty has been collected
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
-                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.CREDIT));
-
-        LOG.info("----------Make repayment 3 advance------------");
-        this.loanTransactionHelper.makeRepayment("20 November 2011", Float.parseFloat("3301.49"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3301.49"), JournalEntry.TransactionType.CREDIT));
-
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper
-                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatPenaltySpecifiedDueDate), "10 January 2012", "100"));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap fourthInstallment = loanSchedule.get(4);
-        validateNumberForEqual("100", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
-        validateNumberForEqual("3239.68", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("----------Pay applied penalty ------------");
-        this.loanTransactionHelper.makeRepayment("20 January 2012", Float.parseFloat("100"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("100"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("100"), JournalEntry.TransactionType.CREDIT));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        fourthInstallment = loanSchedule.get(4);
-        validateNumberForEqual("0", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
-        validateNumberForEqual("3139.68", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("----------Make repayment 4 ------------");
-        this.loanTransactionHelper.makeRepayment("20 January 2012", Float.parseFloat("3139.68"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("3139.68"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3139.68"), JournalEntry.TransactionType.CREDIT));
-        loanStatusHashMap = (HashMap) this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "status");
-        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
-    }
-
-    /**
-     * Test case for checking AccuralPeriodicAccounting functionality adding charges with calculation type percentage of
-     * amount
-     */
-    @Test
-    public void loanWithChargesOfTypeAmountPercentageAndPeriodicAccrualAccountingEnabled() throws InterruptedException {
-        this.journalEntryHelper = new JournalEntryHelper(this.requestSpec, this.responseSpec);
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-
-        // Add charges with payment mode regular
-        List<HashMap> charges = new ArrayList<>();
-        Integer percentageDisbursementCharge = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanDisbursementJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1"));
-        addCharges(charges, percentageDisbursementCharge, "1", null);
-
-        Integer percentageSpecifiedDueDateCharge = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", false));
-        addCharges(charges, percentageSpecifiedDueDateCharge, "1", "29 September 2011");
-
-        Integer percentageInstallmentFee = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", false));
-        addCharges(charges, percentageInstallmentFee, "1", "29 September 2011");
-
-        final Account assetAccount = this.accountHelper.createAssetAccount();
-        final Account incomeAccount = this.accountHelper.createIncomeAccount();
-        final Account expenseAccount = this.accountHelper.createExpenseAccount();
-        final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
-
-        List<HashMap> collaterals = new ArrayList<>();
-
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
-
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
-                String.valueOf(clientID), collateralId);
-        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
-
-        final Integer loanProductID = createLoanProduct(false, ACCRUAL_PERIODIC, assetAccount, incomeAccount, expenseAccount,
-                overpaymentAccount);
-        final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges, null, "12,000.00", collaterals);
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        verifyLoanRepaymentSchedule(loanSchedule);
-
-        List<HashMap> loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(percentageDisbursementCharge, loanCharges, "1", "120.00", "0.0", "0.0");
-        validateCharge(percentageSpecifiedDueDateCharge, loanCharges, "1", "120.00", "0.0", "0.0");
-        validateCharge(percentageInstallmentFee, loanCharges, "1", "120.00", "0.0", "0.0");
-
-        // check for disbursement fee
-        HashMap disbursementDetail = loanSchedule.get(0);
-        validateNumberForEqual("120.00", String.valueOf(disbursementDetail.get("feeChargesDue")));
-
-        // check for charge at specified date and installment fee
-        HashMap firstInstallment = loanSchedule.get(1);
-        validateNumberForEqual("149.11", String.valueOf(firstInstallment.get("feeChargesDue")));
-
-        // check for installment fee
-        HashMap secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("29.70", String.valueOf(secondInstallment.get("feeChargesDue")));
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan("20 September 2011", loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        GlobalConfigurationHelper.manageConfigurations(requestSpec, responseSpec,
-                GlobalConfigurationHelper.ENABLE_AUTOGENERATED_EXTERNAL_ID, true);
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        ArrayList<HashMap> loanTransactionDetails = loanTransactionHelper.getLoanTransactionDetails(requestSpec, responseSpec, loanID);
-        validateAccrualTransactionForDisbursementCharge(loanTransactionDetails);
-        final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.DEBIT) };
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 September 2011", assetAccountInitialEntry);
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 September 2011",
-                new JournalEntry(Float.parseFloat("120.00"), JournalEntry.TransactionType.CREDIT));
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(percentageDisbursementCharge, loanCharges, "1", "0.0", "120.00", "0.0");
-
-        LOG.info("-------------Make repayment 1-----------");
-        this.loanTransactionHelper.makeRepayment("20 October 2011", Float.parseFloat("3300.60"), loanID);
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(percentageDisbursementCharge, loanCharges, "1", "0.00", "120.00", "0.0");
-        validateCharge(percentageSpecifiedDueDateCharge, loanCharges, "1", "0.00", "120.0", "0.0");
-        validateCharge(percentageInstallmentFee, loanCharges, "1", "90.89", "29.11", "0.0");
-
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
-                new JournalEntry(Float.parseFloat("3300.60"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3300.60"), JournalEntry.TransactionType.CREDIT));
-
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper
-                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(percentageSpecifiedDueDateCharge), "29 October 2011", "1"));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("149.70", String.valueOf(secondInstallment.get("feeChargesDue")));
-        LOG.info("----------- Waive installment charge for 2nd installment ---------");
-        this.loanTransactionHelper.waiveChargesForLoan(loanID, (Integer) getloanCharge(percentageInstallmentFee, loanCharges).get("id"),
-                LoanTransactionHelper.getWaiveChargeJSON(String.valueOf(2)));
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(percentageInstallmentFee, loanCharges, "1", "61.19", "29.11", "29.70");
-
-        /*
-         * this.journalEntryHelper.checkJournalEntryForAssetAccount( assetAccount, "20 September 2011", new
-         * JournalEntry(Float.parseFloat("29.7"), JournalEntry.TransactionType.CREDIT));
-         * this.journalEntryHelper.checkJournalEntryForExpenseAccount (expenseAccount, "20 September 2011", new
-         * JournalEntry(Float.parseFloat("29.7"), JournalEntry.TransactionType.DEBIT));
-         */
-
-        final String jobName = "Add Accrual Transactions";
-
-        this.schedulerJobHelper.executeAndAwaitJob(jobName);
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        checkAccrualTransactions(loanSchedule, loanID);
-
-        LOG.info("----------Make repayment 2------------");
-        this.loanTransactionHelper.makeRepayment("20 November 2011", Float.parseFloat("3271.49"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("3271.49"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3271.49"), JournalEntry.TransactionType.CREDIT));
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("0", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("--------------Waive interest---------------");
-        this.loanTransactionHelper.waiveInterest("20 December 2011", String.valueOf(61.79), loanID);
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap thirdInstallment = loanSchedule.get(3);
-        validateNumberForEqual("60.59", String.valueOf(thirdInstallment.get("interestOutstanding")));
-
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 December 2011",
-                new JournalEntry(Float.parseFloat("61.79"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForExpenseAccount(expenseAccount, "20 December 2011",
-                new JournalEntry(Float.parseFloat("61.79"), JournalEntry.TransactionType.DEBIT));
-
-        Integer percentagePenaltySpecifiedDueDate = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", true));
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper
-                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(percentagePenaltySpecifiedDueDate), "29 September 2011", "1"));
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(percentagePenaltySpecifiedDueDate, loanCharges, "1", "0.00", "120.0", "0.0");
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("120", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
-
-        // checking the journal entry as applied penalty has been collected
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
-                new JournalEntry(Float.parseFloat("3300.60"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3300.60"), JournalEntry.TransactionType.CREDIT));
-
-        LOG.info("----------Make repayment 3 advance------------");
-        this.loanTransactionHelper.makeRepayment("20 November 2011", Float.parseFloat("3301.78"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("3301.78"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3301.78"), JournalEntry.TransactionType.CREDIT));
-
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper
-                .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(percentagePenaltySpecifiedDueDate), "10 January 2012", "1"));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap fourthInstallment = loanSchedule.get(4);
-        validateNumberForEqual("120", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
-        validateNumberForEqual("3240.58", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("----------Pay applied penalty ------------");
-        this.loanTransactionHelper.makeRepayment("20 January 2012", Float.parseFloat("120"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("120"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("120"), JournalEntry.TransactionType.CREDIT));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        fourthInstallment = loanSchedule.get(4);
-        validateNumberForEqual("0", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
-        validateNumberForEqual("3120.58", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("----------Make repayment 4 ------------");
-        this.loanTransactionHelper.makeRepayment("20 January 2012", Float.parseFloat("3120.58"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("3120.58"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3120.58"), JournalEntry.TransactionType.CREDIT));
-        loanStatusHashMap = (HashMap) this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "status");
-        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
-    }
-
-    /***
-     * Test case for checking AccuralPeriodicAccounting functionality adding charges with calculation type percentage of
-     * amount and interest
-     */
-    @Test
-    public void loanWithChargesOfTypeAmountPlusInterestPercentageAndPeriodicAccrualAccountingEnabled() throws InterruptedException {
-        this.journalEntryHelper = new JournalEntryHelper(this.requestSpec, this.responseSpec);
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-
-        // Add charges with payment mode regular
-        List<HashMap> charges = new ArrayList<>();
-        Integer amountPlusInterestPercentageDisbursementCharge = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanDisbursementJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT_AND_INTEREST, "1"));
-        addCharges(charges, amountPlusInterestPercentageDisbursementCharge, "1", null);
-
-        Integer amountPlusInterestPercentageSpecifiedDueDateCharge = ChargesHelper.createCharges(requestSpec, responseSpec, ChargesHelper
-                .getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT_AND_INTEREST, "1", false));
-        addCharges(charges, amountPlusInterestPercentageSpecifiedDueDateCharge, "1", "29 September 2011");
-
-        Integer amountPlusInterestPercentageInstallmentFee = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT_AND_INTEREST, "1", false));
-        addCharges(charges, amountPlusInterestPercentageInstallmentFee, "1", "29 September 2011");
-
-        final Account assetAccount = this.accountHelper.createAssetAccount();
-        final Account incomeAccount = this.accountHelper.createIncomeAccount();
-        final Account expenseAccount = this.accountHelper.createExpenseAccount();
-        final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
-
-        List<HashMap> collaterals = new ArrayList<>();
-
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
-        Assertions.assertNotNull(collateralId);
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
-                String.valueOf(clientID), collateralId);
-        Assertions.assertNotNull(clientCollateralId);
-        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
-
-        final Integer loanProductID = createLoanProduct(false, ACCRUAL_PERIODIC, assetAccount, incomeAccount, expenseAccount,
-                overpaymentAccount);
-        final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges, null, "12,000.00", collaterals);
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        verifyLoanRepaymentSchedule(loanSchedule);
-
-        List<HashMap> loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(amountPlusInterestPercentageDisbursementCharge, loanCharges, "1", "126.06", "0.0", "0.0");
-        validateCharge(amountPlusInterestPercentageSpecifiedDueDateCharge, loanCharges, "1", "126.06", "0.0", "0.0");
-        validateCharge(amountPlusInterestPercentageInstallmentFee, loanCharges, "1", "126.04", "0.0", "0.0");
-
-        // check for disbursement fee
-        HashMap disbursementDetail = loanSchedule.get(0);
-        validateNumberForEqual("126.06", String.valueOf(disbursementDetail.get("feeChargesDue")));
-
-        // check for charge at specified date and installment fee
-        HashMap firstInstallment = loanSchedule.get(1);
-        validateNumberForEqual("157.57", String.valueOf(firstInstallment.get("feeChargesDue")));
-
-        // check for installment fee
-        HashMap secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("31.51", String.valueOf(secondInstallment.get("feeChargesDue")));
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan("20 September 2011", loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(Float.parseFloat("126.06"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.DEBIT) };
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 September 2011", assetAccountInitialEntry);
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, "20 September 2011",
-                new JournalEntry(Float.parseFloat("126.06"), JournalEntry.TransactionType.CREDIT));
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(amountPlusInterestPercentageDisbursementCharge, loanCharges, "1", "0.0", "126.06", "0.0");
-
-        LOG.info("-------------Make repayment 1-----------");
-        this.loanTransactionHelper.makeRepayment("20 October 2011", Float.parseFloat("3309.06"), loanID);
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(amountPlusInterestPercentageDisbursementCharge, loanCharges, "1", "0.00", "126.06", "0.0");
-        validateCharge(amountPlusInterestPercentageSpecifiedDueDateCharge, loanCharges, "1", "0.00", "126.06", "0.0");
-        validateCharge(amountPlusInterestPercentageInstallmentFee, loanCharges, "1", "94.53", "31.51", "0.0");
-
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
-                new JournalEntry(Float.parseFloat("3309.06"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3309.06"), JournalEntry.TransactionType.CREDIT));
-
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(
-                String.valueOf(amountPlusInterestPercentageSpecifiedDueDateCharge), "29 October 2011", "1"));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("157.57", String.valueOf(secondInstallment.get("feeChargesDue")));
-        LOG.info("----------- Waive installment charge for 2nd installment ---------");
-        this.loanTransactionHelper.waiveChargesForLoan(loanID,
-                (Integer) getloanCharge(amountPlusInterestPercentageInstallmentFee, loanCharges).get("id"),
-                LoanTransactionHelper.getWaiveChargeJSON(String.valueOf(2)));
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(amountPlusInterestPercentageInstallmentFee, loanCharges, "1", "63.02", "31.51", "31.51");
-
-        /*
-         * this.journalEntryHelper.checkJournalEntryForAssetAccount( assetAccount, "20 September 2011", new
-         * JournalEntry( Float.parseFloat("31.51"), JournalEntry.TransactionType.CREDIT));
-         * this.journalEntryHelper.checkJournalEntryForExpenseAccount (expenseAccount, "20 September 2011", new
-         * JournalEntry(Float.parseFloat("31.51"), JournalEntry.TransactionType.DEBIT));
-         */
-
-        final String jobName = "Add Accrual Transactions";
-
-        this.schedulerJobHelper.executeAndAwaitJob(jobName);
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        checkAccrualTransactions(loanSchedule, loanID);
-
-        LOG.info("----------Make repayment 2------------");
-        this.loanTransactionHelper.makeRepayment("20 November 2011", Float.parseFloat("3277.55"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("3277.55"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3277.55"), JournalEntry.TransactionType.CREDIT));
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("0", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("--------------Waive interest---------------");
-        this.loanTransactionHelper.waiveInterest("20 December 2011", String.valueOf(61.79), loanID);
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap thirdInstallment = loanSchedule.get(3);
-        validateNumberForEqual("60.59", String.valueOf(thirdInstallment.get("interestOutstanding")));
-
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 December 2011",
-                new JournalEntry(Float.parseFloat("61.79"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForExpenseAccount(expenseAccount, "20 December 2011",
-                new JournalEntry(Float.parseFloat("61.79"), JournalEntry.TransactionType.DEBIT));
-
-        Integer amountPlusInterestPercentagePenaltySpecifiedDueDate = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "1", true));
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(
-                String.valueOf(amountPlusInterestPercentagePenaltySpecifiedDueDate), "29 September 2011", "1"));
-        loanCharges.clear();
-        loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
-        validateCharge(amountPlusInterestPercentagePenaltySpecifiedDueDate, loanCharges, "1", "0.0", "120.0", "0.0");
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("120", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
-
-        // checking the journal entry as applied penalty has been collected
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 October 2011",
-                new JournalEntry(Float.parseFloat("3309.06"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3309.06"), JournalEntry.TransactionType.CREDIT));
-
-        LOG.info("----------Make repayment 3 advance------------");
-        this.loanTransactionHelper.makeRepayment("20 November 2011", Float.parseFloat("3303"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011",
-                new JournalEntry(Float.parseFloat("3303"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3303"), JournalEntry.TransactionType.CREDIT));
-
-        this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(
-                String.valueOf(amountPlusInterestPercentagePenaltySpecifiedDueDate), "10 January 2012", "1"));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap fourthInstallment = loanSchedule.get(4);
-        validateNumberForEqual("120", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
-        validateNumberForEqual("3241.19", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("----------Pay applied penalty ------------");
-        this.loanTransactionHelper.makeRepayment("20 January 2012", Float.parseFloat("120"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("120"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("120"), JournalEntry.TransactionType.CREDIT));
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        fourthInstallment = loanSchedule.get(4);
-        validateNumberForEqual("0", String.valueOf(fourthInstallment.get("penaltyChargesOutstanding")));
-        validateNumberForEqual("3121.19", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
-
-        LOG.info("----------Make repayment 4 ------------");
-        this.loanTransactionHelper.makeRepayment("20 January 2012", Float.parseFloat("3121.19"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 January 2012",
-                new JournalEntry(Float.parseFloat("3121.19"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("3121.19"), JournalEntry.TransactionType.CREDIT));
-        loanStatusHashMap = (HashMap) this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "status");
-        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
-    }
-
-    @Test
-    public void testClientLoanScheduleWithCurrencyDetails() {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-
-        List<HashMap> collaterals = new ArrayList<>();
-
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
-
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
-                String.valueOf(clientID), collateralId);
-        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
-
-        final Integer loanProductID = createLoanProduct("100", "0", LoanProductTestBuilder.DEFAULT_STRATEGY);
-        final Integer loanID = applyForLoanApplication(clientID, loanProductID, null, collaterals);
-        final ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec,
-                loanID);
-        verifyLoanRepaymentScheduleForEqualPrincipal(loanSchedule);
-
-    }
-
-    @Test
-    public void testClientLoanScheduleWithCurrencyDetails_with_grace() {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-
-        List<HashMap> collaterals = new ArrayList<>();
-
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
-
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
-                String.valueOf(clientID), collateralId);
-        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
-
-        final Integer loanProductID = createLoanProduct("100", "0", LoanProductTestBuilder.DEFAULT_STRATEGY);
-        final Integer loanID = applyForLoanApplication(clientID, loanProductID, "5", collaterals);
-        final ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec,
-                loanID);
-        verifyLoanRepaymentScheduleForEqualPrincipalWithGrace(loanSchedule);
-
-    }
-
-    /***
-     * Test case to verify RBI payment strategy
-     */
-    @Test
-    public void testRBIPaymentStrategy() {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-
-        /***
-         * Create loan product with RBI strategy
-         */
-        final Integer loanProductID = createLoanProduct("100", "0", LoanProductTestBuilder.RBI_INDIA_STRATEGY);
-        Assertions.assertNotNull(loanProductID);
-
-        /***
-         * Apply for loan application and verify loan status
-         */
-        final String savingsId = null;
-        final String principal = "12,000.00";
-
-        List<HashMap> collaterals = new ArrayList<>();
-
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
-
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
-                String.valueOf(clientID), collateralId);
-        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
-
-        final Integer loanID = applyForLoanApplicationWithPaymentStrategy(clientID, loanProductID, null, savingsId, principal,
-                LoanApplicationTestBuilder.RBI_INDIA_STRATEGY, collaterals);
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan("20 September 2011", loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap firstInstallment = loanSchedule.get(1);
-        validateNumberForEqual("3200", String.valueOf(firstInstallment.get("totalOutstandingForPeriod")));
-
-        /***
-         * Make payment for installment #1
-         */
-        this.loanTransactionHelper.makeRepayment("20 October 2011", Float.parseFloat("3200"), loanID);
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        firstInstallment = loanSchedule.get(1);
-        validateNumberForEqual("0.00", String.valueOf(firstInstallment.get("totalOutstandingForPeriod")));
-
-        /***
-         * Verify 2nd and 3rd repayments dues before making excess payment for installment no 2
-         */
-        HashMap secondInstallment = loanSchedule.get(2);
-        HashMap thirdInstallment = loanSchedule.get(3);
-
-        validateNumberForEqual("3200", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
-        validateNumberForEqual("3200", String.valueOf(thirdInstallment.get("totalOutstandingForPeriod")));
-
-        validateNumberForEqual("3000", String.valueOf(secondInstallment.get("principalOutstanding")));
-        validateNumberForEqual("3100", String.valueOf(thirdInstallment.get("principalOutstanding")));
-
-        /***
-         * Make payment for installment #2
-         */
-        this.loanTransactionHelper.makeRepayment("20 November 2011", Float.parseFloat("3200"), loanID);
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        /***
-         * Verify 2nd and 3rd repayments after making excess payment for installment no 2
-         */
-        secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("0.00", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
-
-        /***
-         * According to RBI Excess payment should go to principal portion of next installment, but as interest
-         * recalculation is not implemented, it wont make any difference to schedule even though if we made excess
-         * payment, so excess payments will behave the same as regular payment with the excess amount
-         */
-        thirdInstallment = loanSchedule.get(3);
-        validateNumberForEqual("3200", String.valueOf(thirdInstallment.get("totalOutstandingForPeriod")));
-        validateNumberForEqual("3100", String.valueOf(thirdInstallment.get("principalOutstanding")));
-        validateNumberForEqual("0", String.valueOf(thirdInstallment.get("principalPaid")));
-        validateNumberForEqual("0", String.valueOf(thirdInstallment.get("interestPaid")));
-        validateNumberForEqual("100.00", String.valueOf(thirdInstallment.get("interestOutstanding")));
-
-        /***
-         * Make payment with due amount of 3rd installment on 4th installment date
-         */
-        this.loanTransactionHelper.makeRepayment("20 January 2012", Float.parseFloat("3200"), loanID);
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-
-        /***
-         * Verify overdue interests are deducted first and then remaining amount for interest portion of due installment
-         */
-        thirdInstallment = loanSchedule.get(3);
-        HashMap fourthInstallment = loanSchedule.get(4);
-
-        validateNumberForEqual("100", String.valueOf(thirdInstallment.get("totalOutstandingForPeriod")));
-        validateNumberForEqual("100", String.valueOf(thirdInstallment.get("principalOutstanding")));
-
-        validateNumberForEqual("2900", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
-        validateNumberForEqual("100", String.valueOf(fourthInstallment.get("interestPaid")));
-        validateNumberForEqual("0.00", String.valueOf(fourthInstallment.get("interestOutstanding")));
-
-        this.loanTransactionHelper.makeRepayment("20 January 2012", Float.parseFloat("3000"), loanID);
-
-        /***
-         * verify loan is closed as we paid full amount
-         */
-        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
-
-    }
-
-    private void checkAccrualTransactions(final ArrayList<HashMap> loanSchedule, final Integer loanID) {
-
-        for (int i = 1; i < loanSchedule.size(); i++) {
-
-            final HashMap repayment = loanSchedule.get(i);
-
-            final ArrayList<Integer> dueDateAsArray = (ArrayList<Integer>) repayment.get("dueDate");
-            final LocalDate transactionDate = LocalDate.of(dueDateAsArray.get(0), dueDateAsArray.get(1), dueDateAsArray.get(2));
-
-            final Float interestPortion = BigDecimal.valueOf(Double.parseDouble(repayment.get("interestDue").toString()))
-                    .subtract(BigDecimal.valueOf(Double.parseDouble(repayment.get("interestWaived").toString())))
-                    .subtract(BigDecimal.valueOf(Double.parseDouble(repayment.get("interestWrittenOff").toString()))).floatValue();
-
-            final Float feePortion = BigDecimal.valueOf(Double.parseDouble(repayment.get("feeChargesDue").toString()))
-                    .subtract(BigDecimal.valueOf(Double.parseDouble(repayment.get("feeChargesWaived").toString())))
-                    .subtract(BigDecimal.valueOf(Double.parseDouble(repayment.get("feeChargesWrittenOff").toString()))).floatValue();
-
-            final Float penaltyPortion = BigDecimal.valueOf(Double.parseDouble(repayment.get("penaltyChargesDue").toString()))
-                    .subtract(BigDecimal.valueOf(Double.parseDouble(repayment.get("penaltyChargesWaived").toString())))
-                    .subtract(BigDecimal.valueOf(Double.parseDouble(repayment.get("penaltyChargesWrittenOff").toString()))).floatValue();
-
-            this.loanTransactionHelper.checkAccrualTransactionForRepayment(transactionDate, interestPortion, feePortion, penaltyPortion,
-                    loanID);
-        }
-    }
-
-    @Test
-    public void testLoanScheduleWithInterestRecalculation_WITH_REST_SAME_AS_REPAYMENT_INTEREST_COMPOUND_NONE_STRATEGY_REDUCE_EMI() {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-
-        DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US);
-        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
-
-        Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -14);
-        final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-        final Integer loanProductID = createLoanProductWithInterestRecalculation(LoanProductTestBuilder.DEFAULT_STRATEGY,
-                LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_NONE,
-                LoanProductTestBuilder.RECALCULATION_STRATEGY_REDUCE_EMI_AMOUN,
-                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_SAME_AS_REPAYMENT_PERIOD, "0", null,
-                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, null, null, null);
-
-        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, LOAN_DISBURSEMENT_DATE, null,
-                LoanApplicationTestBuilder.DEFAULT_STRATEGY, new ArrayList<HashMap>(0));
-
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        List<Map<String, Object>> expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.67", "23.24", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2528.81", "11.67", "0.0", "0.0");
-
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -7);
-        final String LOAN_FIRST_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
-        Float totalDueForCurrentPeriod = (Float) loanSchedule.get(1).get("totalDueForPeriod");
-        this.loanTransactionHelper.makeRepayment(LOAN_FIRST_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        Float earlyPayment = Float.parseFloat("4000");
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -5);
-        final String LOAN_SECOND_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
-        this.loanTransactionHelper.makeRepayment(LOAN_SECOND_REPAYMENT_DATE, earlyPayment, loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "3965.31", "34.69", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "1771.88", "16.39", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "1780.05", "8.22", "0.0", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        HashMap prepayDetail = this.loanTransactionHelper.getPrepayAmount(this.requestSpec, this.responseSpec, loanID);
-        String prepayAmount = String.valueOf(prepayDetail.get("amount"));
-        validateNumberForEqualWithMsg("verify pre-close amount", "3551.93", prepayAmount);
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        final String loanRepaymentDate = dateFormat.format(todaysDate.getTime());
-        this.loanTransactionHelper.makeRepayment(loanRepaymentDate, Float.parseFloat(prepayAmount), loanID);
-        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
-    }
-
-    @Test
-    public void testLoanScheduleWithInterestRecalculation_WITH_REST_SAME_AS_REPAYMENT_INTEREST_COMPOUND_NONE_STRATEGY_REDUCE_EMI_PRE_CLOSE_INTEREST_PRE_CLOSE_DATE() {
-        String preCloseInterestStrategy = LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE;
-        String preCloseAmount = "7561.84";
-        testLoanScheduleWithInterestRecalculation_WITH_REST_SAME_AS_REPAYMENT_INTEREST_COMPOUND_NONE_STRATEGY_REDUCE_EMI_PRE_CLOSE_INTEREST(
-                preCloseInterestStrategy, preCloseAmount);
-    }
-
-    @Test
-    public void testLoanScheduleWithInterestRecalculation_WITH_REST_SAME_AS_REPAYMENT_INTEREST_COMPOUND_NONE_STRATEGY_REDUCE_EMI_PRE_CLOSE_INTEREST_REST_DATE() {
-        String preCloseInterestStrategy = LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_REST_DATE;
-        String preCloseAmount = "7586.62";
-        testLoanScheduleWithInterestRecalculation_WITH_REST_SAME_AS_REPAYMENT_INTEREST_COMPOUND_NONE_STRATEGY_REDUCE_EMI_PRE_CLOSE_INTEREST(
-                preCloseInterestStrategy, preCloseAmount);
-    }
-
-    private void testLoanScheduleWithInterestRecalculation_WITH_REST_SAME_AS_REPAYMENT_INTEREST_COMPOUND_NONE_STRATEGY_REDUCE_EMI_PRE_CLOSE_INTEREST(
-            String preCloseInterestStrategy, String preCloseAmount) {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-        DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US);
-        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
-
-        Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -16);
-        final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-        final Integer loanProductID = createLoanProductWithInterestRecalculation(LoanProductTestBuilder.DEFAULT_STRATEGY,
-                LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_NONE,
-                LoanProductTestBuilder.RECALCULATION_STRATEGY_REDUCE_EMI_AMOUN,
-                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_SAME_AS_REPAYMENT_PERIOD, "0", null, preCloseInterestStrategy, null,
-                null, null);
-
-        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, LOAN_DISBURSEMENT_DATE, null,
-                LoanApplicationTestBuilder.DEFAULT_STRATEGY, new ArrayList<HashMap>(0));
-
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        List<Map<String, Object>> expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -9, true, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -9, true, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2551.72", "11.78", "0.0", "0.0");
-
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -9);
-        final String LOAN_FIRST_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
-        Float totalDueForCurrentPeriod = (Float) loanSchedule.get(1).get("totalDueForPeriod");
-        this.loanTransactionHelper.makeRepayment(LOAN_FIRST_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -9, true, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2528.8", "11.67", "0.0", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        HashMap prepayDetail = this.loanTransactionHelper.getPrepayAmount(this.requestSpec, this.responseSpec, loanID);
-        String prepayAmount = String.valueOf(prepayDetail.get("amount"));
-        validateNumberForEqualWithMsg("verify pre-close amount", preCloseAmount, prepayAmount);
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        final String loanRepaymentDate = dateFormat.format(todaysDate.getTime());
-        this.loanTransactionHelper.makeRepayment(loanRepaymentDate, Float.parseFloat(prepayAmount), loanID);
-        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
-    }
-
-    @Test
-    public void testLoanScheduleWithInterestRecalculation_WITH_REST_SAME_AS_REPAYMENT_INTEREST_COMPOUND_NONE_STRATEGY_REDUCE_EMI_WITH_INSTALLMENT_CHARGE() {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-
-        DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US);
-        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
-
-        Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -14);
-        final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-        final Integer loanProductID = createLoanProductWithInterestRecalculation(LoanProductTestBuilder.DEFAULT_STRATEGY,
-                LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_NONE,
-                LoanProductTestBuilder.RECALCULATION_STRATEGY_REDUCE_EMI_AMOUN,
-                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_SAME_AS_REPAYMENT_PERIOD, "0", null,
-                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, null, null, null);
-
-        List<HashMap> charges = new ArrayList<>();
-        Integer installmentCharge = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_INTEREST, "10", false));
-        addCharges(charges, installmentCharge, "10", null);
-        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, LOAN_DISBURSEMENT_DATE, null,
-                LoanApplicationTestBuilder.DEFAULT_STRATEGY, charges);
-
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        List<Map<String, Object>> expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "4.62", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "3.47", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "2.32", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "1.16", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "4.62", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.76", "46.15", "4.62", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.67", "23.24", "2.32", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2528.81", "11.67", "1.17", "0.0");
-
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -7);
-        final String LOAN_FIRST_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
-        Float totalDueForCurrentPeriod = (Float) loanSchedule.get(1).get("totalDueForPeriod");
-        this.loanTransactionHelper.makeRepayment(LOAN_FIRST_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "4.62", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "3.47", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "2.32", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "1.16", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        Float earlyPayment = Float.parseFloat("4000");
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -5);
-        final String LOAN_SECOND_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
-        this.loanTransactionHelper.makeRepayment(LOAN_SECOND_REPAYMENT_DATE, earlyPayment, loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "4.62", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "3961.84", "34.69", "3.47", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "1773.61", "16.41", "1.64", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "1781.79", "8.22", "0.82", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        HashMap prepayDetail = this.loanTransactionHelper.getPrepayAmount(this.requestSpec, this.responseSpec, loanID);
-        String prepayAmount = String.valueOf(prepayDetail.get("amount"));
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        final String loanRepaymentDate = dateFormat.format(todaysDate.getTime());
-        this.loanTransactionHelper.makeRepayment(loanRepaymentDate, Float.parseFloat(prepayAmount), loanID);
-        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
-    }
-
-    @Test
-    public void testLoanScheduleWithInterestRecalculation_WITH_REST_DAILY_INTEREST_COMPOUND_INTEREST_STRATEGY_REDUCE_NUMBER_OF_INSTALLMENTS() {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-
-        DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US);
-        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
-
-        Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -14);
-        final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
-        Integer dayOfWeek = getDayOfWeek(todaysDate);
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-        final Integer loanProductID = createLoanProductWithInterestRecalculationAndCompoundingDetails(
-                LoanProductTestBuilder.RBI_INDIA_STRATEGY, LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_INTEREST,
-                LoanProductTestBuilder.RECALCULATION_STRATEGY_REDUCE_NUMBER_OF_INSTALLMENTS,
-                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_DAILY, "1", LOAN_DISBURSEMENT_DATE,
-                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_WEEKLY, "1", LOAN_DISBURSEMENT_DATE,
-                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, null, null, dayOfWeek, null, dayOfWeek);
-
-        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, LOAN_DISBURSEMENT_DATE,
-                LoanApplicationTestBuilder.RBI_INDIA_STRATEGY, new ArrayList<HashMap>(0));
-
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        List<Map<String, Object>> expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
-
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.54", "46.37", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.67", "23.24", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2529.03", "11.67", "0.0", "0.0");
-
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        loanSchedule = this.loanTransactionHelper.getLoanFutureRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, 0, false, "4965.3", "92.52", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.67", "23.24", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2529.03", "11.67", "0.0", "0.0");
-
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues, 0);
-
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -7);
-        final String LOAN_FIRST_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
-        Float totalDueForCurrentPeriod = (Float) loanSchedule.get(1).get("totalDueForPeriod");
-        this.loanTransactionHelper.makeRepayment(LOAN_FIRST_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        Float earlyPayment = Float.parseFloat("4000");
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -5);
-        final String LOAN_SECOND_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
-        this.loanTransactionHelper.makeRepayment(LOAN_SECOND_REPAYMENT_DATE, earlyPayment, loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        Calendar today = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        Map<String, Object> paymentday = new HashMap<>(3);
-        paymentday.put("dueDate", getDateAsArray(today, -5, Calendar.DAY_OF_MONTH));
-        paymentday.put("principalDue", "3990.09");
-        paymentday.put("interestDue", "9.91");
-        paymentday.put("feeChargesDue", "0");
-        paymentday.put("penaltyChargesDue", "0");
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
-        expectedvalues.add(paymentday);
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.31", "11.6", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "1009.84", "4.66", "0.0", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        HashMap prepayDetail = this.loanTransactionHelper.getPrepayAmount(this.requestSpec, this.responseSpec, loanID);
-        String prepayAmount = String.valueOf(prepayDetail.get("amount"));
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        final String loanRepaymentDate = dateFormat.format(todaysDate.getTime());
-        this.loanTransactionHelper.makeRepayment(loanRepaymentDate, Float.parseFloat(prepayAmount), loanID);
-        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
-
-    }
-
-    @Test
-    public void testInteroperationLoanRepaymentAPI() {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-        final ResponseSpecification errorResponse = new ResponseSpecBuilder().expectStatusCode(403).build();
-        DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US);
-        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
-        GlobalConfigurationHelper.updateEnabledFlagForGlobalConfiguration(this.requestSpec, this.responseSpec, "42", true);
-        Calendar startDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        startDate.add(Calendar.MONTH, -8);
-
-        Calendar firstRepaymentDate = (Calendar) startDate.clone();
-        firstRepaymentDate.add(Calendar.MONTH, 1);
-        firstRepaymentDate.add(Calendar.DAY_OF_MONTH, firstRepaymentDate.getActualMaximum(Calendar.DAY_OF_MONTH) - Calendar.DAY_OF_MONTH);
-        String firstRepayment = dateFormat.format(firstRepaymentDate.getTime());
-
-        final String loanDisbursementDate = dateFormat.format(startDate.getTime());
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-        final Integer loanProductID = createLoanProductWithInterestRecalculationAndCompoundingDetails(
-                LoanProductTestBuilder.INTEREST_PRINCIPAL_PENALTIES_FEES_ORDER_STRATEGY,
-                LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_NONE,
-                LoanProductTestBuilder.RECALCULATION_STRATEGY_REDUCE_NUMBER_OF_INSTALLMENTS,
-                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_SAME_AS_REPAYMENT_PERIOD,
-                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, null, "12");
-
-        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, loanDisbursementDate,
-                LoanApplicationTestBuilder.INTEREST_PRINCIPAL_PENALTIES_FEES_ORDER_STRATEGY, firstRepayment);
-
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan(loanDisbursementDate, loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount(loanDisbursementDate, loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        Assertions.assertNotNull(loanSchedule);
-        startDate.add(Calendar.DAY_OF_MONTH, 2);
-        String loanFirstRepaymentDate = dateFormat.format(startDate.getTime());
-
-        Float earlyPayment = Float.parseFloat("3000");
-        String accountNo = JsonPath.from(loanDetails).get("accountNo").toString();
-
-        HashMap loanRepayment = this.loanTransactionHelper.makeRepaymentWithAccountNo(loanFirstRepaymentDate, earlyPayment, accountNo);
-        assertNotNull(loanRepayment);
-    }
-
-    @Test
-    public void testLoanScheduleWithInterestRecalculation_WITH_REST_WEEKLY_INTEREST_COMPOUND_INTEREST_FEE_STRATEGY_REDUCE_NEXT_INSTALLMENTS() {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-
-        DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US);
-        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
-
-        Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -14);
-        Integer compoundingDayOfMonth = getDayOfMonth(todaysDate);
-        Integer compoundingDayOfWeek = getDayOfWeek(todaysDate);
-        final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -2);
-        Integer restDayOfMonth = getDayOfMonth(todaysDate);
-        Integer restDayOfWeek = getDayOfWeek(todaysDate);
-        final String REST_START_DATE = dateFormat.format(todaysDate.getTime());
-
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -14);
-        todaysDate.add(Calendar.DAY_OF_MONTH, 2);
-        final String LOAN_FLAT_CHARGE_DATE = dateFormat.format(todaysDate.getTime());
-        todaysDate.add(Calendar.DAY_OF_MONTH, 14);
-        final String LOAN_INTEREST_CHARGE_DATE = dateFormat.format(todaysDate.getTime());
-        List<HashMap> charges = new ArrayList<>(2);
-        Integer flat = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "100", false));
-        Integer principalPercentage = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "2", false));
-
-        addCharges(charges, flat, "100", LOAN_FLAT_CHARGE_DATE);
-        addCharges(charges, principalPercentage, "2", LOAN_INTEREST_CHARGE_DATE);
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-        final Integer loanProductID = createLoanProductWithInterestRecalculationAndCompoundingDetails(
-                LoanProductTestBuilder.DEFAULT_STRATEGY, LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_INTEREST_AND_FEE,
-                LoanProductTestBuilder.RECALCULATION_STRATEGY_RESCHEDULE_NEXT_REPAYMENTS,
-                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_WEEKLY, "1", REST_START_DATE,
-                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_WEEKLY, "1", LOAN_DISBURSEMENT_DATE,
-                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, null, compoundingDayOfMonth, compoundingDayOfWeek,
-                restDayOfMonth, restDayOfWeek);
-
-        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, LOAN_DISBURSEMENT_DATE,
-                LOAN_DISBURSEMENT_DATE, LoanApplicationTestBuilder.DEFAULT_STRATEGY, charges);
-
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        List<Map<String, Object>> expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "100.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "200", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "100.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.08", "46.83", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.67", "23.24", "200", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2529.49", "11.67", "0.0", "0.0");
-
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        Calendar repaymentDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        repaymentDate.add(Calendar.DAY_OF_MONTH, -7);
-        final String LOAN_FIRST_REPAYMENT_DATE = dateFormat.format(repaymentDate.getTime());
-        Float totalDueForCurrentPeriod = (Float) loanSchedule.get(1).get("totalDueForPeriod");
-        this.loanTransactionHelper.makeRepayment(LOAN_FIRST_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "100.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "200", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        Float earlyPayment = Float.parseFloat("5100");
-        repaymentDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        repaymentDate.add(Calendar.DAY_OF_MONTH, -5);
-        final String LOAN_SECOND_REPAYMENT_DATE = dateFormat.format(repaymentDate.getTime());
-        this.loanTransactionHelper.makeRepayment(LOAN_SECOND_REPAYMENT_DATE, earlyPayment, loanID);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "100.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "5065.31", "34.69", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "0", "11.32", "200", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2451.93", "11.32", "0.0", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        HashMap prepayDetail = this.loanTransactionHelper.getPrepayAmount(this.requestSpec, this.responseSpec, loanID);
-        String prepayAmount = String.valueOf(prepayDetail.get("amount"));
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        final String loanRepaymentDate = dateFormat.format(todaysDate.getTime());
-        this.loanTransactionHelper.makeRepayment(loanRepaymentDate, Float.parseFloat(prepayAmount), loanID);
-        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
-
-    }
-
-    @Test
-    public void testLoanScheduleWithInterestRecalculation_WITH_REST_WEEKLY_INTEREST_COMPOUND_INTEREST_FEE_STRATEGY_REDUCE_NEXT_INSTALLMENTS_PRE_CLOSE_INTEREST_PRE_CLOSE_DATE() {
-        String preCloseInterestStrategy = LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE;
-        String preCloseAmount = "7761.89";
-        testLoanScheduleWithInterestRecalculation_WITH_REST_WEEKLY_INTEREST_COMPOUND_INTEREST_FEE_STRATEGY_REDUCE_NEXT_INSTALLMENTS_PRE_CLOSE_INTEREST(
-                preCloseInterestStrategy, preCloseAmount);
-
-    }
-
-    @Test
-    public void testLoanScheduleWithInterestRecalculation_WITH_REST_WEEKLY_INTEREST_COMPOUND_INTEREST_FEE_STRATEGY_REDUCE_NEXT_INSTALLMENTS_PRE_CLOSE_INTEREST_REST_DATE() {
-        String preCloseInterestStrategy = LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_REST_DATE;
-        String preCloseAmount = "7786.79";
-        testLoanScheduleWithInterestRecalculation_WITH_REST_WEEKLY_INTEREST_COMPOUND_INTEREST_FEE_STRATEGY_REDUCE_NEXT_INSTALLMENTS_PRE_CLOSE_INTEREST(
-                preCloseInterestStrategy, preCloseAmount);
-
-    }
-
-    private void testLoanScheduleWithInterestRecalculation_WITH_REST_WEEKLY_INTEREST_COMPOUND_INTEREST_FEE_STRATEGY_REDUCE_NEXT_INSTALLMENTS_PRE_CLOSE_INTEREST(
-            String preCloseInterestStrategy, String preCloseAmount) {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-
-        DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US);
-        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
-
-        Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -16);
-        final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -4);
-        Integer restDateOfMonth = getDayOfMonth(todaysDate);
-        Integer restDateOfWeek = getDayOfWeek(todaysDate);
-        final String REST_START_DATE = null;
-
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -16);
-        todaysDate.add(Calendar.DAY_OF_MONTH, 2);
-        final String LOAN_FLAT_CHARGE_DATE = dateFormat.format(todaysDate.getTime());
-        todaysDate.add(Calendar.DAY_OF_MONTH, 14);
-        final String LOAN_INTEREST_CHARGE_DATE = dateFormat.format(todaysDate.getTime());
-        List<HashMap> charges = new ArrayList<>(2);
-        Integer flat = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "100", false));
-        Integer principalPercentage = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "2", false));
-
-        addCharges(charges, flat, "100", LOAN_FLAT_CHARGE_DATE);
-        addCharges(charges, principalPercentage, "2", LOAN_INTEREST_CHARGE_DATE);
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-        final Integer loanProductID = createLoanProductWithInterestRecalculationAndCompoundingDetails(
-                LoanProductTestBuilder.DEFAULT_STRATEGY, LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_INTEREST_AND_FEE,
-                LoanProductTestBuilder.RECALCULATION_STRATEGY_RESCHEDULE_NEXT_REPAYMENTS,
-                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_WEEKLY, "1", REST_START_DATE,
-                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_SAME_AS_REPAYMENT_PERIOD, null, null, preCloseInterestStrategy, null,
-                null, null, restDateOfMonth, restDateOfWeek);
-
-        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, LOAN_DISBURSEMENT_DATE,
-                REST_START_DATE, LoanApplicationTestBuilder.DEFAULT_STRATEGY, charges);
-
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        List<Map<String, Object>> expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -9, true, "2482.76", "46.15", "100.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "200", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -9, true, "2482.76", "46.15", "100.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.08", "46.83", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2481.87", "47.04", "200", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2553.29", "11.78", "0.0", "0.0");
-
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        Calendar repaymentDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        repaymentDate.add(Calendar.DAY_OF_MONTH, -9);
-        final String LOAN_FIRST_REPAYMENT_DATE = dateFormat.format(repaymentDate.getTime());
-        Float totalDueForCurrentPeriod = (Float) loanSchedule.get(1).get("totalDueForPeriod");
-        this.loanTransactionHelper.makeRepayment(LOAN_FIRST_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -9, true, "2482.76", "46.15", "100.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.05", "34.86", "200", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2528.97", "11.67", "0.0", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        HashMap prepayDetail = this.loanTransactionHelper.getPrepayAmount(this.requestSpec, this.responseSpec, loanID);
-        String prepayAmount = String.valueOf(prepayDetail.get("amount"));
-        validateNumberForEqualWithMsg("verify pre-close amount", preCloseAmount, prepayAmount);
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        final String loanRepaymentDate = dateFormat.format(todaysDate.getTime());
-        this.loanTransactionHelper.makeRepayment(loanRepaymentDate, Float.parseFloat(prepayAmount), loanID);
-        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
-    }
-
-    @Test
-    public void testLoanScheduleWithInterestRecalculation_WITH_REST_DAILY_INTEREST_COMPOUND_INTEREST_FEE_STRATEGY_WITH_OVERDUE_CHARGE()
-            throws InterruptedException {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-
-        DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US);
-        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
-
-        Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -7 * 3);
-        final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -2);
-        final String REST_START_DATE = dateFormat.format(todaysDate.getTime());
-
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-
-        Integer overdueFeeChargeId = ChargesHelper.createCharges(this.requestSpec, this.responseSpec,
-                ChargesHelper.getLoanOverdueFeeJSONWithCalculationTypePercentage("10"));
-        Assertions.assertNotNull(overdueFeeChargeId);
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-        final String recalculationCompoundingFrequencyInterval = null;
-        final String recalculationCompoundingFrequencyDate = null;
-        final Integer loanProductID = createLoanProductWithInterestRecalculation(LoanProductTestBuilder.DEFAULT_STRATEGY,
-                LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_INTEREST_AND_FEE,
-                LoanProductTestBuilder.RECALCULATION_STRATEGY_RESCHEDULE_NEXT_REPAYMENTS,
-                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_DAILY, "1", REST_START_DATE,
-                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_SAME_AS_REPAYMENT_PERIOD, recalculationCompoundingFrequencyInterval,
-                recalculationCompoundingFrequencyDate, LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, null,
-                overdueFeeChargeId.toString(), false, null, null, null, null);
-
-        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, LOAN_DISBURSEMENT_DATE,
-                REST_START_DATE, LoanApplicationTestBuilder.DEFAULT_STRATEGY, null);
-
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        List<Map<String, Object>> expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -2, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-
-        addRepaymentValues(expectedvalues, todaysDate, -2, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.54", "46.37", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.33", "46.58", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2552.37", "11.78", "0.0", "0.0");
-
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        String JobName = "Apply penalty to overdue loans";
-        this.schedulerJobHelper.executeAndAwaitJob(JobName);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -2, false, "2482.76", "46.15", "0.0", "252.89");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2481.38", "47.53", "0.0", "252.89");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2479.99", "48.92", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2555.87", "11.8", "0.0", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        Calendar repaymentDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        repaymentDate.add(Calendar.DAY_OF_MONTH, -7 * 2);
-        final String LOAN_FIRST_REPAYMENT_DATE = dateFormat.format(repaymentDate.getTime());
-        Float totalDueForCurrentPeriod = (Float) loanSchedule.get(1).get("totalDueForPeriod");
-        totalDueForCurrentPeriod = totalDueForCurrentPeriod - Float.parseFloat("252.89");
-        this.loanTransactionHelper.makeRepayment(LOAN_FIRST_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -2, false, "2482.76", "46.15", "0.0", "252.89");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2493.05", "35.86", "0.0", "252.89");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2491.72", "37.19", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2532.47", "11.69", "0.0", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        repaymentDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        repaymentDate.add(Calendar.DAY_OF_MONTH, -3);
-        final String LOAN_SECOND_REPAYMENT_DATE = dateFormat.format(repaymentDate.getTime());
-        totalDueForCurrentPeriod = (Float) loanSchedule.get(2).get("totalDueForPeriod");
-        this.loanTransactionHelper.makeRepayment(LOAN_SECOND_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -2, false, "2482.76", "46.15", "0.0", "252.89");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2493.05", "35.86", "0.0", "252.89");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2497.22", "31.69", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2526.97", "11.66", "0.0", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-    }
-
-    @Test
-    public void testLoanScheduleWithInterestRecalculation_WITH_PERIODIC_ACCOUNTING() {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-        this.periodicAccrualAccountingHelper = new PeriodicAccrualAccountingHelper(this.requestSpec, this.responseSpec);
-        this.journalEntryHelper = new JournalEntryHelper(this.requestSpec, this.responseSpec);
-
-        DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US);
-        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
-
-        final Account assetAccount = this.accountHelper.createAssetAccount();
-        final Account incomeAccount = this.accountHelper.createIncomeAccount();
-        final Account expenseAccount = this.accountHelper.createExpenseAccount();
-        final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
-
-        Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        LOG.info("Disbursal Date Calendar {}", todaysDate.getTime());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -14);
-        final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-        Account[] accounts = { assetAccount, incomeAccount, expenseAccount, overpaymentAccount };
-        final Integer loanProductID = createLoanProductWithInterestRecalculation(LoanProductTestBuilder.DEFAULT_STRATEGY,
-                LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_NONE,
-                LoanProductTestBuilder.RECALCULATION_STRATEGY_REDUCE_EMI_AMOUN,
-                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_SAME_AS_REPAYMENT_PERIOD, "0", null,
-                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, accounts, null, null);
-
-        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, LOAN_DISBURSEMENT_DATE, null,
-                LoanApplicationTestBuilder.DEFAULT_STRATEGY, new ArrayList<HashMap>(0));
-
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        List<Map<String, Object>> expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        LOG.info("Date during repayment schedule {}", todaysDate.getTime());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.67", "23.24", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2528.81", "11.67", "0.0", "0.0");
-
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(10000.0f, JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(10000.0f, JournalEntry.TransactionType.DEBIT), };
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, LOAN_DISBURSEMENT_DATE, assetAccountInitialEntry);
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        String runOndate = dateFormat.format(todaysDate.getTime());
-        LOG.info("runOndate : {}", runOndate);
-        this.periodicAccrualAccountingHelper.runPeriodicAccrualAccounting(runOndate);
-        this.loanTransactionHelper.checkAccrualTransactionForRepayment(Utils.getLocalDateOfTenant().minusDays(7), 46.15f, 0f, 0f, loanID);
-        this.loanTransactionHelper.checkAccrualTransactionForRepayment(Utils.getLocalDateOfTenant(), 46.15f, 0f, 0f, loanID);
-
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -7);
-        final String LOAN_FIRST_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
-        Float totalDueForCurrentPeriod = (Float) loanSchedule.get(1).get("totalDueForPeriod");
-        this.loanTransactionHelper.makeRepayment(LOAN_FIRST_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        this.periodicAccrualAccountingHelper.runPeriodicAccrualAccounting(runOndate);
-        this.loanTransactionHelper.checkAccrualTransactionForRepayment(Utils.getLocalDateOfTenant().minusDays(7), 46.15f, 0f, 0f, loanID);
-        this.loanTransactionHelper.checkAccrualTransactionForRepayment(Utils.getLocalDateOfTenant(), 34.69f, 0f, 0f, loanID);
-
-        HashMap prepayDetail = this.loanTransactionHelper.getPrepayAmount(this.requestSpec, this.responseSpec, loanID);
-        String prepayAmount = String.valueOf(prepayDetail.get("amount"));
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        final String loanRepaymentDate = dateFormat.format(todaysDate.getTime());
-        this.loanTransactionHelper.makeRepayment(loanRepaymentDate, Float.parseFloat(prepayAmount), loanID);
-        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
-
-        this.loanTransactionHelper.checkAccrualTransactionForRepayment(Utils.getLocalDateOfTenant().minusDays(7), 46.15f, 0f, 0f, loanID);
-        this.loanTransactionHelper.checkAccrualTransactionForRepayment(Utils.getLocalDateOfTenant(), 34.69f, 0f, 0f, loanID);
-
-    }
-
-    @Test
-    public void testLoanScheduleWithInterestRecalculation_WITH_CURRENT_REPAYMENT_BASED_ARREARS_AGEING() {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-
-        DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US);
-        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
-
-        Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -14);
-        final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-        final Integer loanProductID = createLoanProductWithInterestRecalculationAndCompoundingDetails(
-                LoanProductTestBuilder.RBI_INDIA_STRATEGY, LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_INTEREST,
-                LoanProductTestBuilder.RECALCULATION_STRATEGY_RESCHEDULE_NEXT_REPAYMENTS,
-                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_DAILY, "1", LOAN_DISBURSEMENT_DATE,
-                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_SAME_AS_REPAYMENT_PERIOD, "1", LOAN_DISBURSEMENT_DATE,
-                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, null, getDayOfMonth(todaysDate),
-                getDayOfWeek(todaysDate), getDayOfMonth(todaysDate), getDayOfWeek(todaysDate));
-
-        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, LOAN_DISBURSEMENT_DATE,
-                LOAN_DISBURSEMENT_DATE, LoanApplicationTestBuilder.RBI_INDIA_STRATEGY, new ArrayList<HashMap>(0));
-
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        List<Map<String, Object>> expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
-
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.54", "46.37", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.67", "23.24", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2529.03", "11.67", "0.0", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -7);
-        HashMap loanSummary = this.loanTransactionHelper.getLoanSummary(this.requestSpec, this.responseSpec, loanID);
-        List dates = (List) loanSummary.get("overdueSinceDate");
-        assertEquals(todaysDate.get(Calendar.YEAR), dates.get(0));
-        assertEquals(todaysDate.get(Calendar.MONTH) + 1, dates.get(1));
-        assertEquals(todaysDate.get(Calendar.DAY_OF_MONTH), dates.get(2));
-
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -8);
-        final String LOAN_FIRST_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
-        Float totalDueForCurrentPeriod = (Float) loanSchedule.get(1).get("totalDueForPeriod");
-        this.loanTransactionHelper.makeRepayment(LOAN_FIRST_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
-
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -7);
-        loanSummary = this.loanTransactionHelper.getLoanSummary(this.requestSpec, this.responseSpec, loanID);
-        dates = (List) loanSummary.get("overdueSinceDate");
-        assertEquals(todaysDate.get(Calendar.YEAR), dates.get(0));
-        assertEquals(todaysDate.get(Calendar.MONTH) + 1, dates.get(1));
-        assertEquals(todaysDate.get(Calendar.DAY_OF_MONTH), dates.get(2));
-
-    }
-
-    @Test
-    public void testLoanScheduleWithInterestRecalculation_WITH_ORIGINAL_REPAYMENT_BASED_ARREARS_AGEING() {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-
-        DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US);
-        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
-
-        Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        LOG.info("----timeeeeeeeeeeeeee------> {}", dateFormat.format(todaysDate.getTime()));
-        todaysDate.add(Calendar.DAY_OF_MONTH, -14);
-        final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-        final String recalculationCompoundingFrequencyInterval = null;
-        final String recalculationCompoundingFrequencyDate = null;
-        final Integer loanProductID = createLoanProductWithInterestRecalculation(LoanProductTestBuilder.RBI_INDIA_STRATEGY,
-                LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_INTEREST,
-                LoanProductTestBuilder.RECALCULATION_STRATEGY_RESCHEDULE_NEXT_REPAYMENTS,
-                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_DAILY, "1", LOAN_DISBURSEMENT_DATE,
-                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_SAME_AS_REPAYMENT_PERIOD, recalculationCompoundingFrequencyInterval,
-                recalculationCompoundingFrequencyDate, LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, null, null,
-                true, null, null, getDayOfMonth(todaysDate), getDayOfWeek(todaysDate));
-
-        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, LOAN_DISBURSEMENT_DATE,
-                LOAN_DISBURSEMENT_DATE, LoanApplicationTestBuilder.RBI_INDIA_STRATEGY, new ArrayList<HashMap>(0));
-
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        List<Map<String, Object>> expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
-
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.54", "46.37", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.67", "23.24", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2529.03", "11.67", "0.0", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -7);
-        HashMap loanSummary = this.loanTransactionHelper.getLoanSummary(this.requestSpec, this.responseSpec, loanID);
-        List dates = (List) loanSummary.get("overdueSinceDate");
-        assertEquals(todaysDate.get(Calendar.YEAR), dates.get(0));
-        assertEquals(todaysDate.get(Calendar.MONTH) + 1, dates.get(1));
-        assertEquals(todaysDate.get(Calendar.DAY_OF_MONTH), dates.get(2));
-
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -8);
-        final String LOAN_FIRST_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
-        Float totalDueForCurrentPeriod = (Float) loanSchedule.get(1).get("totalDueForPeriod");
-        this.loanTransactionHelper.makeRepayment(LOAN_FIRST_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
-
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -7);
-        loanSummary = this.loanTransactionHelper.getLoanSummary(this.requestSpec, this.responseSpec, loanID);
-        dates = (List) loanSummary.get("overdueSinceDate");
-        Assertions.assertNull(dates);
-
-    }
-
-    @Test
-    public void testLoanScheduleWithInterestRecalculation_FOR_PRE_CLOSE_WITH_MORATORIUM_INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE() {
-        testLoanScheduleWithInterestRecalculation_FOR_PRE_CLOSE_WITH_MORATORIUM(
-                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, "10006.59");
-    }
-
-    @Test
-    public void testLoanScheduleWithInterestRecalculation_FOR_PRE_CLOSE_WITH_MORATORIUM_INTEREST_APPLICABLE_STRATEGY_REST_DATE() {
-        testLoanScheduleWithInterestRecalculation_FOR_PRE_CLOSE_WITH_MORATORIUM(
-                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_REST_DATE, "10046.15");
-    }
-
     private void testLoanScheduleWithInterestRecalculation_FOR_PRE_CLOSE_WITH_MORATORIUM(final String preCloseStrategy,
             final String preCloseAmount) {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
 
-        DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US);
+        DateFormat dateFormat = new SimpleDateFormat(DATETIME_PATTERN, Locale.US);
         dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
 
         Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
         todaysDate.add(Calendar.DAY_OF_MONTH, -1);
         final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
 
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
         final Integer loanProductID = createLoanProductWithInterestRecalculation(LoanProductTestBuilder.DEFAULT_STRATEGY,
                 LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_NONE,
                 LoanProductTestBuilder.RECALCULATION_STRATEGY_REDUCE_EMI_AMOUN,
@@ -4705,10 +7490,10 @@ public class ClientLoanIntegrationTest {
                 LOAN_DISBURSEMENT_DATE, LoanApplicationTestBuilder.DEFAULT_STRATEGY, new ArrayList<HashMap>(0), "1", null);
 
         Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
 
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         List<Map<String, Object>> expectedvalues = new ArrayList<>();
         todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
         todaysDate.add(Calendar.DAY_OF_MONTH, -1);
@@ -4719,17 +7504,17 @@ public class ClientLoanIntegrationTest {
         verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
 
         LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
         LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
         LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
 
         LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
                 JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
         LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
 
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         expectedvalues = new ArrayList<>();
         todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
         todaysDate.add(Calendar.DAY_OF_MONTH, -1);
@@ -4740,13 +7525,13 @@ public class ClientLoanIntegrationTest {
 
         verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
 
-        HashMap prepayDetail = this.loanTransactionHelper.getPrepayAmount(this.requestSpec, this.responseSpec, loanID);
+        HashMap prepayDetail = LOAN_TRANSACTION_HELPER.getPrepayAmount(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         String prepayAmount = String.valueOf(prepayDetail.get("amount"));
         validateNumberForEqualWithMsg("verify pre-close amount", preCloseAmount, prepayAmount);
         todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
         final String loanRepaymentDate = dateFormat.format(todaysDate.getTime());
-        this.loanTransactionHelper.makeRepayment(loanRepaymentDate, Float.parseFloat(prepayAmount), loanID);
-        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
+        LOAN_TRANSACTION_HELPER.makeRepayment(loanRepaymentDate, Float.parseFloat(prepayAmount), loanID);
+        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
     }
 
@@ -4852,7 +7637,7 @@ public class ClientLoanIntegrationTest {
         }
 
         final String loanProductJSON = builder.build(chargeId);
-        return this.loanTransactionHelper.getLoanProductId(loanProductJSON);
+        return LOAN_TRANSACTION_HELPER.getLoanProductId(loanProductJSON);
     }
 
     private Integer createLoanProductWithInterestRecalculationAndCompoundingDetails(final String repaymentStrategy,
@@ -4897,17 +7682,17 @@ public class ClientLoanIntegrationTest {
         }
 
         final String loanProductJSON = builder.build(chargeId);
-        return this.loanTransactionHelper.getLoanProductId(loanProductJSON);
+        return LOAN_TRANSACTION_HELPER.getLoanProductId(loanProductJSON);
     }
 
     private Integer applyForLoanApplicationForInterestRecalculation(final Integer clientID, final Integer loanProductID,
             final String disbursementDate, final String repaymentStrategy, final String firstRepaymentDate) {
         LOG.info("--------------------------------APPLYING FOR LOAN APPLICATION--------------------------------");
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
         Assertions.assertNotNull(collateralId);
         List<HashMap> collaterals = new ArrayList<>();
 
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
                 String.valueOf(clientID), collateralId);
         Assertions.assertNotNull(clientCollateralId);
         addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
@@ -4928,7 +7713,7 @@ public class ClientLoanIntegrationTest {
                 .withRepaymentStrategy(repaymentStrategy).withRepaymentFrequencyTypeAsMonths()//
                 .withFirstRepaymentDate(firstRepaymentDate).withCollaterals(collaterals)
                 .build(clientID.toString(), loanProductID.toString(), null);
-        return this.loanTransactionHelper.getLoanId(loanApplicationJSON);
+        return LOAN_TRANSACTION_HELPER.getLoanId(loanApplicationJSON);
     }
 
     private Integer applyForLoanApplicationForInterestRecalculation(final Integer clientID, final Integer loanProductID,
@@ -4954,11 +7739,11 @@ public class ClientLoanIntegrationTest {
             final String disbursementDate, final String repaymentStrategy, final List<HashMap> charges, final String graceOnInterestPayment,
             final String graceOnPrincipalPayment) {
         LOG.info("--------------------------------APPLYING FOR LOAN APPLICATION--------------------------------");
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
+        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(REQUEST_SPEC, RESPONSE_SPEC);
         Assertions.assertNotNull(collateralId);
         List<HashMap> collaterals = new ArrayList<>();
 
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
+        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(REQUEST_SPEC, RESPONSE_SPEC,
                 String.valueOf(clientID), collateralId);
         Assertions.assertNotNull(clientCollateralId);
         addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
@@ -4981,7 +7766,7 @@ public class ClientLoanIntegrationTest {
                 .withInterestGrace(graceOnInterestPayment)//
                 .withCharges(charges)//
                 .withCollaterals(collaterals).build(clientID.toString(), loanProductID.toString(), null);
-        return this.loanTransactionHelper.getLoanId(loanApplicationJSON);
+        return LOAN_TRANSACTION_HELPER.getLoanId(loanApplicationJSON);
     }
 
     private void verifyLoanRepaymentSchedule(final ArrayList<HashMap> loanSchedule, List<Map<String, Object>> expectedvalues) {
@@ -5006,601 +7791,213 @@ public class ClientLoanIntegrationTest {
         }
     }
 
-    /***
-     * Test case to verify default Style payment strategy
-     */
-    @Test
-    public void testLoanRefundByCashCashBasedAccounting() {
-        this.journalEntryHelper = new JournalEntryHelper(this.requestSpec, this.responseSpec);
+    private void checkAccrualTransactions(final ArrayList<HashMap> loanSchedule, final Integer loanID) {
 
-        Calendar fourMonthsfromNowCalendar = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        fourMonthsfromNowCalendar.add(Calendar.MONTH, -4);
+        for (int i = 1; i < loanSchedule.size(); i++) {
 
-        // FINERACT-885: If the loan starts on day 27-31th of month and not all months have that
-        // many days, then loan payment will get reset to a day of month less than today's day
-        // and 4th payment will be in the past. In such case, start the loan a few days later,
-        // so that 4th payment is guaranteed to be in the future.
-        if (fourMonthsfromNowCalendar.get(Calendar.DAY_OF_MONTH) > 27) {
-            fourMonthsfromNowCalendar.add(Calendar.DAY_OF_MONTH, 4);
+            final HashMap repayment = loanSchedule.get(i);
+
+            final ArrayList<Integer> dueDateAsArray = (ArrayList<Integer>) repayment.get("dueDate");
+            final LocalDate transactionDate = LocalDate.of(dueDateAsArray.get(0), dueDateAsArray.get(1), dueDateAsArray.get(2));
+
+            final Float interestPortion = BigDecimal.valueOf(Double.parseDouble(repayment.get("interestDue").toString()))
+                    .subtract(BigDecimal.valueOf(Double.parseDouble(repayment.get("interestWaived").toString())))
+                    .subtract(BigDecimal.valueOf(Double.parseDouble(repayment.get("interestWrittenOff").toString()))).floatValue();
+
+            final Float feePortion = BigDecimal.valueOf(Double.parseDouble(repayment.get("feeChargesDue").toString()))
+                    .subtract(BigDecimal.valueOf(Double.parseDouble(repayment.get("feeChargesWaived").toString())))
+                    .subtract(BigDecimal.valueOf(Double.parseDouble(repayment.get("feeChargesWrittenOff").toString()))).floatValue();
+
+            final Float penaltyPortion = BigDecimal.valueOf(Double.parseDouble(repayment.get("penaltyChargesDue").toString()))
+                    .subtract(BigDecimal.valueOf(Double.parseDouble(repayment.get("penaltyChargesWaived").toString())))
+                    .subtract(BigDecimal.valueOf(Double.parseDouble(repayment.get("penaltyChargesWrittenOff").toString()))).floatValue();
+
+            LOAN_TRANSACTION_HELPER.checkAccrualTransactionForRepayment(transactionDate, interestPortion, feePortion, penaltyPortion,
+                    loanID);
         }
+    }
 
-        String fourMonthsfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
+    private void testLoanScheduleWithInterestRecalculation_WITH_REST_SAME_AS_REPAYMENT_INTEREST_COMPOUND_NONE_STRATEGY_REDUCE_EMI_PRE_CLOSE_INTEREST(
+            String preCloseInterestStrategy, String preCloseAmount) {
 
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
+        DateFormat dateFormat = new SimpleDateFormat(DATETIME_PATTERN, Locale.US);
+        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
 
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
+        Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -16);
+        final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
 
-        /***
-         * Create loan product with Default STYLE strategy
-         */
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+        final Integer loanProductID = createLoanProductWithInterestRecalculation(LoanProductTestBuilder.DEFAULT_STRATEGY,
+                LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_NONE,
+                LoanProductTestBuilder.RECALCULATION_STRATEGY_REDUCE_EMI_AMOUN,
+                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_SAME_AS_REPAYMENT_PERIOD, "0", null, preCloseInterestStrategy, null,
+                null, null);
 
-        final Account assetAccount = this.accountHelper.createAssetAccount();
-        final Account incomeAccount = this.accountHelper.createIncomeAccount();
-        final Account expenseAccount = this.accountHelper.createExpenseAccount();
-        final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
+        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, LOAN_DISBURSEMENT_DATE, null,
+                LoanApplicationTestBuilder.DEFAULT_STRATEGY, new ArrayList<HashMap>(0));
 
-        final Integer loanProductID = createLoanProduct("0", "0", LoanProductTestBuilder.DEFAULT_STRATEGY, CASH_BASED, assetAccount,
-                incomeAccount, expenseAccount, overpaymentAccount);
-        Assertions.assertNotNull(loanProductID);
-
-        /***
-         * Apply for loan application and verify loan status
-         */
-        final String savingsId = null;
-        final String principal = "12,000.00";
-
-        // Add charges with payment mode regular
-        List<HashMap> charges = new ArrayList<>();
-
-        Integer flatInstallmentFee = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "50", false));
-        addCharges(charges, flatInstallmentFee, "50", null);
-
-        List<HashMap> collaterals = new ArrayList<>();
-
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
-
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
-                String.valueOf(clientID), collateralId);
-        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
-
-        final Integer loanID = applyForLoanApplicationWithPaymentStrategyAndPastMonth(clientID, loanProductID, charges, savingsId,
-                principal, LoanApplicationTestBuilder.DEFAULT_STRATEGY, -4, collaterals);
         Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
 
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        List<Map<String, Object>> expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -9, true, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
         LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan(fourMonthsfromNow, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
         LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
         LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
 
         LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount(fourMonthsfromNow, loanID,
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
                 JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
         LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
 
-        final JournalEntry[] assetAccountInitialEntry = {
-                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.DEBIT) };
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, fourMonthsfromNow, assetAccountInitialEntry);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -9, true, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2551.72", "11.78", "0.0", "0.0");
 
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap firstInstallment = loanSchedule.get(1);
-        validateNumberForEqual("2290", String.valueOf(firstInstallment.get("totalOutstandingForPeriod")));
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
 
-        // Make payment for installment #1
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -9);
+        final String LOAN_FIRST_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
+        Float totalDueForCurrentPeriod = (Float) loanSchedule.get(1).get("totalDueForPeriod");
+        LOAN_TRANSACTION_HELPER.makeRepayment(LOAN_FIRST_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
 
-        fourMonthsfromNowCalendar.add(Calendar.MONTH, 1);
-
-        final String threeMonthsfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
-
-        this.loanTransactionHelper.makeRepayment(threeMonthsfromNow, Float.parseFloat("2290"), loanID);
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        firstInstallment = loanSchedule.get(1);
-        validateNumberForEqual("0.00", String.valueOf(firstInstallment.get("totalOutstandingForPeriod")));
-
-        // Make payment for installment #2
-        fourMonthsfromNowCalendar.add(Calendar.MONTH, 1);
-
-        final String twoMonthsfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
-
-        this.loanTransactionHelper.makeRepayment(twoMonthsfromNow, Float.parseFloat("2290"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, twoMonthsfromNow,
-                new JournalEntry(Float.parseFloat("2290"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("2000"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, twoMonthsfromNow,
-                new JournalEntry(Float.parseFloat("50"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("240"), JournalEntry.TransactionType.CREDIT));
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        Map secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("0.00", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
-
-        // Make payment for installment #3
-        // Pay 2290 more than expected
-        fourMonthsfromNowCalendar.add(Calendar.MONTH, 1);
-
-        final String oneMonthfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
-
-        this.loanTransactionHelper.makeRepayment(oneMonthfromNow, Float.parseFloat("4580"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, oneMonthfromNow,
-                new JournalEntry(Float.parseFloat("4580"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("4000"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, oneMonthfromNow,
-                new JournalEntry(Float.parseFloat("100"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("480"), JournalEntry.TransactionType.CREDIT));
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap thirdInstallment = loanSchedule.get(3);
-        validateNumberForEqual("0.00", String.valueOf(thirdInstallment.get("totalOutstandingForPeriod")));
-
-        // Make refund of 20
-        // max 2290 to refund. Pay 20 means only principal
-        // Default style refund order(principal, interest, fees and penalties
-        // paid: principal 2000, interest 240, fees 50, penalty 0
-        // refund 20 means paid: principal 1980, interest 240, fees 50, penalty
-        // 0
-
-        // FINERACT-885: As loan may not have started exactly four months ago,
-        // make final payment today and not four months from start (as that may be in the future)
-        fourMonthsfromNowCalendar.setTime(Date.from(Utils.getLocalDateOfTenant().atStartOfDay(Utils.getZoneIdOfTenant()).toInstant()));
-        final String now = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
-
-        this.loanTransactionHelper.makeRefundByCash(now, Float.parseFloat("20"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, now,
-                new JournalEntry(Float.parseFloat("20"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("20"), JournalEntry.TransactionType.DEBIT));
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap fourthInstallment = loanSchedule.get(4);
-        validateNumberForEqual("20.00", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
-        validateNumberForEqual("20.00", String.valueOf(fourthInstallment.get("principalOutstanding")));
-        validateNumberForEqual("0.00", String.valueOf(fourthInstallment.get("interestOutstanding")));
-        validateNumberForEqual("0.00", String.valueOf(fourthInstallment.get("feeChargesOutstanding")));
-
-        // Make refund of 2000
-        // max 2270 to refund. Pay 2000 means only principal
-        // paid: principal 1980, interest 240, fees 50, penalty 0
-        // refund 2000 means paid: principal 0, interest 220, fees 50, penalty 0
-
-        this.loanTransactionHelper.makeRefundByCash(now, Float.parseFloat("2000"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, now,
-                new JournalEntry(Float.parseFloat("2000"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("1980"), JournalEntry.TransactionType.DEBIT));
-
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, now,
-                new JournalEntry(Float.parseFloat("20"), JournalEntry.TransactionType.DEBIT));
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        fourthInstallment = loanSchedule.get(4);
-        validateNumberForEqual("2020.00", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
-        validateNumberForEqual("2000.00", String.valueOf(fourthInstallment.get("principalOutstanding")));
-        validateNumberForEqual("20.00", String.valueOf(fourthInstallment.get("interestOutstanding")));
-        validateNumberForEqual("0.00", String.valueOf(fourthInstallment.get("feeChargesOutstanding")));
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -9, true, "2482.76", "46.15", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2528.8", "11.67", "0.0", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
 
+        HashMap prepayDetail = LOAN_TRANSACTION_HELPER.getPrepayAmount(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        String prepayAmount = String.valueOf(prepayDetail.get("amount"));
+        validateNumberForEqualWithMsg("verify pre-close amount", preCloseAmount, prepayAmount);
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        final String loanRepaymentDate = dateFormat.format(todaysDate.getTime());
+        LOAN_TRANSACTION_HELPER.makeRepayment(loanRepaymentDate, Float.parseFloat(prepayAmount), loanID);
+        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
     }
 
-    /***
-     * Test case to verify Default style payment strategy
-     */
-    @Test
-    public void testLoanRefundByCashAccrualBasedAccounting() {
-        this.journalEntryHelper = new JournalEntryHelper(this.requestSpec, this.responseSpec);
+    private void testLoanScheduleWithInterestRecalculation_WITH_REST_WEEKLY_INTEREST_COMPOUND_INTEREST_FEE_STRATEGY_REDUCE_NEXT_INSTALLMENTS_PRE_CLOSE_INTEREST(
+            String preCloseInterestStrategy, String preCloseAmount) {
 
-        Calendar fourMonthsfromNowCalendar = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        fourMonthsfromNowCalendar.add(Calendar.MONTH, -4);
+        DateFormat dateFormat = new SimpleDateFormat(DATETIME_PATTERN, Locale.US);
+        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
 
-        // FINERACT-885: If the loan starts on day 27-31th of month and not all months have that
-        // many days, then loan payment will get reset to a day of month less than today's day
-        // and 4th payment will be in the past. In such case, start the loan a few days later,
-        // so that 4th payment is guaranteed to be in the future.
-        if (fourMonthsfromNowCalendar.get(Calendar.DAY_OF_MONTH) > 27) {
-            fourMonthsfromNowCalendar.add(Calendar.DAY_OF_MONTH, 4);
-        }
+        Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -16);
+        final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -4);
+        Integer restDateOfMonth = getDayOfMonth(todaysDate);
+        Integer restDateOfWeek = getDayOfWeek(todaysDate);
+        final String REST_START_DATE = null;
 
-        String fourMonthsfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        todaysDate.add(Calendar.DAY_OF_MONTH, -16);
+        todaysDate.add(Calendar.DAY_OF_MONTH, 2);
+        final String LOAN_FLAT_CHARGE_DATE = dateFormat.format(todaysDate.getTime());
+        todaysDate.add(Calendar.DAY_OF_MONTH, 14);
+        final String LOAN_INTEREST_CHARGE_DATE = dateFormat.format(todaysDate.getTime());
+        List<HashMap> charges = new ArrayList<>(2);
+        Integer flat = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "100", false));
+        Integer principalPercentage = ChargesHelper.createCharges(REQUEST_SPEC, RESPONSE_SPEC,
+                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_PERCENTAGE_AMOUNT, "2", false));
 
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
+        addCharges(charges, flat, "100", LOAN_FLAT_CHARGE_DATE);
+        addCharges(charges, principalPercentage, "2", LOAN_INTEREST_CHARGE_DATE);
 
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
+        final Integer clientID = ClientHelper.createClient(REQUEST_SPEC, RESPONSE_SPEC);
+        ClientHelper.verifyClientCreatedOnServer(REQUEST_SPEC, RESPONSE_SPEC, clientID);
+        final Integer loanProductID = createLoanProductWithInterestRecalculationAndCompoundingDetails(
+                LoanProductTestBuilder.DEFAULT_STRATEGY, LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_INTEREST_AND_FEE,
+                LoanProductTestBuilder.RECALCULATION_STRATEGY_RESCHEDULE_NEXT_REPAYMENTS,
+                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_WEEKLY, "1", REST_START_DATE,
+                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_SAME_AS_REPAYMENT_PERIOD, null, null, preCloseInterestStrategy, null,
+                null, null, restDateOfMonth, restDateOfWeek);
 
-        /***
-         * Create loan product with Default STYLE strategy
-         */
+        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, LOAN_DISBURSEMENT_DATE,
+                REST_START_DATE, LoanApplicationTestBuilder.DEFAULT_STRATEGY, charges);
 
-        final Account assetAccount = this.accountHelper.createAssetAccount();
-        final Account incomeAccount = this.accountHelper.createIncomeAccount();
-        final Account expenseAccount = this.accountHelper.createExpenseAccount();
-        final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
-
-        final Integer loanProductID = createLoanProduct("0", "0", LoanProductTestBuilder.DEFAULT_STRATEGY, ACCRUAL_UPFRONT, assetAccount,
-                incomeAccount, expenseAccount, overpaymentAccount);// ,
-        // LoanProductTestBuilder.EQUAL_INSTALLMENTS,
-        // LoanProductTestBuilder.FLAT_BALANCE);
-        Assertions.assertNotNull(loanProductID);
-
-        /***
-         * Apply for loan application and verify loan status
-         */
-        final String savingsId = null;
-        final String principal = "12,000.00";
-
-        // Add charges with payment mode regular
-        List<HashMap> charges = new ArrayList<>();
-
-        Integer flatInstallmentFee = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "50", false));
-        addCharges(charges, flatInstallmentFee, "50", null);
-
-        List<HashMap> collaterals = new ArrayList<>();
-
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
-        Assertions.assertNotNull(collateralId);
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
-                String.valueOf(clientID), collateralId);
-        Assertions.assertNotNull(clientCollateralId);
-        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
-
-        final Integer loanID = applyForLoanApplicationWithPaymentStrategyAndPastMonth(clientID, loanProductID, charges, savingsId,
-                principal, LoanApplicationTestBuilder.DEFAULT_STRATEGY, -4, collaterals);
         Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
+        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
         LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
 
+        ArrayList<HashMap> loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        List<Map<String, Object>> expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -9, true, "2482.76", "46.15", "100.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "200", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
+
         LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan(fourMonthsfromNow, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
         LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
         LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
 
         LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount(fourMonthsfromNow, loanID,
+        String loanDetails = LOAN_TRANSACTION_HELPER.getLoanDetails(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        loanStatusHashMap = LOAN_TRANSACTION_HELPER.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
                 JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
         LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
 
-        final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(Float.parseFloat("1440"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("300.00"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.DEBIT) };
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, fourMonthsfromNow, assetAccountInitialEntry);
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -9, true, "2482.76", "46.15", "100.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.08", "46.83", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2481.87", "47.04", "200", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2553.29", "11.78", "0.0", "0.0");
 
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap firstInstallment = loanSchedule.get(1);
-        validateNumberForEqual("2290", String.valueOf(firstInstallment.get("totalOutstandingForPeriod")));
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
 
-        // Make payment for installment #1
+        Calendar repaymentDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        repaymentDate.add(Calendar.DAY_OF_MONTH, -9);
+        final String LOAN_FIRST_REPAYMENT_DATE = dateFormat.format(repaymentDate.getTime());
+        Float totalDueForCurrentPeriod = (Float) loanSchedule.get(1).get("totalDueForPeriod");
+        LOAN_TRANSACTION_HELPER.makeRepayment(LOAN_FIRST_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
 
-        fourMonthsfromNowCalendar.add(Calendar.MONTH, 1);
-
-        final String threeMonthsfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
-
-        this.loanTransactionHelper.makeRepayment(threeMonthsfromNow, Float.parseFloat("2290"), loanID);
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        firstInstallment = loanSchedule.get(1);
-        validateNumberForEqual("0.00", String.valueOf(firstInstallment.get("totalOutstandingForPeriod")));
-
-        // Make payment for installment #2
-        fourMonthsfromNowCalendar.add(Calendar.MONTH, 1);
-
-        final String twoMonthsfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
-
-        this.loanTransactionHelper.makeRepayment(twoMonthsfromNow, Float.parseFloat("2290"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, twoMonthsfromNow,
-                new JournalEntry(Float.parseFloat("2290"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("2290"), JournalEntry.TransactionType.CREDIT));
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        Map secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("0.00", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
-
-        // Make payment for installment #3
-        // Pay 2290 more than expected
-        fourMonthsfromNowCalendar.add(Calendar.MONTH, 1);
-
-        final String oneMonthfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
-
-        this.loanTransactionHelper.makeRepayment(oneMonthfromNow, Float.parseFloat("4580"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, oneMonthfromNow,
-                new JournalEntry(Float.parseFloat("4580"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("4580"), JournalEntry.TransactionType.CREDIT));
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap thirdInstallment = loanSchedule.get(3);
-        validateNumberForEqual("0.00", String.valueOf(thirdInstallment.get("totalOutstandingForPeriod")));
-
-        // Make refund of 20
-        // max 2290 to refund. Pay 20 means only principal
-        // Default style refund order(principal, interest, fees and penalties
-        // paid: principal 2000, interest 240, fees 50, penalty 0
-        // refund 20 means paid: principal 1980, interest 240, fees 50, penalty
-        // 0
-
-        // FINERACT-885: As loan may not have started exactly four months ago,
-        // make final payment today and not four months from start (as that may be in the future)
-        fourMonthsfromNowCalendar.setTime(Date.from(Utils.getLocalDateOfTenant().atStartOfDay(Utils.getZoneIdOfTenant()).toInstant()));
-        final String now = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
-
-        this.loanTransactionHelper.makeRefundByCash(now, Float.parseFloat("20"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, now,
-                new JournalEntry(Float.parseFloat("20"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("20"), JournalEntry.TransactionType.DEBIT));
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap fourthInstallment = loanSchedule.get(4);
-        validateNumberForEqual("20.00", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
-        validateNumberForEqual("20.00", String.valueOf(fourthInstallment.get("principalOutstanding")));
-        validateNumberForEqual("0.00", String.valueOf(fourthInstallment.get("interestOutstanding")));
-        validateNumberForEqual("0.00", String.valueOf(fourthInstallment.get("feeChargesOutstanding")));
-
-        // Make refund of 2000
-        // max 2270 to refund. Pay 2000 means only principal
-        // paid: principal 1980, interest 240, fees 50, penalty 0
-        // refund 2000 means paid: principal 0, interest 220, fees 50, penalty 0
-
-        this.loanTransactionHelper.makeRefundByCash(now, Float.parseFloat("2000"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, now,
-                new JournalEntry(Float.parseFloat("2000"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("1980"), JournalEntry.TransactionType.DEBIT));
-
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, now,
-                new JournalEntry(Float.parseFloat("20"), JournalEntry.TransactionType.DEBIT));
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        fourthInstallment = loanSchedule.get(4);
-        validateNumberForEqual("2020.00", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
-        validateNumberForEqual("2000.00", String.valueOf(fourthInstallment.get("principalOutstanding")));
-        validateNumberForEqual("20.00", String.valueOf(fourthInstallment.get("interestOutstanding")));
-        validateNumberForEqual("0.00", String.valueOf(fourthInstallment.get("feeChargesOutstanding")));
+        loanSchedule = LOAN_TRANSACTION_HELPER.getLoanRepaymentSchedule(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        expectedvalues = new ArrayList<>();
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        addRepaymentValues(expectedvalues, todaysDate, -9, true, "2482.76", "46.15", "100.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.05", "34.86", "200", "0.0");
+        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2528.97", "11.67", "0.0", "0.0");
+        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
 
+        HashMap prepayDetail = LOAN_TRANSACTION_HELPER.getPrepayAmount(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        String prepayAmount = String.valueOf(prepayDetail.get("amount"));
+        validateNumberForEqualWithMsg("verify pre-close amount", preCloseAmount, prepayAmount);
+        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
+        final String loanRepaymentDate = dateFormat.format(todaysDate.getTime());
+        LOAN_TRANSACTION_HELPER.makeRepayment(loanRepaymentDate, Float.parseFloat(prepayAmount), loanID);
+        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(REQUEST_SPEC, RESPONSE_SPEC, loanID);
+        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
     }
 
-    @Test
-    public void testLoanRefundByTransferCashBasedAccounting() {
-        this.journalEntryHelper = new JournalEntryHelper(this.requestSpec, this.responseSpec);
-        this.savingsAccountHelper = new SavingsAccountHelper(this.requestSpec, this.responseSpec);
-        this.accountTransferHelper = new AccountTransferHelper(this.requestSpec, this.responseSpec);
-
-        Calendar fourMonthsfromNowCalendar = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        fourMonthsfromNowCalendar.add(Calendar.MONTH, -4);
-
-        // FINERACT-885: If the loan starts on day 27-31th of month and not all months have that
-        // many days, then loan payment will get reset to a day of month less than today's day
-        // and 4th payment will be in the past. In such case, start the loan a few days later,
-        // so that 4th payment is guaranteed to be in the future.
-        if (fourMonthsfromNowCalendar.get(Calendar.DAY_OF_MONTH) > 27) {
-            fourMonthsfromNowCalendar.add(Calendar.DAY_OF_MONTH, 4);
-        }
-
-        String fourMonthsfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
-
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-
-        final Integer savingsProductID = createSavingsProduct(this.requestSpec, this.responseSpec, MINIMUM_OPENING_BALANCE);
-        Assertions.assertNotNull(savingsProductID);
-
-        final Integer savingsId = this.savingsAccountHelper.applyForSavingsApplication(clientID, savingsProductID, ACCOUNT_TYPE_INDIVIDUAL);
-        Assertions.assertNotNull(savingsProductID);
-
-        HashMap modifications = this.savingsAccountHelper.updateSavingsAccount(clientID, savingsProductID, savingsId,
-                ACCOUNT_TYPE_INDIVIDUAL);
-        assertTrue(modifications.containsKey("submittedOnDate"));
-
-        HashMap savingsStatusHashMap = SavingsStatusChecker.getStatusOfSavings(this.requestSpec, this.responseSpec, savingsId);
-        SavingsStatusChecker.verifySavingsIsPending(savingsStatusHashMap);
-
-        savingsStatusHashMap = this.savingsAccountHelper.approveSavings(savingsId);
-        SavingsStatusChecker.verifySavingsIsApproved(savingsStatusHashMap);
-
-        savingsStatusHashMap = this.savingsAccountHelper.activateSavings(savingsId);
-        SavingsStatusChecker.verifySavingsIsActive(savingsStatusHashMap);
-
-        /***
-         * Create loan product with Default STYLE strategy
-         */
-
-        final Account assetAccount = this.accountHelper.createAssetAccount();
-        final Account incomeAccount = this.accountHelper.createIncomeAccount();
-        final Account expenseAccount = this.accountHelper.createExpenseAccount();
-        final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
-
-        final Integer loanProductID = createLoanProduct("0", "0", LoanProductTestBuilder.DEFAULT_STRATEGY, CASH_BASED, assetAccount,
-                incomeAccount, expenseAccount, overpaymentAccount);
-        Assertions.assertNotNull(loanProductID);
-
-        /***
-         * Apply for loan application and verify loan status
-         */
-
-        final String principal = "12,000.00";
-
-        // Add charges with payment mode regular
-        List<HashMap> charges = new ArrayList<>();
-
-        Integer flatInstallmentFee = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "50", false));
-        addCharges(charges, flatInstallmentFee, "50", null);
-
-        List<HashMap> collaterals = new ArrayList<>();
-
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
-        Assertions.assertNotNull(collateralId);
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
-                clientID.toString(), collateralId);
-        Assertions.assertNotNull(clientCollateralId);
-        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
-
-        final Integer loanID = applyForLoanApplicationWithPaymentStrategyAndPastMonth(clientID, loanProductID, charges, null, principal,
-                LoanApplicationTestBuilder.DEFAULT_STRATEGY, -4, collaterals);
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan(fourMonthsfromNow, loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount(fourMonthsfromNow, loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        final JournalEntry[] assetAccountInitialEntry = {
-                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("12000.00"), JournalEntry.TransactionType.DEBIT) };
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, fourMonthsfromNow, assetAccountInitialEntry);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap firstInstallment = loanSchedule.get(1);
-        validateNumberForEqual("2290", String.valueOf(firstInstallment.get("totalOutstandingForPeriod")));
-
-        // Make payment for installment #1
-
-        fourMonthsfromNowCalendar.add(Calendar.MONTH, 1);
-
-        final String threeMonthsfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
-
-        this.loanTransactionHelper.makeRepayment(threeMonthsfromNow, Float.parseFloat("2290"), loanID);
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        firstInstallment = loanSchedule.get(1);
-        validateNumberForEqual("0.00", String.valueOf(firstInstallment.get("totalOutstandingForPeriod")));
-
-        // Make payment for installment #2
-        fourMonthsfromNowCalendar.add(Calendar.MONTH, 1);
-
-        final String twoMonthsfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
-
-        this.loanTransactionHelper.makeRepayment(twoMonthsfromNow, Float.parseFloat("2290"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, twoMonthsfromNow,
-                new JournalEntry(Float.parseFloat("2290"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("2000"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, twoMonthsfromNow,
-                new JournalEntry(Float.parseFloat("50"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("240"), JournalEntry.TransactionType.CREDIT));
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        Map secondInstallment = loanSchedule.get(2);
-        validateNumberForEqual("0.00", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
-
-        // Make payment for installment #3
-        // Pay 2290 more than expected
-        fourMonthsfromNowCalendar.add(Calendar.MONTH, 1);
-
-        final String oneMonthfromNow = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
-
-        this.loanTransactionHelper.makeRepayment(oneMonthfromNow, Float.parseFloat("4580"), loanID);
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, oneMonthfromNow,
-                new JournalEntry(Float.parseFloat("4580"), JournalEntry.TransactionType.DEBIT),
-                new JournalEntry(Float.parseFloat("4000"), JournalEntry.TransactionType.CREDIT));
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, oneMonthfromNow,
-                new JournalEntry(Float.parseFloat("100"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("480"), JournalEntry.TransactionType.CREDIT));
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap thirdInstallment = loanSchedule.get(3);
-        validateNumberForEqual("0.00", String.valueOf(thirdInstallment.get("totalOutstandingForPeriod")));
-
-        // Make refund of 20
-        // max 2290 to refund. Pay 20 means only principal
-        // Default style refund order(principal, interest, fees and penalties
-        // paid: principal 2000, interest 240, fees 50, penalty 0
-        // refund 20 means paid: principal 1980, interest 240, fees 50, penalty
-        // 0
-
-        Float transferAmountValue = 20f;
-
-        // FINERACT-885: As loan may not have started exactly four months ago,
-        // make final payment today and not four months from start (as that may be in the future)
-        fourMonthsfromNowCalendar.setTime(Date.from(Utils.getLocalDateOfTenant().atStartOfDay(Utils.getZoneIdOfTenant()).toInstant()));
-        final String now = Utils.convertDateToURLFormat(fourMonthsfromNowCalendar);
-
-        final String FROM_LOAN_ACCOUNT_TYPE = "1";
-        final String TO_SAVINGS_ACCOUNT_TYPE = "2";
-
-        this.accountTransferHelper.refundLoanByTransfer(now, clientID, loanID, clientID, savingsId, FROM_LOAN_ACCOUNT_TYPE,
-                TO_SAVINGS_ACCOUNT_TYPE, transferAmountValue.toString());
-
-        Float toSavingsBalance = Float.parseFloat(MINIMUM_OPENING_BALANCE);
-
-        HashMap toSavingsSummaryAfter = this.savingsAccountHelper.getSavingsSummary(savingsId);
-
-        toSavingsBalance += transferAmountValue;
-
-        // Verifying toSavings Account Balance after Account Transfer
-        assertEquals(toSavingsBalance, toSavingsSummaryAfter.get("accountBalance"),
-                "Verifying From Savings Account Balance after Account Transfer");
-
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, now,
-                new JournalEntry(Float.parseFloat("20"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("20"), JournalEntry.TransactionType.DEBIT));
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        HashMap fourthInstallment = loanSchedule.get(4);
-        validateNumberForEqual("20.00", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
-        validateNumberForEqual("20.00", String.valueOf(fourthInstallment.get("principalOutstanding")));
-        validateNumberForEqual("0.00", String.valueOf(fourthInstallment.get("interestOutstanding")));
-        validateNumberForEqual("0.00", String.valueOf(fourthInstallment.get("feeChargesOutstanding")));
-
-        // Make refund of 2000
-        // max 2270 to refund. Pay 2000 means only principal
-        // paid: principal 1980, interest 240, fees 50, penalty 0
-        // refund 2000 means paid: principal 0, interest 220, fees 50, penalty 0
-        // final String now = Utils.convertDate(fourMonthsfromNowCalendar);
-
-        transferAmountValue = 2000f;
-
-        this.accountTransferHelper.refundLoanByTransfer(now, clientID, loanID, clientID, savingsId, FROM_LOAN_ACCOUNT_TYPE,
-                TO_SAVINGS_ACCOUNT_TYPE, transferAmountValue.toString());
-
-        toSavingsSummaryAfter = this.savingsAccountHelper.getSavingsSummary(savingsId);
-
-        toSavingsBalance += transferAmountValue;
-
-        // Verifying toSavings Account Balance after Account Transfer
-        assertEquals(toSavingsBalance, toSavingsSummaryAfter.get("accountBalance"),
-                "Verifying From Savings Account Balance after Account Transfer");
-
-        this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, now,
-                new JournalEntry(Float.parseFloat("2000"), JournalEntry.TransactionType.CREDIT),
-                new JournalEntry(Float.parseFloat("1980"), JournalEntry.TransactionType.DEBIT));
-
-        this.journalEntryHelper.checkJournalEntryForIncomeAccount(incomeAccount, now,
-                new JournalEntry(Float.parseFloat("20"), JournalEntry.TransactionType.DEBIT));
-
-        loanSchedule.clear();
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        fourthInstallment = loanSchedule.get(4);
-        validateNumberForEqual("2020.00", String.valueOf(fourthInstallment.get("totalOutstandingForPeriod")));
-        validateNumberForEqual("2000.00", String.valueOf(fourthInstallment.get("principalOutstanding")));
-        validateNumberForEqual("20.00", String.valueOf(fourthInstallment.get("interestOutstanding")));
-        validateNumberForEqual("0.00", String.valueOf(fourthInstallment.get("feeChargesOutstanding")));
-
-    }
-
-    private Integer createSavingsProduct(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
-            final String minOpenningBalance) {
+    private Integer createSavingsProduct(final String minOpenningBalance) {
         LOG.info("------------------------------CREATING NEW SAVINGS PRODUCT ---------------------------------------");
         SavingsProductHelper savingsProductHelper = new SavingsProductHelper();
 
@@ -5613,2358 +8010,100 @@ public class ClientLoanIntegrationTest {
                 .withInterestCalculationPeriodTypeAsDailyBalance()
 
                 .withMinimumOpenningBalance(minOpenningBalance).build();
-        return SavingsProductHelper.createSavingsProduct(savingsProductJSON, requestSpec, responseSpec);
+        return SavingsProductHelper.createSavingsProduct(savingsProductJSON, REQUEST_SPEC, RESPONSE_SPEC);
     }
 
-    @Test
-    public void testLoanProductConfiguration() {
-        final String proposedAmount = "5000";
-        JsonObject loanProductConfigurationAsTrue = new JsonObject();
-        loanProductConfigurationAsTrue = this.createLoanProductConfigurationDetail(loanProductConfigurationAsTrue, true);
-
-        JsonObject loanProductConfigurationAsFalse = new JsonObject();
-        loanProductConfigurationAsFalse = this.createLoanProductConfigurationDetail(loanProductConfigurationAsFalse, false);
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec, "01 January 2012");
-        Integer loanProductID = this.loanTransactionHelper
-                .getLoanProductId(new LoanProductTestBuilder().withAmortizationTypeAsEqualInstallments().withRepaymentTypeAsMonth()
-                        .withRepaymentAfterEvery("1").withRepaymentStrategy(LoanProductTestBuilder.DEFAULT_STRATEGY)
-                        .withInterestTypeAsDecliningBalance().withInterestCalculationPeriodTypeAsDays().withInArrearsTolerance("10")
-                        .withMoratorium("2", "3").withLoanProductConfiguration(loanProductConfigurationAsTrue).build(null));
-        LOG.info("-----------------------LOAN PRODUCT CREATED WITH ATTRIBUTE CONFIGURATION AS TRUE-------------------------- {}",
-                loanProductID);
-        Integer loanID = applyForLoanApplicationWithProductConfigurationAsTrue(clientID, loanProductID, proposedAmount);
-        LOG.info("------------------------LOAN CREATED WITH ID------------------------------{}", loanID);
-
-        loanProductID = this.loanTransactionHelper.getLoanProductId(new LoanProductTestBuilder().withAmortizationTypeAsEqualInstallments()
-                .withRepaymentTypeAsMonth().withRepaymentAfterEvery("1").withRepaymentStrategy(LoanProductTestBuilder.DEFAULT_STRATEGY)
-                .withInterestTypeAsDecliningBalance().withInterestCalculationPeriodTypeAsDays().withInArrearsTolerance("10")
-                .withMoratorium("2", "3").withLoanProductConfiguration(loanProductConfigurationAsFalse).build(null));
-        LOG.info("-------------------LOAN PRODUCT CREATED WITH ATTRIBUTE CONFIGURATION AS FALSE---------------------- {}", loanProductID);
-        /*
-         * Try to override attribute values in loan account when attribute configurations are set to false at product
-         * level
-         */
-        loanID = applyForLoanApplicationWithProductConfigurationAsFalse(clientID, loanProductID, proposedAmount);
-        LOG.info("--------------------------LOAN CREATED WITH ID------------------------- {}", loanID);
-        this.validateIfValuesAreNotOverridden(loanID, loanProductID);
+    private PostLoansResponse applyForLoanApplicationForOnePeriod30DaysLongNoInterestPeriodicAccrual(Integer clientId, Long loanProductId,
+            String loanDisbursementDate, String repaymentStrategyCode) {
+        return LOAN_TRANSACTION_HELPER.applyLoan(new PostLoansRequest().clientId(clientId.longValue()).productId(loanProductId)
+                .expectedDisbursementDate(loanDisbursementDate).dateFormat(DATETIME_PATTERN)
+                .transactionProcessingStrategyCode(repaymentStrategyCode).locale("en").submittedOnDate(loanDisbursementDate)
+                .amortizationType(1).interestRatePerPeriod(0).interestCalculationPeriodType(1).interestType(0).repaymentFrequencyType(0)
+                .repaymentEvery(30).repaymentFrequencyType(0).numberOfRepayments(1).loanTermFrequency(30).loanTermFrequencyType(0)
+                .principal(BigDecimal.valueOf(1000.0)).loanType("individual"));
     }
 
-    /**
-     * Test case to verify Loan Foreclosure.
-     */
-    @Test
-    public void testLoanForeclosure() {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-        final Integer loanProductID = createLoanProduct(false, NONE);
-
-        List<HashMap> charges = new ArrayList<>();
-
-        Integer flatAmountChargeOne = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "50", false));
-        addCharges(charges, flatAmountChargeOne, "50", "01 October 2011");
-        Integer flatAmountChargeTwo = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "100", true));
-        addCharges(charges, flatAmountChargeTwo, "100", "15 December 2011");
-
-        List<HashMap> collaterals = new ArrayList<>();
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
-        Assertions.assertNotNull(collateralId);
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
-                String.valueOf(clientID), collateralId);
-        Assertions.assertNotNull(clientCollateralId);
-        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
-
-        final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges, null, "10,000.00", collaterals);
-        Assertions.assertNotNull(loanID);
-
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        LOG.info("----------------------------------- APPROVE LOAN -----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan("20 September 2011", loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("----------------------------------- DISBURSE LOAN ----------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("20 September 2011", loanID, "10,000.00",
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LOG.info("DISBURSE {}", loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        LOG.info("---------------------------------- Make repayment 1 --------------------------------------");
-        this.loanTransactionHelper.makeRepayment("20 October 2011", Float.parseFloat("2676.24"), loanID);
-
-        LOG.info("---------------------------------- FORECLOSE LOAN ----------------------------------------");
-        this.loanTransactionHelper.forecloseLoan("08 November 2011", loanID);
-
-        // retrieving the loan status
-        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        // verifying the loan status is closed
-        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
-        // retrieving the loan sub-status
-        loanStatusHashMap = LoanStatusChecker.getSubStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        // verifying the loan sub-status is foreclosed
-        LoanStatusChecker.verifyLoanAccountForeclosed(loanStatusHashMap);
-
-    }
-
-    @Test
-    public void testLoanScheduleWithInterestRecalculation_WITH_INTEREST_FIRST_STRATEGY_AND_REST_DAILY_INTEREST_COMPOUND_INTEREST_STRATEGY_REDUCE_NUMBER_OF_INSTALLMENTS() {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-
-        DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US);
-        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
-
-        Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -14);
-        final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
-        Integer dayOfWeek = getDayOfWeek(todaysDate);
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-        final Integer loanProductID = createLoanProductWithInterestRecalculationAndCompoundingDetails(
-                LoanProductTestBuilder.INTEREST_PRINCIPAL_PENALTIES_FEES_ORDER_STRATEGY,
-                LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_INTEREST,
-                LoanProductTestBuilder.RECALCULATION_STRATEGY_REDUCE_NUMBER_OF_INSTALLMENTS,
-                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_DAILY, "1", LOAN_DISBURSEMENT_DATE,
-                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_WEEKLY, "1", LOAN_DISBURSEMENT_DATE,
-                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, null, null, dayOfWeek, null, dayOfWeek);
-
-        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, LOAN_DISBURSEMENT_DATE,
-                LoanApplicationTestBuilder.INTEREST_PRINCIPAL_PENALTIES_FEES_ORDER_STRATEGY, new ArrayList<HashMap>(0));
-
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        List<Map<String, Object>> expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
-
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.54", "46.37", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.67", "23.24", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2529.03", "11.67", "0.0", "0.0");
-
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        loanSchedule = this.loanTransactionHelper.getLoanFutureRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, 0, false, "4965.3", "92.52", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.67", "23.24", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2529.03", "11.67", "0.0", "0.0");
-
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues, 0);
-
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -7);
-        final String LOAN_FIRST_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
-        Float totalDueForCurrentPeriod = (Float) loanSchedule.get(1).get("totalDueForPeriod");
-        this.loanTransactionHelper.makeRepayment(LOAN_FIRST_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        Float earlyPayment = Float.parseFloat("4000");
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -5);
-        final String LOAN_SECOND_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
-        this.loanTransactionHelper.makeRepayment(LOAN_SECOND_REPAYMENT_DATE, earlyPayment, loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        Calendar today = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        Map<String, Object> paymentday = new HashMap<>(3);
-        paymentday.put("dueDate", getDateAsArray(today, -5, Calendar.DAY_OF_MONTH));
-        paymentday.put("principalDue", "3990.09");
-        paymentday.put("interestDue", "9.91");
-        paymentday.put("feeChargesDue", "0");
-        paymentday.put("penaltyChargesDue", "0");
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
-        expectedvalues.add(paymentday);
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.31", "11.6", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "1009.84", "4.66", "0.0", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        HashMap prepayDetail = this.loanTransactionHelper.getPrepayAmount(this.requestSpec, this.responseSpec, loanID);
-        String prepayAmount = String.valueOf(prepayDetail.get("amount"));
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        final String loanRepaymentDate = dateFormat.format(todaysDate.getTime());
-        this.loanTransactionHelper.makeRepayment(loanRepaymentDate, Float.parseFloat(prepayAmount), loanID);
-        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
-
-    }
-
-    @Test
-    public void testLoanScheduleWithInterestRecalculation_WITH_INTEREST_FIRST_STRATEGY_AND_REST_DAILY_INTEREST_COMPOUND_INTEREST_STRATEGY_REDUCE_NUMBER_OF_INSTALLMENTS_EARLY_REPAYMENT() {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-
-        DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US);
-        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
-
-        Calendar todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -14);
-        final String LOAN_DISBURSEMENT_DATE = dateFormat.format(todaysDate.getTime());
-        Integer dayOfWeek = getDayOfWeek(todaysDate);
-
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-        final Integer loanProductID = createLoanProductWithInterestRecalculationAndCompoundingDetails(
-                LoanProductTestBuilder.INTEREST_PRINCIPAL_PENALTIES_FEES_ORDER_STRATEGY,
-                LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_INTEREST,
-                LoanProductTestBuilder.RECALCULATION_STRATEGY_REDUCE_NUMBER_OF_INSTALLMENTS,
-                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_DAILY, "1", LOAN_DISBURSEMENT_DATE,
-                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_WEEKLY, "1", LOAN_DISBURSEMENT_DATE,
-                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, null, null, dayOfWeek, null, dayOfWeek);
-
-        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, LOAN_DISBURSEMENT_DATE,
-                LoanApplicationTestBuilder.INTEREST_PRINCIPAL_PENALTIES_FEES_ORDER_STRATEGY, new ArrayList<HashMap>(0));
-
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        List<Map<String, Object>> expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
-
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan(LOAN_DISBURSEMENT_DATE, loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount(LOAN_DISBURSEMENT_DATE, loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2482.54", "46.37", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.67", "23.24", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2529.03", "11.67", "0.0", "0.0");
-
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        loanSchedule = this.loanTransactionHelper.getLoanFutureRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, 0, false, "4965.3", "92.52", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.67", "23.24", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2529.03", "11.67", "0.0", "0.0");
-
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues, 0);
-
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -7);
-        final String LOAN_FIRST_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
-        Float totalDueForCurrentPeriod = (Float) loanSchedule.get(1).get("totalDueForPeriod");
-        this.loanTransactionHelper.makeRepayment(LOAN_FIRST_REPAYMENT_DATE, totalDueForCurrentPeriod, loanID);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2494.22", "34.69", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2505.73", "23.18", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2517.29", "11.62", "0.0", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        // early repayment - pay exact due amount 2 days before due date
-        Float earlyPayment = Float.parseFloat("2528.91");
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        todaysDate.add(Calendar.DAY_OF_MONTH, -2);
-        final String LOAN_SECOND_REPAYMENT_DATE = dateFormat.format(todaysDate.getTime());
-        this.loanTransactionHelper.makeRepayment(LOAN_SECOND_REPAYMENT_DATE, earlyPayment, loanID);
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        expectedvalues = new ArrayList<>();
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        Calendar today = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        addRepaymentValues(expectedvalues, todaysDate, -1, false, "2482.76", "46.15", "0.0", "0.0");
-        // early-repayment
-        addRepaymentValues(expectedvalues, todaysDate, 5, true, "2504.13", "24.78", "0.0", "0.0");
-
-        addRepaymentValues(expectedvalues, todaysDate, 2, true, "2522.33", "6.58", "0.0", "0.0");
-        addRepaymentValues(expectedvalues, todaysDate, 1, false, "2490.78", "11.5", "0.0", "0.0");
-        verifyLoanRepaymentSchedule(loanSchedule, expectedvalues);
-
-        HashMap prepayDetail = this.loanTransactionHelper.getPrepayAmount(this.requestSpec, this.responseSpec, loanID);
-        String prepayAmount = String.valueOf(prepayDetail.get("amount"));
-        todaysDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        final String loanRepaymentDate = dateFormat.format(todaysDate.getTime());
-        this.loanTransactionHelper.makeRepayment(loanRepaymentDate, Float.parseFloat(prepayAmount), loanID);
-        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
-
-    }
-
-    @Test
-    public void testLoanScheduleWithInterestRecalculationMakePrepaymentAfterRepayment() {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-        DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US);
-        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
-        GlobalConfigurationHelper.updateEnabledFlagForGlobalConfiguration(this.requestSpec, this.responseSpec, "42", true);
-        Calendar startDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        Calendar currentDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        startDate.add(Calendar.MONTH, -8);
-
-        Calendar firstRepaymentDate = (Calendar) startDate.clone();
-        firstRepaymentDate.add(Calendar.MONTH, 1);
-        firstRepaymentDate.add(Calendar.DAY_OF_MONTH, firstRepaymentDate.getActualMaximum(Calendar.DAY_OF_MONTH) - Calendar.DAY_OF_MONTH);
-        String firstRepayment = dateFormat.format(firstRepaymentDate.getTime());
-
-        final String loanDisbursementDate = dateFormat.format(startDate.getTime());
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-        final Integer loanProductID = createLoanProductWithInterestRecalculationAndCompoundingDetails(
-                LoanProductTestBuilder.INTEREST_PRINCIPAL_PENALTIES_FEES_ORDER_STRATEGY,
-                LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_NONE,
-                LoanProductTestBuilder.RECALCULATION_STRATEGY_REDUCE_NUMBER_OF_INSTALLMENTS,
-                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_SAME_AS_REPAYMENT_PERIOD,
-                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, null, "12");
-
-        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, loanDisbursementDate,
-                LoanApplicationTestBuilder.INTEREST_PRINCIPAL_PENALTIES_FEES_ORDER_STRATEGY, firstRepayment);
-
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan(loanDisbursementDate, loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount(loanDisbursementDate, loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        Assertions.assertNotNull(loanSchedule);
-        startDate.add(Calendar.DAY_OF_MONTH, 2);
-        String loanFirstRepaymentDate = dateFormat.format(startDate.getTime());
-        //
-        Float earlyPayment = Float.parseFloat("3000");
-        this.loanTransactionHelper.makeRepayment(loanFirstRepaymentDate, earlyPayment, loanID);
-
-        HashMap prepayDetail = this.loanTransactionHelper.getPrepayAmount(this.requestSpec, this.responseSpec, loanID);
-        String prepayAmount = String.valueOf(prepayDetail.get("amount"));
-        String loanPrepaymentDate = dateFormat.format(currentDate.getTime());
-        this.loanTransactionHelper.makeRepayment(loanPrepaymentDate, Float.parseFloat(prepayAmount), loanID);
-        loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanAccountIsClosed(loanStatusHashMap);
-        GlobalConfigurationHelper.updateEnabledFlagForGlobalConfiguration(this.requestSpec, this.responseSpec, "42", false);
-    }
-
-    @Test
-    public void testLoanScheduleWithInterestRecalculationMakeAdvancePaymentTillSettlement() {
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-        final ResponseSpecification errorResponse = new ResponseSpecBuilder().expectStatusCode(403).build();
-        final LoanTransactionHelper validationErrorHelper = new LoanTransactionHelper(this.requestSpec, errorResponse);
-        DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy", Locale.US);
-        dateFormat.setTimeZone(Utils.getTimeZoneOfTenant());
-        GlobalConfigurationHelper.updateEnabledFlagForGlobalConfiguration(this.requestSpec, this.responseSpec, "42", true);
-        Calendar startDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        Calendar currentDate = Calendar.getInstance(Utils.getTimeZoneOfTenant());
-        startDate.add(Calendar.MONTH, -8);
-
-        Calendar firstRepaymentDate = (Calendar) startDate.clone();
-        firstRepaymentDate.add(Calendar.MONTH, 1);
-        firstRepaymentDate.add(Calendar.DAY_OF_MONTH, firstRepaymentDate.getActualMaximum(Calendar.DAY_OF_MONTH) - Calendar.DAY_OF_MONTH);
-        String firstRepayment = dateFormat.format(firstRepaymentDate.getTime());
-
-        final String loanDisbursementDate = dateFormat.format(startDate.getTime());
-        final Integer clientID = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientID);
-        final Integer loanProductID = createLoanProductWithInterestRecalculationAndCompoundingDetails(
-                LoanProductTestBuilder.INTEREST_PRINCIPAL_PENALTIES_FEES_ORDER_STRATEGY,
-                LoanProductTestBuilder.RECALCULATION_COMPOUNDING_METHOD_NONE,
-                LoanProductTestBuilder.RECALCULATION_STRATEGY_REDUCE_NUMBER_OF_INSTALLMENTS,
-                LoanProductTestBuilder.RECALCULATION_FREQUENCY_TYPE_SAME_AS_REPAYMENT_PERIOD,
-                LoanProductTestBuilder.INTEREST_APPLICABLE_STRATEGY_ON_PRE_CLOSE_DATE, null, "12");
-
-        final Integer loanID = applyForLoanApplicationForInterestRecalculation(clientID, loanProductID, loanDisbursementDate,
-                LoanApplicationTestBuilder.INTEREST_PRINCIPAL_PENALTIES_FEES_ORDER_STRATEGY, firstRepayment);
-
-        Assertions.assertNotNull(loanID);
-        HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(this.requestSpec, this.responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        LOG.info("-----------------------------------APPROVE LOAN-----------------------------------------");
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan(loanDisbursementDate, loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        LOG.info("-------------------------------DISBURSE LOAN-------------------------------------------");
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount(loanDisbursementDate, loanID,
-                JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
-        Assertions.assertNotNull(loanSchedule);
-        Calendar repaymentDate = (Calendar) firstRepaymentDate.clone();
-        startDate.add(Calendar.DAY_OF_MONTH, 2);
-        String loanFirstRepaymentDate = dateFormat.format(startDate.getTime());
-        //
-        Float earlyPayment = Float.parseFloat("3000");
-        String retrieveDueDate = null;
-        Float amount = null;
-        this.loanTransactionHelper.makeRepayment(loanFirstRepaymentDate, earlyPayment, loanID);
-        for (int i = 1; i < loanSchedule.size(); i++) {
-
-            retrieveDueDate = dateFormat.format(repaymentDate.getTime());
-            amount = (Float) loanSchedule.get(i).get("principalOriginalDue") + (Float) loanSchedule.get(i).get("interestOriginalDue");
-            if (currentDate.after(repaymentDate)) {
-                this.loanTransactionHelper.makeRepayment(retrieveDueDate, amount, loanID);
-            } else {
-                break;
-            }
-            repaymentDate.add(Calendar.MONTH, 1);
-        }
-        HashMap savingsAccountErrorData = validationErrorHelper.makeRepayment(retrieveDueDate, amount, loanID);
-        ArrayList<HashMap> error = (ArrayList<HashMap>) savingsAccountErrorData.get("errors");
-        assertEquals("error.msg.loan.transaction.cannot.be.a.future.date", error.get(0).get("userMessageGlobalisationCode"));
-        GlobalConfigurationHelper.updateEnabledFlagForGlobalConfiguration(this.requestSpec, this.responseSpec, "42", false);
-    }
-
-    @Test
-    public void testCollateralDataIsAvailableWhenRequested() {
-        // given
-        this.loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, this.responseSpec);
-        Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
-        List<HashMap> collaterals = new ArrayList<>();
-        Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec);
-        ClientHelper.verifyClientCreatedOnServer(this.requestSpec, this.responseSpec, clientId);
-
-        Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
-                String.valueOf(clientId), collateralId);
-        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
-
-        Integer loanProductId = createLoanProduct(false, NONE);
-
-        // when
-        Integer loanId = applyForLoanApplication(clientId, loanProductId, null, null, "12,000.00", collaterals);
-
-        // then
-        List<Integer> clientCollateralIds = (List<Integer>) loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanId,
-                "collateral.clientCollateralId");
-        Integer clientCollateralIdResult = clientCollateralIds.get(0);
-        assertEquals(clientCollateralId, clientCollateralIdResult);
-    }
-
-    @Test
-    public void undoWaivedChargeTransactionDoesNotExist() {
-        ResponseSpecification responseSpec = new ResponseSpecBuilder().expectStatusCode(404).build();
-        LoanTransactionHelper loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, responseSpec);
-        HashMap response = loanTransactionHelper.undoWaiveChargesForLoan(-1, -2, "");
-        assertEquals("error.msg.loan.transaction.id.invalid",
-                ((Map) ((List) response.get("errors")).get(0)).get("userMessageGlobalisationCode"));
-        assertEquals("Transaction with identifier -2 does not exist for loan with identifier -1.",
-                ((Map) ((List) response.get("errors")).get(0)).get("defaultUserMessage"));
-    }
-
-    @Test
-    public void chargeAdjustmentChargeWrongParams() {
-        CallFailedRuntimeException exception = assertThrows(CallFailedRuntimeException.class,
-                () -> loanTransactionHelper.chargeAdjustment(0L, 0L, new PostLoansLoanIdChargesChargeIdRequest().amount(0.0)));
-        assertEquals(400, exception.getResponse().code());
-        assertTrue(exception.getMessage().contains("validation.msg.loan.charge.adjustment.request.amount.not.greater.than.zero"));
-        assertTrue(exception.getMessage().contains("validation.msg.loan.charge.adjustment.request.loanId.not.greater.than.zero"));
-        assertTrue(exception.getMessage().contains("validation.msg.loan.charge.adjustment.request.loanChargeId.not.greater.than.zero"));
-        exception = assertThrows(CallFailedRuntimeException.class,
-                () -> loanTransactionHelper.chargeAdjustment(1L, 0L, new PostLoansLoanIdChargesChargeIdRequest().amount(0.0)));
-        assertEquals(400, exception.getResponse().code());
-        assertTrue(exception.getMessage().contains("validation.msg.loan.charge.adjustment.request.amount.not.greater.than.zero"));
-        assertTrue(exception.getMessage().contains("validation.msg.loan.charge.adjustment.request.loanChargeId.not.greater.than.zero"));
-        exception = assertThrows(CallFailedRuntimeException.class,
-                () -> loanTransactionHelper.chargeAdjustment(1L, 1L, new PostLoansLoanIdChargesChargeIdRequest().amount(0.0)));
-        assertEquals(400, exception.getResponse().code());
-        assertTrue(exception.getMessage().contains("validation.msg.loan.charge.adjustment.request.amount.not.greater.than.zero"));
-    }
-
-    @Test
-    public void chargeAdjustmentChargeDoesNotExist() {
-        final Account assetAccount = this.accountHelper.createAssetAccount();
-        final Account incomeAccount = this.accountHelper.createIncomeAccount();
-        final Account expenseAccount = this.accountHelper.createExpenseAccount();
-        final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
-
-        final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterest(assetAccount, incomeAccount, expenseAccount,
-                overpaymentAccount);
-
-        final Integer clientID = ClientHelper.createClient(requestSpec, responseSpec, "01 January 2011");
-
-        final Integer loanID = applyForLoanApplication(clientID, loanProductID);
-
-        CallFailedRuntimeException exception = assertThrows(CallFailedRuntimeException.class,
-                () -> loanTransactionHelper.chargeAdjustment((long) loanID, 1L, new PostLoansLoanIdChargesChargeIdRequest().amount(1.0)));
-        assertEquals(404, exception.getResponse().code());
-        assertTrue(exception.getMessage().contains("error.msg.loanCharge.id.invalid"));
-    }
-
-    @Test
-    public void chargeAdjustmentChargeDoesNotExistForLoan() {
-        final Account assetAccount = this.accountHelper.createAssetAccount();
-        final Account incomeAccount = this.accountHelper.createIncomeAccount();
-        final Account expenseAccount = this.accountHelper.createExpenseAccount();
-        final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
-
-        final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterest(assetAccount, incomeAccount, expenseAccount,
-                overpaymentAccount);
-
-        final Integer clientID = ClientHelper.createClient(requestSpec, responseSpec, "01 January 2011");
-
-        final Integer loanID = applyForLoanApplication(clientID, loanProductID);
-
-        HashMap<String, Object> loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(requestSpec, responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan("02 September 2022", loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("03 September 2022", loanID, "1000");
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        Integer penalty = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "10", true));
-        LocalDate targetDate = LocalDate.of(2022, 9, 7);
-        final String penaltyCharge1AddedDate = dateFormatter.format(targetDate);
-        Integer penalty1LoanChargeId = this.loanTransactionHelper.addChargesForLoan(loanID,
-                LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(penalty), penaltyCharge1AddedDate, "10"));
-
-        final Integer loanID2 = applyForLoanApplication(clientID, loanProductID);
-
-        CallFailedRuntimeException exception = assertThrows(CallFailedRuntimeException.class, () -> loanTransactionHelper
-                .chargeAdjustment((long) loanID2, (long) penalty1LoanChargeId, new PostLoansLoanIdChargesChargeIdRequest().amount(1.0)));
-        assertEquals(404, exception.getResponse().code());
-        assertTrue(exception.getMessage().contains("error.msg.loanCharge.id.invalid.for.given.loan"));
-    }
-
-    @Test
-    public void chargeAdjustmentForUnpaidCharge() {
-        try {
-            GlobalConfigurationHelper.updateIsBusinessDateEnabled(requestSpec, responseSpec, Boolean.TRUE);
-            businessDateHelper.updateBusinessDate(new BusinessDateRequest().type(BusinessDateType.BUSINESS_DATE.getName())
-                    .date("2022.11.01").dateFormat("yyyy.MM.dd").locale("en"));
-            final Account assetAccount = this.accountHelper.createAssetAccount();
-            final Account incomeAccount = this.accountHelper.createIncomeAccount();
-            final Account expenseAccount = this.accountHelper.createExpenseAccount();
-            final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
-
-            Integer penalty = ChargesHelper.createCharges(requestSpec, responseSpec,
-                    ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "10", true));
-            final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterest(assetAccount, incomeAccount,
-                    expenseAccount, overpaymentAccount);
-
-            final Integer clientID = ClientHelper.createClient(requestSpec, responseSpec, "01 January 2011");
-
-            final Integer loanID = applyForLoanApplication(clientID, loanProductID);
-
-            HashMap<String, Object> loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(requestSpec, responseSpec, loanID);
-            LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-            loanStatusHashMap = this.loanTransactionHelper.approveLoan("02 September 2022", loanID);
-            LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-            LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-            loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("03 September 2022", loanID, "1000");
-            LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-            ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec, loanID);
-            assertEquals(2, loanSchedule.size());
-            assertEquals(0, loanSchedule.get(1).get("penaltyChargesDue"));
-            assertEquals(0, loanSchedule.get(1).get("penaltyChargesOutstanding"));
-            assertEquals(1000.0f, loanSchedule.get(1).get("totalDueForPeriod"));
-            assertEquals(1000.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
-            LocalDate targetDate = LocalDate.of(2022, 9, 7);
-            final String penaltyCharge1AddedDate = dateFormatter.format(targetDate);
-            Integer penalty1LoanChargeId = this.loanTransactionHelper.addChargesForLoan(loanID,
-                    LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(penalty), penaltyCharge1AddedDate, "10"));
-
-            this.loanTransactionHelper.noAccrualTransactionForRepayment(loanID);
-
-            loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec, loanID);
-            assertEquals(2, loanSchedule.size());
-            assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue"));
-            assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesOutstanding"));
-            assertEquals(1010.0f, loanSchedule.get(1).get("totalDueForPeriod"));
-            assertEquals(1010.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
-            assertEquals(0, loanSchedule.get(1).get("totalWaivedForPeriod"));
-
-            HashMap loanSummary = this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "summary");
-            assertEquals(10.0f, loanSummary.get("penaltyChargesCharged"));
-            assertEquals(10.0f, loanSummary.get("penaltyChargesOutstanding"));
-            assertEquals(0.0f, loanSummary.get("penaltyChargesWaived"));
-            assertEquals(1010.0f, loanSummary.get("totalOutstanding"));
-            assertEquals(0.0f, loanSummary.get("totalWaived"));
-
-            String externalId = UUID.randomUUID().toString();
-            PostLoansLoanIdChargesChargeIdResponse chargeAdjustmentResponse = this.loanTransactionHelper.chargeAdjustment((long) loanID,
-                    (long) penalty1LoanChargeId,
-                    new PostLoansLoanIdChargesChargeIdRequest().amount(10.0).externalId(externalId).paymentTypeId(1L));
-
-            loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec, loanID);
-            assertEquals(2, loanSchedule.size());
-            assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue"));
-            assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesPaid"));
-            assertEquals(0.0f, loanSchedule.get(1).get("penaltyChargesOutstanding"));
-            assertEquals(1010.0f, loanSchedule.get(1).get("totalDueForPeriod"));
-            assertEquals(1000.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
-            assertEquals(10.0f, loanSchedule.get(1).get("totalPaidForPeriod"));
-
-            loanSummary = this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "summary");
-            assertEquals(10.0f, loanSummary.get("penaltyChargesCharged"));
-            assertEquals(0.0f, loanSummary.get("penaltyChargesOutstanding"));
-            assertEquals(10.0f, loanSummary.get("penaltyChargesPaid"));
-            assertEquals(1000.0f, loanSummary.get("totalOutstanding"));
-
-            GetLoansLoanIdTransactionsTransactionIdResponse chargeAdjustmentTransaction = this.loanTransactionHelper
-                    .getLoanTransactionDetails((long) loanID, chargeAdjustmentResponse.getSubResourceId());
-            assertEquals(10.0, chargeAdjustmentTransaction.getAmount());
-            assertEquals(10.0, chargeAdjustmentTransaction.getPenaltyChargesPortion());
-            assertEquals("loanTransactionType.chargeAdjustment", chargeAdjustmentTransaction.getType().getCode());
-            assertEquals(externalId, chargeAdjustmentTransaction.getExternalId());
-            GetLoanTransactionRelation transactionRelation = chargeAdjustmentTransaction.getTransactionRelations().iterator().next();
-            assertEquals(chargeAdjustmentResponse.getSubResourceId(), transactionRelation.getFromLoanTransaction());
-            assertEquals((long) penalty1LoanChargeId, transactionRelation.getToLoanCharge());
-            assertEquals("CHARGE_ADJUSTMENT", transactionRelation.getRelationType());
-            assertEquals(1L, chargeAdjustmentTransaction.getPaymentDetailData().getPaymentType().getId());
-
-            PostLoansLoanIdTransactionsResponse repaymentResult = loanTransactionHelper.makeLoanRepayment((long) loanID,
-                    new PostLoansLoanIdTransactionsRequest().dateFormat("dd MMMM yyyy").transactionDate("06 September 2022").locale("en")
-                            .transactionAmount(5.0));
-
-            loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec, loanID);
-            assertEquals(2, loanSchedule.size());
-            assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue"));
-            assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesPaid"));
-            assertEquals(0.0f, loanSchedule.get(1).get("penaltyChargesOutstanding"));
-            assertEquals(1000.0f, loanSchedule.get(1).get("principalDue"));
-            assertEquals(5.0f, loanSchedule.get(1).get("principalPaid"));
-            assertEquals(995.0f, loanSchedule.get(1).get("principalOutstanding"));
-            assertEquals(1010.0f, loanSchedule.get(1).get("totalDueForPeriod"));
-            assertEquals(995.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
-            assertEquals(15.0f, loanSchedule.get(1).get("totalPaidForPeriod"));
-
-            loanSummary = this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "summary");
-            assertEquals(10.0f, loanSummary.get("penaltyChargesCharged"));
-            assertEquals(0.0f, loanSummary.get("penaltyChargesOutstanding"));
-            assertEquals(10.0f, loanSummary.get("penaltyChargesPaid"));
-            assertEquals(1000.0f, loanSummary.get("principalDisbursed"));
-            assertEquals(995.0f, loanSummary.get("principalOutstanding"));
-            assertEquals(5.0f, loanSummary.get("principalPaid"));
-            assertEquals(995.0f, loanSummary.get("totalOutstanding"));
-
-            GetLoansLoanIdResponse loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-            GetLoansLoanIdTransactions replayedTransaction = loanDetails.getTransactions().stream()
-                    .filter(t -> externalId.equals(t.getExternalId())).findFirst().get();
-
-            assertEquals(10.0, replayedTransaction.getAmount());
-            assertEquals(5.0, replayedTransaction.getPenaltyChargesPortion());
-            assertEquals(5.0, replayedTransaction.getPrincipalPortion());
-            assertEquals("loanTransactionType.chargeAdjustment", replayedTransaction.getType().getCode());
-            assertEquals(externalId, replayedTransaction.getExternalId());
-
-            Set<GetLoansLoanIdLoanTransactionRelation> transactionRelations = replayedTransaction.getTransactionRelations();
-            for (GetLoansLoanIdLoanTransactionRelation loanTransactionRelation : transactionRelations) {
-                if ("CHARGE_ADJUSTMENT".equals(loanTransactionRelation.getRelationType())) {
-                    assertEquals(replayedTransaction.getId(), loanTransactionRelation.getFromLoanTransaction());
-                    assertEquals((long) penalty1LoanChargeId, loanTransactionRelation.getToLoanCharge());
-                }
-            }
-
-            String uuid = UUID.randomUUID().toString();
-            this.loanTransactionHelper.reverseLoanTransaction((long) loanID, replayedTransaction.getId(),
-                    new PostLoansLoanIdTransactionsTransactionIdRequest().dateFormat("dd MMMM yyyy").transactionDate("08 September 2022")
-                            .transactionAmount(0.0).locale("en").reversalExternalId(uuid));
-
-            // Should fail due to external id collusion
-            assertThrows(CallFailedRuntimeException.class,
-                    () -> this.loanTransactionHelper.reverseLoanTransaction((long) loanID, repaymentResult.getResourceId(),
-                            new PostLoansLoanIdTransactionsTransactionIdRequest().dateFormat("dd MMMM yyyy")
-                                    .transactionDate("08 September 2022").transactionAmount(0.0).locale("en").reversalExternalId(uuid)));
-
-            loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec, loanID);
-            assertEquals(2, loanSchedule.size());
-            assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue"));
-            assertEquals(5.0f, loanSchedule.get(1).get("penaltyChargesPaid"));
-            assertEquals(5.0f, loanSchedule.get(1).get("penaltyChargesOutstanding"));
-            assertEquals(1000.0f, loanSchedule.get(1).get("principalDue"));
-            assertEquals(0, loanSchedule.get(1).get("principalPaid"));
-            assertEquals(1000.0f, loanSchedule.get(1).get("principalOutstanding"));
-            assertEquals(1010.0f, loanSchedule.get(1).get("totalDueForPeriod"));
-            assertEquals(1005.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
-            assertEquals(5.0f, loanSchedule.get(1).get("totalPaidForPeriod"));
-
-            loanSummary = this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "summary");
-            assertEquals(10.0f, loanSummary.get("penaltyChargesCharged"));
-            assertEquals(5.0f, loanSummary.get("penaltyChargesOutstanding"));
-            assertEquals(5.0f, loanSummary.get("penaltyChargesPaid"));
-            assertEquals(1000.0f, loanSummary.get("principalDisbursed"));
-            assertEquals(1000.0f, loanSummary.get("principalOutstanding"));
-            assertEquals(0.0f, loanSummary.get("principalPaid"));
-            assertEquals(1005.0f, loanSummary.get("totalOutstanding"));
-        } finally {
-            GlobalConfigurationHelper.updateIsBusinessDateEnabled(requestSpec, responseSpec, Boolean.FALSE);
-        }
-    }
-
-    @Test
-    public void chargeAdjustmentAccountingValidation() {
-        try {
-            GlobalConfigurationHelper.updateIsBusinessDateEnabled(requestSpec, responseSpec, Boolean.TRUE);
-            businessDateHelper.updateBusinessDate(new BusinessDateRequest().type(BusinessDateType.BUSINESS_DATE.getName())
-                    .date("2022.11.01").dateFormat("yyyy.MM.dd").locale("en"));
-            final Account assetAccount = this.accountHelper.createAssetAccount();
-            final Account assetFeeAndPenaltyAccount = this.accountHelper.createAssetAccount();
-            final Account incomeAccount = this.accountHelper.createIncomeAccount();
-            final Account expenseAccount = this.accountHelper.createExpenseAccount();
-            final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
-            final PostGLAccountsResponse uniqueIncomeAccountForFee = this.accountHelper.createGLAccount(new PostGLAccountsRequest()
-                    .type(GLAccountType.INCOME.getValue())
-                    .glCode(Utils.uniqueRandomStringGenerator("UNIQUE_FEE_INCOME" + Calendar.getInstance().getTimeInMillis(), 5))
-                    .manualEntriesAllowed(true)
-                    .name(Utils.uniqueRandomStringGenerator("UNIQUE_FEE_INCOME" + Calendar.getInstance().getTimeInMillis(), 5)).usage(1));
-            final PostGLAccountsResponse uniqueIncomeAccountForPenalty = this.accountHelper.createGLAccount(new PostGLAccountsRequest()
-                    .type(GLAccountType.INCOME.getValue())
-                    .glCode(Utils.uniqueRandomStringGenerator("UNIQUE_PENALTY_INCOME" + Calendar.getInstance().getTimeInMillis(), 5))
-                    .manualEntriesAllowed(true)
-                    .name(Utils.uniqueRandomStringGenerator("UNIQUE_PENALTY_INCOME" + Calendar.getInstance().getTimeInMillis(), 5))
-                    .usage(1));
-
-            PostChargesResponse penaltyCharge = chargesHelper.createCharges(new PostChargesRequest().penalty(true).amount(10.0)
-                    .chargeCalculationType(ChargeCalculationType.FLAT.getValue())
-                    .chargeTimeType(ChargeTimeType.SPECIFIED_DUE_DATE.getValue()).chargePaymentMode(ChargePaymentMode.REGULAR.getValue())
-                    .currencyCode("USD").name(Utils.randomStringGenerator("PENALTY_" + Calendar.getInstance().getTimeInMillis(), 5))
-                    .chargeAppliesTo(1).locale("en").active(true));
-
-            PostChargesResponse feeCharge = chargesHelper.createCharges(new PostChargesRequest().penalty(false).amount(9.0)
-                    .chargeCalculationType(ChargeCalculationType.FLAT.getValue())
-                    .chargeTimeType(ChargeTimeType.SPECIFIED_DUE_DATE.getValue()).chargePaymentMode(ChargePaymentMode.REGULAR.getValue())
-                    .currencyCode("USD").name(Utils.randomStringGenerator("FEE_" + Calendar.getInstance().getTimeInMillis(), 5))
-                    .chargeAppliesTo(1).locale("en").active(true));
-
-            final String loanProductJSON = new LoanProductTestBuilder().withPrincipal("1000").withRepaymentTypeAsMonth()
-                    .withRepaymentAfterEvery("1").withNumberOfRepayments("1").withRepaymentTypeAsMonth().withinterestRatePerPeriod("0")
-                    .withInterestRateFrequencyTypeAsMonths().withAmortizationTypeAsEqualPrincipalPayment().withInterestTypeAsFlat()
-                    .withAccountingRulePeriodicAccrual(new Account[] { assetAccount, incomeAccount, expenseAccount, overpaymentAccount })
-                    .withDaysInMonth("30").withDaysInYear("365").withMoratorium("0", "0")
-                    .withFeeToIncomeAccountMapping(feeCharge.getResourceId(), uniqueIncomeAccountForFee.getResourceId())
-                    .withPenaltyToIncomeAccountMapping(penaltyCharge.getResourceId(), uniqueIncomeAccountForPenalty.getResourceId())
-                    .withFeeAndPenaltyAssetAccount(assetFeeAndPenaltyAccount).build(null);
-            final Integer loanProductID = this.loanTransactionHelper.getLoanProductId(loanProductJSON);
-
-            final PostClientsResponse client = clientHelper.createClient(ClientHelper.defaultClientCreationRequest());
-
-            final Integer loanID = applyForLoanApplication(client.getClientId().intValue(), loanProductID);
-
-            HashMap<String, Object> loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(requestSpec, responseSpec, loanID);
-            LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-            loanStatusHashMap = this.loanTransactionHelper.approveLoan("02 September 2022", loanID);
-            LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-            LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-            loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("03 September 2022", loanID, "1000");
-            LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-            GetLoansLoanIdResponse loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-            List<GetLoansLoanIdRepaymentPeriod> loanSchedulePeriods = loanDetails.getRepaymentSchedule().getPeriods();
-            assertEquals(2, loanSchedulePeriods.size());
-            assertEquals(0.0, loanSchedulePeriods.get(1).getPenaltyChargesDue());
-            assertEquals(0.0, loanSchedulePeriods.get(1).getPenaltyChargesOutstanding());
-            assertEquals(1000.0, loanSchedulePeriods.get(1).getTotalDueForPeriod());
-            assertEquals(1000.0, loanSchedulePeriods.get(1).getTotalOutstandingForPeriod());
-
-            LocalDate targetDate = LocalDate.of(2022, 9, 7);
-            final String penaltyCharge1AddedDate = dateFormatter.format(targetDate);
-            Integer penaltyLoanChargeId = this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper
-                    .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(penaltyCharge.getResourceId()), penaltyCharge1AddedDate, "10"));
-
-            final String penalty1LoanChargeDate = dateFormatter.format(targetDate);
-            this.periodicAccrualAccountingHelper.runPeriodicAccrualAccounting(penalty1LoanChargeDate);
-
-            loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-            List<GetLoansLoanIdTransactions> transactions = loanDetails.getTransactions();
-            assertEquals(10.0, transactions.get(1).getAmount());
-            assertTrue(transactions.get(1).getType().getAccrual());
-            assertEquals(10.0, transactions.get(1).getPenaltyChargesPortion());
-            Long accrualTransactionId = transactions.get(1).getId();
-
-            List<HashMap> journalEntries = this.journalEntryHelper.getJournalEntriesByTransactionId("L" + accrualTransactionId);
-            assertEquals(10.0f, (float) journalEntries.get(0).get("amount"));
-            assertEquals(uniqueIncomeAccountForPenalty.getResourceId().intValue(), (int) journalEntries.get(0).get("glAccountId"));
-            assertEquals("CREDIT", ((HashMap) journalEntries.get(0).get("entryType")).get("value"));
-            assertEquals(10.0f, (float) journalEntries.get(1).get("amount"));
-            assertEquals(assetFeeAndPenaltyAccount.getAccountID(), (int) journalEntries.get(1).get("glAccountId"));
-            assertEquals("DEBIT", ((HashMap) journalEntries.get(1).get("entryType")).get("value"));
-
-            loanSchedulePeriods = loanDetails.getRepaymentSchedule().getPeriods();
-            assertEquals(2, loanSchedulePeriods.size());
-            assertEquals(10.0, loanSchedulePeriods.get(1).getPenaltyChargesDue());
-            assertEquals(10.0, loanSchedulePeriods.get(1).getPenaltyChargesOutstanding());
-            assertEquals(1010.0, loanSchedulePeriods.get(1).getTotalDueForPeriod());
-            assertEquals(1010.0, loanSchedulePeriods.get(1).getTotalOutstandingForPeriod());
-
-            GetLoansLoanIdSummary loanSummary = loanDetails.getSummary();
-            assertEquals(10.0, loanSummary.getPenaltyChargesCharged());
-            assertEquals(10.0, loanSummary.getPenaltyChargesOutstanding());
-            assertEquals(1010.0, loanSummary.getTotalOutstanding());
-
-            String externalId = UUID.randomUUID().toString();
-            PostLoansLoanIdChargesChargeIdResponse chargeAdjustmentResponse = this.loanTransactionHelper.chargeAdjustment((long) loanID,
-                    (long) penaltyLoanChargeId, new PostLoansLoanIdChargesChargeIdRequest().amount(10.0).externalId(externalId));
-
-            loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-
-            loanSchedulePeriods = loanDetails.getRepaymentSchedule().getPeriods();
-            assertEquals(2, loanSchedulePeriods.size());
-            assertEquals(10.0, loanSchedulePeriods.get(1).getPenaltyChargesDue());
-            assertEquals(10.0, loanSchedulePeriods.get(1).getPenaltyChargesPaid());
-            assertEquals(0.0, loanSchedulePeriods.get(1).getPenaltyChargesOutstanding());
-            assertEquals(1010.0, loanSchedulePeriods.get(1).getTotalDueForPeriod());
-            assertEquals(1000.0, loanSchedulePeriods.get(1).getTotalOutstandingForPeriod());
-            assertEquals(10.0, loanSchedulePeriods.get(1).getTotalPaidForPeriod());
-
-            loanSummary = loanDetails.getSummary();
-            assertEquals(10.0, loanSummary.getPenaltyChargesCharged());
-            assertEquals(0.0, loanSummary.getPenaltyChargesOutstanding());
-            assertEquals(10.0, loanSummary.getPenaltyChargesPaid());
-            assertEquals(1000.0, loanSummary.getTotalOutstanding());
-
-            transactions = loanDetails.getTransactions();
-            assertEquals(10.0, transactions.get(2).getAmount());
-            assertTrue(transactions.get(2).getType().getChargeAdjustment());
-            assertEquals(10.0, transactions.get(2).getPenaltyChargesPortion());
-            Long chargeAdjustmentTransactionId = transactions.get(2).getId();
-
-            journalEntries = this.journalEntryHelper.getJournalEntriesByTransactionId("L" + chargeAdjustmentTransactionId);
-            assertEquals(10.0f, (float) journalEntries.get(0).get("amount"));
-            assertEquals(uniqueIncomeAccountForPenalty.getResourceId().intValue(), (int) journalEntries.get(0).get("glAccountId"));
-            assertEquals("DEBIT", ((HashMap) journalEntries.get(0).get("entryType")).get("value"));
-            assertEquals(10.0f, (float) journalEntries.get(1).get("amount"));
-            assertEquals(assetFeeAndPenaltyAccount.getAccountID(), (int) journalEntries.get(1).get("glAccountId"));
-            assertEquals("CREDIT", ((HashMap) journalEntries.get(1).get("entryType")).get("value"));
-
-            String uuid = UUID.randomUUID().toString();
-            this.loanTransactionHelper.reverseLoanTransaction((long) loanID, chargeAdjustmentTransactionId,
-                    new PostLoansLoanIdTransactionsTransactionIdRequest().dateFormat("dd MMMM yyyy").transactionDate("08 September 2022")
-                            .transactionAmount(0.0).locale("en").reversalExternalId(uuid));
-
-            journalEntries = this.journalEntryHelper.getJournalEntriesByTransactionId("L" + chargeAdjustmentTransactionId);
-            assertEquals(10.0f, (float) journalEntries.get(0).get("amount"));
-            assertEquals(uniqueIncomeAccountForPenalty.getResourceId().intValue(), (int) journalEntries.get(0).get("glAccountId"));
-            assertEquals("CREDIT", ((HashMap) journalEntries.get(0).get("entryType")).get("value"));
-            assertEquals(10.0f, (float) journalEntries.get(1).get("amount"));
-            assertEquals(assetFeeAndPenaltyAccount.getAccountID(), (int) journalEntries.get(1).get("glAccountId"));
-            assertEquals("DEBIT", ((HashMap) journalEntries.get(1).get("entryType")).get("value"));
-            assertEquals(10.0f, (float) journalEntries.get(2).get("amount"));
-            assertEquals(uniqueIncomeAccountForPenalty.getResourceId().intValue(), (int) journalEntries.get(2).get("glAccountId"));
-            assertEquals("DEBIT", ((HashMap) journalEntries.get(2).get("entryType")).get("value"));
-            assertEquals(10.0f, (float) journalEntries.get(3).get("amount"));
-            assertEquals(assetFeeAndPenaltyAccount.getAccountID(), (int) journalEntries.get(3).get("glAccountId"));
-            assertEquals("CREDIT", ((HashMap) journalEntries.get(3).get("entryType")).get("value"));
-
-            targetDate = LocalDate.of(2022, 9, 10);
-            final String feeCharge1AddedDate = dateFormatter.format(targetDate);
-            Integer feeLoanChargeId = this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper
-                    .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(feeCharge.getResourceId()), feeCharge1AddedDate, "3"));
-
-            GlobalConfigurationHelper.manageConfigurations(requestSpec, responseSpec,
-                    GlobalConfigurationHelper.ENABLE_AUTOGENERATED_EXTERNAL_ID, true);
-            final String feeLoanChargeDate = dateFormatter.format(targetDate);
-            this.periodicAccrualAccountingHelper.runPeriodicAccrualAccounting(feeLoanChargeDate);
-
-            loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-            transactions = loanDetails.getTransactions();
-            assertEquals(3.0, transactions.get(2).getAmount());
-            assertTrue(transactions.get(2).getType().getAccrual());
-            assertEquals(3.0, transactions.get(2).getFeeChargesPortion());
-            assertTrue(StringUtils.isNotBlank(transactions.get(2).getExternalId()));
-            accrualTransactionId = transactions.get(2).getId();
-
-            journalEntries = this.journalEntryHelper.getJournalEntriesByTransactionId("L" + accrualTransactionId);
-            assertEquals(3.0f, (float) journalEntries.get(0).get("amount"));
-            assertEquals(uniqueIncomeAccountForFee.getResourceId().intValue(), (int) journalEntries.get(0).get("glAccountId"));
-            assertEquals("CREDIT", ((HashMap) journalEntries.get(0).get("entryType")).get("value"));
-            assertEquals(3.0f, (float) journalEntries.get(1).get("amount"));
-            assertEquals(assetFeeAndPenaltyAccount.getAccountID(), (int) journalEntries.get(1).get("glAccountId"));
-            assertEquals("DEBIT", ((HashMap) journalEntries.get(1).get("entryType")).get("value"));
-
-            loanSchedulePeriods = loanDetails.getRepaymentSchedule().getPeriods();
-            assertEquals(2, loanSchedulePeriods.size());
-            assertEquals(10.0, loanSchedulePeriods.get(1).getPenaltyChargesDue());
-            assertEquals(10.0, loanSchedulePeriods.get(1).getPenaltyChargesOutstanding());
-            assertEquals(3.0, loanSchedulePeriods.get(1).getFeeChargesDue());
-            assertEquals(3.0, loanSchedulePeriods.get(1).getFeeChargesOutstanding());
-            assertEquals(1013.0, loanSchedulePeriods.get(1).getTotalDueForPeriod());
-            assertEquals(1013.0, loanSchedulePeriods.get(1).getTotalOutstandingForPeriod());
-
-            loanSummary = loanDetails.getSummary();
-            assertEquals(10.0, loanSummary.getPenaltyChargesCharged());
-            assertEquals(10.0, loanSummary.getPenaltyChargesOutstanding());
-            assertEquals(3.0, loanSummary.getFeeChargesCharged());
-            assertEquals(3.0, loanSummary.getFeeChargesOutstanding());
-            assertEquals(1013.0, loanSummary.getTotalOutstanding());
-
-            loanTransactionHelper.makeLoanRepayment((long) loanID, new PostLoansLoanIdTransactionsRequest().dateFormat("dd MMMM yyyy")
-                    .transactionDate("11 September 2022").locale("en").transactionAmount(5.0));
-
-            externalId = UUID.randomUUID().toString();
-            chargeAdjustmentResponse = this.loanTransactionHelper.chargeAdjustment((long) loanID, (long) feeLoanChargeId,
-                    new PostLoansLoanIdChargesChargeIdRequest().amount(2.0).externalId(externalId));
-
-            loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-
-            loanSchedulePeriods = loanDetails.getRepaymentSchedule().getPeriods();
-            assertEquals(2, loanSchedulePeriods.size());
-            assertEquals(10.0, loanSchedulePeriods.get(1).getPenaltyChargesDue());
-            assertEquals(7.0, loanSchedulePeriods.get(1).getPenaltyChargesPaid());
-            assertEquals(3.0, loanSchedulePeriods.get(1).getPenaltyChargesOutstanding());
-            assertEquals(3.0, loanSchedulePeriods.get(1).getFeeChargesDue());
-            assertEquals(0.0, loanSchedulePeriods.get(1).getFeeChargesPaid());
-            assertEquals(3.0, loanSchedulePeriods.get(1).getFeeChargesOutstanding());
-            assertEquals(1000.0, loanSchedulePeriods.get(1).getPrincipalDue());
-            assertEquals(0.0, loanSchedulePeriods.get(1).getPrincipalPaid());
-            assertEquals(1000.0, loanSchedulePeriods.get(1).getPrincipalOutstanding());
-            assertEquals(1013.0, loanSchedulePeriods.get(1).getTotalDueForPeriod());
-            assertEquals(1006.0, loanSchedulePeriods.get(1).getTotalOutstandingForPeriod());
-            assertEquals(7.0, loanSchedulePeriods.get(1).getTotalPaidForPeriod());
-
-            loanSummary = loanDetails.getSummary();
-            assertEquals(10.0, loanSummary.getPenaltyChargesCharged());
-            assertEquals(3.0, loanSummary.getPenaltyChargesOutstanding());
-            assertEquals(7.0, loanSummary.getPenaltyChargesPaid());
-            assertEquals(3.0, loanSummary.getFeeChargesCharged());
-            assertEquals(3.0, loanSummary.getFeeChargesOutstanding());
-            assertEquals(0.0, loanSummary.getFeeChargesPaid());
-            assertEquals(1000.0, loanSummary.getPrincipalOutstanding());
-            assertEquals(0.0, loanSummary.getPrincipalPaid());
-            assertEquals(7.0, loanSummary.getTotalRepayment());
-            assertEquals(1006.0, loanSummary.getTotalOutstanding());
-
-            transactions = loanDetails.getTransactions();
-            assertEquals(2.0, transactions.get(5).getAmount());
-            assertTrue(transactions.get(4).getType().getChargeAdjustment());
-            assertEquals(2.0, transactions.get(5).getPenaltyChargesPortion());
-            assertEquals(0.0, transactions.get(5).getFeeChargesPortion());
-            assertEquals(0.0, transactions.get(5).getPrincipalPortion());
-            chargeAdjustmentTransactionId = transactions.get(5).getId();
-
-            journalEntries = this.journalEntryHelper.getJournalEntriesByTransactionId("L" + chargeAdjustmentTransactionId);
-            assertEquals(2.0f, (float) journalEntries.get(0).get("amount"));
-            assertEquals(uniqueIncomeAccountForFee.getResourceId().intValue(), (int) journalEntries.get(0).get("glAccountId"));
-            assertEquals("DEBIT", ((HashMap) journalEntries.get(0).get("entryType")).get("value"));
-            assertEquals(2.0f, (float) journalEntries.get(1).get("amount"));
-            assertEquals(assetFeeAndPenaltyAccount.getAccountID(), (int) journalEntries.get(1).get("glAccountId"));
-            assertEquals("CREDIT", ((HashMap) journalEntries.get(1).get("entryType")).get("value"));
-
-            externalId = UUID.randomUUID().toString();
-            chargeAdjustmentResponse = this.loanTransactionHelper.chargeAdjustment((long) loanID, (long) penaltyLoanChargeId,
-                    new PostLoansLoanIdChargesChargeIdRequest().amount(7.0).externalId(externalId));
-
-            loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-
-            loanSchedulePeriods = loanDetails.getRepaymentSchedule().getPeriods();
-            assertEquals(2, loanSchedulePeriods.size());
-            assertEquals(10.0, loanSchedulePeriods.get(1).getPenaltyChargesDue());
-            assertEquals(10.0, loanSchedulePeriods.get(1).getPenaltyChargesPaid());
-            assertEquals(0.0, loanSchedulePeriods.get(1).getPenaltyChargesOutstanding());
-            assertEquals(3.0, loanSchedulePeriods.get(1).getFeeChargesDue());
-            assertEquals(3.0, loanSchedulePeriods.get(1).getFeeChargesPaid());
-            assertEquals(0.0, loanSchedulePeriods.get(1).getFeeChargesOutstanding());
-            assertEquals(1000.0, loanSchedulePeriods.get(1).getPrincipalDue());
-            assertEquals(1.0, loanSchedulePeriods.get(1).getPrincipalPaid());
-            assertEquals(999.0, loanSchedulePeriods.get(1).getPrincipalOutstanding());
-            assertEquals(1013.0, loanSchedulePeriods.get(1).getTotalDueForPeriod());
-            assertEquals(999.0, loanSchedulePeriods.get(1).getTotalOutstandingForPeriod());
-            assertEquals(14.0, loanSchedulePeriods.get(1).getTotalPaidForPeriod());
-
-            loanSummary = loanDetails.getSummary();
-            assertEquals(10.0, loanSummary.getPenaltyChargesCharged());
-            assertEquals(0.0, loanSummary.getPenaltyChargesOutstanding());
-            assertEquals(10.0, loanSummary.getPenaltyChargesPaid());
-            assertEquals(3.0, loanSummary.getFeeChargesCharged());
-            assertEquals(0.0, loanSummary.getFeeChargesOutstanding());
-            assertEquals(3.0, loanSummary.getFeeChargesPaid());
-            assertEquals(999.0, loanSummary.getPrincipalOutstanding());
-            assertEquals(1.0, loanSummary.getPrincipalPaid());
-            assertEquals(14.0, loanSummary.getTotalRepayment());
-            assertEquals(999.0, loanSummary.getTotalOutstanding());
-
-            transactions = loanDetails.getTransactions();
-            assertEquals(7.0, transactions.get(6).getAmount());
-            assertTrue(transactions.get(6).getType().getChargeAdjustment());
-            assertEquals(3.0, transactions.get(6).getPenaltyChargesPortion());
-            assertEquals(3.0, transactions.get(6).getFeeChargesPortion());
-            assertEquals(1.0, transactions.get(6).getPrincipalPortion());
-            chargeAdjustmentTransactionId = transactions.get(6).getId();
-
-            journalEntries = this.journalEntryHelper.getJournalEntriesByTransactionId("L" + chargeAdjustmentTransactionId);
-            assertEquals(7.0f, (float) journalEntries.get(0).get("amount"));
-            assertEquals(uniqueIncomeAccountForPenalty.getResourceId().intValue(), (int) journalEntries.get(0).get("glAccountId"));
-            assertEquals("DEBIT", ((HashMap) journalEntries.get(0).get("entryType")).get("value"));
-            if (assetAccount.getAccountID() == (int) journalEntries.get(1).get("glAccountId")) {
-                assertEquals(1.0f, (float) journalEntries.get(1).get("amount"));
-                assertEquals(assetAccount.getAccountID(), (int) journalEntries.get(1).get("glAccountId"));
-                assertEquals("CREDIT", ((HashMap) journalEntries.get(1).get("entryType")).get("value"));
-
-                assertEquals(6.0f, (float) journalEntries.get(2).get("amount"));
-                assertEquals(assetFeeAndPenaltyAccount.getAccountID(), (int) journalEntries.get(2).get("glAccountId"));
-                assertEquals("CREDIT", ((HashMap) journalEntries.get(2).get("entryType")).get("value"));
-            } else {
-                assertEquals(1.0f, (float) journalEntries.get(2).get("amount"));
-                assertEquals(assetAccount.getAccountID(), (int) journalEntries.get(2).get("glAccountId"));
-                assertEquals("CREDIT", ((HashMap) journalEntries.get(2).get("entryType")).get("value"));
-
-                assertEquals(6.0f, (float) journalEntries.get(1).get("amount"));
-                assertEquals(assetFeeAndPenaltyAccount.getAccountID(), (int) journalEntries.get(1).get("glAccountId"));
-                assertEquals("CREDIT", ((HashMap) journalEntries.get(1).get("entryType")).get("value"));
-            }
-
-            loanTransactionHelper.makeLoanRepayment((long) loanID, new PostLoansLoanIdTransactionsRequest().dateFormat("dd MMMM yyyy")
-                    .transactionDate("13 September 2022").locale("en").transactionAmount(998.0));
-
-            externalId = UUID.randomUUID().toString();
-            chargeAdjustmentResponse = this.loanTransactionHelper.chargeAdjustment((long) loanID, (long) feeLoanChargeId,
-                    new PostLoansLoanIdChargesChargeIdRequest().amount(1.0).externalId(externalId));
-
-            loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-
-            loanSchedulePeriods = loanDetails.getRepaymentSchedule().getPeriods();
-            assertEquals(2, loanSchedulePeriods.size());
-            assertEquals(10.0, loanSchedulePeriods.get(1).getPenaltyChargesDue());
-            assertEquals(10.0, loanSchedulePeriods.get(1).getPenaltyChargesPaid());
-            assertEquals(0.0, loanSchedulePeriods.get(1).getPenaltyChargesOutstanding());
-            assertEquals(3.0, loanSchedulePeriods.get(1).getFeeChargesDue());
-            assertEquals(3.0, loanSchedulePeriods.get(1).getFeeChargesPaid());
-            assertEquals(0.0, loanSchedulePeriods.get(1).getFeeChargesOutstanding());
-            assertEquals(1000.0, loanSchedulePeriods.get(1).getPrincipalDue());
-            assertEquals(1000.0, loanSchedulePeriods.get(1).getPrincipalPaid());
-            assertEquals(0.0, loanSchedulePeriods.get(1).getPrincipalOutstanding());
-            assertEquals(1013.0, loanSchedulePeriods.get(1).getTotalDueForPeriod());
-            assertEquals(0.0, loanSchedulePeriods.get(1).getTotalOutstandingForPeriod());
-            assertEquals(1013.0, loanSchedulePeriods.get(1).getTotalPaidForPeriod());
-
-            loanSummary = loanDetails.getSummary();
-            assertEquals(10.0, loanSummary.getPenaltyChargesCharged());
-            assertEquals(0.0, loanSummary.getPenaltyChargesOutstanding());
-            assertEquals(10.0, loanSummary.getPenaltyChargesPaid());
-            assertEquals(3.0, loanSummary.getFeeChargesCharged());
-            assertEquals(0.0, loanSummary.getFeeChargesOutstanding());
-            assertEquals(3.0, loanSummary.getFeeChargesPaid());
-            assertEquals(0.0, loanSummary.getPrincipalOutstanding());
-            assertEquals(1000.0, loanSummary.getPrincipalPaid());
-            assertEquals(1013.0, loanSummary.getTotalRepayment());
-            assertEquals(0.0, loanSummary.getTotalOutstanding());
-
-            transactions = loanDetails.getTransactions();
-            assertEquals(1.0, transactions.get(8).getAmount());
-            assertTrue(transactions.get(8).getType().getChargeAdjustment());
-            assertEquals(0.0, transactions.get(8).getPenaltyChargesPortion());
-            assertEquals(0.0, transactions.get(8).getFeeChargesPortion());
-            assertEquals(1.0, transactions.get(8).getPrincipalPortion());
-            chargeAdjustmentTransactionId = transactions.get(8).getId();
-
-            journalEntries = this.journalEntryHelper.getJournalEntriesByTransactionId("L" + chargeAdjustmentTransactionId);
-            assertEquals(1.0f, (float) journalEntries.get(0).get("amount"));
-            assertEquals(uniqueIncomeAccountForFee.getResourceId().intValue(), (int) journalEntries.get(0).get("glAccountId"));
-            assertEquals("DEBIT", ((HashMap) journalEntries.get(0).get("entryType")).get("value"));
-            assertEquals(1.0f, (float) journalEntries.get(1).get("amount"));
-            assertEquals(assetAccount.getAccountID(), (int) journalEntries.get(1).get("glAccountId"));
-            assertEquals("CREDIT", ((HashMap) journalEntries.get(1).get("entryType")).get("value"));
-
-            assertTrue(loanDetails.getStatus().getClosedObligationsMet());
-
-            externalId = UUID.randomUUID().toString();
-            chargeAdjustmentResponse = this.loanTransactionHelper.chargeAdjustment((long) loanID, (long) penaltyLoanChargeId,
-                    new PostLoansLoanIdChargesChargeIdRequest().amount(1.0).externalId(externalId));
-
-            loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-
-            transactions = loanDetails.getTransactions();
-            assertEquals(1.0, transactions.get(9).getAmount());
-            assertTrue(transactions.get(9).getType().getChargeAdjustment());
-            assertEquals(0.0, transactions.get(9).getPenaltyChargesPortion());
-            assertEquals(0.0, transactions.get(9).getFeeChargesPortion());
-            assertEquals(0.0, transactions.get(9).getPrincipalPortion());
-            assertEquals(1.0, transactions.get(9).getOverpaymentPortion());
-            chargeAdjustmentTransactionId = transactions.get(9).getId();
-
-            journalEntries = this.journalEntryHelper.getJournalEntriesByTransactionId("L" + chargeAdjustmentTransactionId);
-            assertEquals(1.0f, (float) journalEntries.get(0).get("amount"));
-            assertEquals(uniqueIncomeAccountForPenalty.getResourceId().intValue(), (int) journalEntries.get(0).get("glAccountId"));
-            assertEquals("DEBIT", ((HashMap) journalEntries.get(0).get("entryType")).get("value"));
-            assertEquals(1.0f, (float) journalEntries.get(1).get("amount"));
-            assertEquals(overpaymentAccount.getAccountID(), (int) journalEntries.get(1).get("glAccountId"));
-            assertEquals("CREDIT", ((HashMap) journalEntries.get(1).get("entryType")).get("value"));
-
-            assertTrue(loanDetails.getStatus().getOverpaid());
-        } finally {
-            GlobalConfigurationHelper.updateIsBusinessDateEnabled(requestSpec, responseSpec, Boolean.FALSE);
-        }
-    }
-
-    @Test
-    public void undoWaivedChargeWaiveTransactionDoesNotExist() {
-        final Account assetAccount = this.accountHelper.createAssetAccount();
-        final Account incomeAccount = this.accountHelper.createIncomeAccount();
-        final Account expenseAccount = this.accountHelper.createExpenseAccount();
-        final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
-
-        final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterest(assetAccount, incomeAccount, expenseAccount,
-                overpaymentAccount);
-
-        final Integer clientID = ClientHelper.createClient(requestSpec, responseSpec, "01 January 2011");
-
-        final Integer loanID = applyForLoanApplication(clientID, loanProductID);
-
-        HashMap<String, Object> loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(requestSpec, responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan("02 September 2022", loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("03 September 2022", loanID, "1000");
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(requestSpec, responseSpec, loanID);
-        final Integer loanTransactionId = (Integer) ((Map) ((List) JsonPath.from(loanDetails).get("transactions")).get(0)).get("id");
-
-        ResponseSpecification responseSpec = new ResponseSpecBuilder().expectStatusCode(403).build();
-        LoanTransactionHelper loanTransactionHelper = new LoanTransactionHelper(this.requestSpec, responseSpec);
-        HashMap response = loanTransactionHelper.undoWaiveChargesForLoan(loanID, loanTransactionId, "");
-        assertEquals("error.msg.loan.transaction.undo.waive.charge",
-                ((Map) ((List) response.get("errors")).get(0)).get("userMessageGlobalisationCode"));
-        assertEquals("Transaction is not a waive charge type.", ((Map) ((List) response.get("errors")).get(0)).get("defaultUserMessage"));
-    }
-
-    @Test
-    public void undoWaivedCharge() {
-        final Account assetAccount = this.accountHelper.createAssetAccount();
-        final Account incomeAccount = this.accountHelper.createIncomeAccount();
-        final Account expenseAccount = this.accountHelper.createExpenseAccount();
-        final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
-
-        Integer penalty = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "10", true));
-        final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterest(assetAccount, incomeAccount, expenseAccount,
-                overpaymentAccount);
-
-        final Integer clientID = ClientHelper.createClient(requestSpec, responseSpec, "01 January 2011");
-
-        final Integer loanID = applyForLoanApplication(clientID, loanProductID);
-
-        HashMap<String, Object> loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(requestSpec, responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan("02 September 2022", loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("03 September 2022", loanID, "1000");
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        ArrayList<HashMap> loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec, loanID);
-        assertEquals(2, loanSchedule.size());
-        assertEquals(0, loanSchedule.get(1).get("feeChargesDue"));
-        assertEquals(0, loanSchedule.get(1).get("feeChargesOutstanding"));
-        assertEquals(0, loanSchedule.get(1).get("penaltyChargesDue"));
-        assertEquals(0, loanSchedule.get(1).get("penaltyChargesOutstanding"));
-        assertEquals(1000.0f, loanSchedule.get(1).get("totalDueForPeriod"));
-        assertEquals(1000.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
-        LocalDate targetDate = LocalDate.of(2022, 9, 7);
-        final String penaltyCharge1AddedDate = dateFormatter.format(targetDate);
-        Integer penalty1LoanChargeId = this.loanTransactionHelper.addChargesForLoan(loanID,
-                LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(penalty), penaltyCharge1AddedDate, "10"));
-
-        this.loanTransactionHelper.noAccrualTransactionForRepayment(loanID);
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec, loanID);
-        assertEquals(2, loanSchedule.size());
-        assertEquals(0, loanSchedule.get(1).get("feeChargesDue"));
-        assertEquals(0, loanSchedule.get(1).get("feeChargesOutstanding"));
-        assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue"));
-        assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesOutstanding"));
-        assertEquals(1010.0f, loanSchedule.get(1).get("totalDueForPeriod"));
-        assertEquals(1010.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
-        assertEquals(0, loanSchedule.get(1).get("totalWaivedForPeriod"));
-
-        HashMap loanSummary = this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "summary");
-        assertEquals(10.0f, loanSummary.get("penaltyChargesCharged"));
-        assertEquals(10.0f, loanSummary.get("penaltyChargesOutstanding"));
-        assertEquals(0.0f, loanSummary.get("penaltyChargesWaived"));
-        assertEquals(0.0f, loanSummary.get("feeChargesCharged"));
-        assertEquals(0.0f, loanSummary.get("feeChargesOutstanding"));
-        assertEquals(0.0f, loanSummary.get("feeChargesWaived"));
-        assertEquals(1010.0f, loanSummary.get("totalOutstanding"));
-        assertEquals(0.0f, loanSummary.get("totalWaived"));
-
-        this.loanTransactionHelper.waiveChargesForLoan(loanID, penalty1LoanChargeId, "");
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec, loanID);
-        assertEquals(2, loanSchedule.size());
-        assertEquals(0, loanSchedule.get(1).get("feeChargesDue"));
-        assertEquals(0, loanSchedule.get(1).get("feeChargesOutstanding"));
-        assertEquals(0, loanSchedule.get(1).get("feeChargesWaived"));
-        assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue"));
-        assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesWaived"));
-        assertEquals(0.0f, loanSchedule.get(1).get("penaltyChargesOutstanding"));
-        assertEquals(1010.0f, loanSchedule.get(1).get("totalDueForPeriod"));
-        assertEquals(1000.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
-        assertEquals(10.0f, loanSchedule.get(1).get("totalWaivedForPeriod"));
-
-        loanSummary = this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "summary");
-        assertEquals(10.0f, loanSummary.get("penaltyChargesCharged"));
-        assertEquals(0.0f, loanSummary.get("penaltyChargesOutstanding"));
-        assertEquals(10.0f, loanSummary.get("penaltyChargesWaived"));
-        assertEquals(0.0f, loanSummary.get("feeChargesCharged"));
-        assertEquals(0.0f, loanSummary.get("feeChargesOutstanding"));
-        assertEquals(0.0f, loanSummary.get("feeChargesWaived"));
-        assertEquals(1000.0f, loanSummary.get("totalOutstanding"));
-        assertEquals(10.0f, loanSummary.get("totalWaived"));
-
-        List<HashMap> transactions = this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "transactions");
-        assertEquals(10.0f, (float) transactions.get(1).get("amount"));
-        assertEquals(9, (int) ((HashMap) transactions.get(1).get("type")).get("id"));
-        Integer waiveTransactionId = (int) transactions.get(1).get("id");
-
-        this.loanTransactionHelper.undoWaiveChargesForLoan(loanID, waiveTransactionId, "");
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec, loanID);
-        assertEquals(2, loanSchedule.size());
-        assertEquals(0, loanSchedule.get(1).get("feeChargesDue"));
-        assertEquals(0, loanSchedule.get(1).get("feeChargesOutstanding"));
-        assertEquals(0, loanSchedule.get(1).get("feeChargesWaived"));
-        assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue"));
-        assertEquals(0.0f, loanSchedule.get(1).get("penaltyChargesWaived"));
-        assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesOutstanding"));
-        assertEquals(1010.0f, loanSchedule.get(1).get("totalDueForPeriod"));
-        assertEquals(1010.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
-        assertEquals(0.0f, loanSchedule.get(1).get("totalWaivedForPeriod"));
-
-        loanSummary = this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "summary");
-        assertEquals(10.0f, loanSummary.get("penaltyChargesCharged"));
-        assertEquals(10.0f, loanSummary.get("penaltyChargesOutstanding"));
-        assertEquals(0.0f, loanSummary.get("penaltyChargesWaived"));
-        assertEquals(0.0f, loanSummary.get("feeChargesCharged"));
-        assertEquals(0.0f, loanSummary.get("feeChargesOutstanding"));
-        assertEquals(0.0f, loanSummary.get("feeChargesWaived"));
-        assertEquals(1010.0f, loanSummary.get("totalOutstanding"));
-        assertEquals(0.0f, loanSummary.get("totalWaived"));
-
-        transactions = this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "transactions");
-        assertEquals(10.0f, (float) transactions.get(1).get("amount"));
-        assertEquals(9, (int) ((HashMap) transactions.get(1).get("type")).get("id"));
-        assertEquals(true, transactions.get(1).get("manuallyReversed"));
-
-        Integer fee = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "10", false));
-
-        final String feeCharge1AddedDate = dateFormatter.format(targetDate);
-        Integer fee1LoanChargeId = this.loanTransactionHelper.addChargesForLoan(loanID,
-                LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(fee), feeCharge1AddedDate, "10"));
-
-        this.periodicAccrualAccountingHelper.runPeriodicAccrualAccounting(feeCharge1AddedDate);
-
-        transactions = this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "transactions");
-        assertEquals(20.0f, (float) transactions.get(2).get("amount"));
-        assertEquals(10, (int) ((HashMap) transactions.get(2).get("type")).get("id"));
-        Integer accrualTransactionId = (int) transactions.get(2).get("id");
-
-        List<HashMap> journalEntries = this.journalEntryHelper.getJournalEntriesByTransactionId("L" + accrualTransactionId);
-        assertEquals(10.0f, (float) journalEntries.get(0).get("amount"));
-        assertEquals(incomeAccount.getAccountID(), (int) journalEntries.get(0).get("glAccountId"));
-        assertEquals("CREDIT", ((HashMap) journalEntries.get(0).get("entryType")).get("value"));
-        assertEquals(10.0f, (float) journalEntries.get(1).get("amount"));
-        assertEquals(assetAccount.getAccountID(), (int) journalEntries.get(1).get("glAccountId"));
-        assertEquals("DEBIT", ((HashMap) journalEntries.get(1).get("entryType")).get("value"));
-        assertEquals(10.0f, (float) journalEntries.get(2).get("amount"));
-        assertEquals(incomeAccount.getAccountID(), (int) journalEntries.get(2).get("glAccountId"));
-        assertEquals("CREDIT", ((HashMap) journalEntries.get(2).get("entryType")).get("value"));
-        assertEquals(10.0f, (float) journalEntries.get(3).get("amount"));
-        assertEquals(assetAccount.getAccountID(), (int) journalEntries.get(3).get("glAccountId"));
-        assertEquals("DEBIT", ((HashMap) journalEntries.get(3).get("entryType")).get("value"));
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec, loanID);
-        assertEquals(2, loanSchedule.size());
-        assertEquals(10.0f, loanSchedule.get(1).get("feeChargesDue"));
-        assertEquals(10.0f, loanSchedule.get(1).get("feeChargesOutstanding"));
-        assertEquals(0, loanSchedule.get(1).get("feeChargesWaived"));
-        assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue"));
-        assertEquals(0, loanSchedule.get(1).get("penaltyChargesWaived"));
-        assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesOutstanding"));
-        assertEquals(1020.0f, loanSchedule.get(1).get("totalDueForPeriod"));
-        assertEquals(1020.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
-        assertEquals(0, loanSchedule.get(1).get("totalWaivedForPeriod"));
-
-        loanSummary = this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "summary");
-        assertEquals(10.0f, loanSummary.get("penaltyChargesCharged"));
-        assertEquals(10.0f, loanSummary.get("penaltyChargesOutstanding"));
-        assertEquals(0.0f, loanSummary.get("penaltyChargesWaived"));
-        assertEquals(10.0f, loanSummary.get("feeChargesCharged"));
-        assertEquals(10.0f, loanSummary.get("feeChargesOutstanding"));
-        assertEquals(0.0f, loanSummary.get("feeChargesWaived"));
-        assertEquals(1020.0f, loanSummary.get("totalOutstanding"));
-        assertEquals(0.0f, loanSummary.get("totalWaived"));
-
-        this.loanTransactionHelper.waiveChargesForLoan(loanID, fee1LoanChargeId, "");
-
-        transactions = this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "transactions");
-        assertEquals(10.0f, (float) transactions.get(3).get("amount"));
-        assertEquals(9, (int) ((HashMap) transactions.get(3).get("type")).get("id"));
-        Integer waive2TransactionId = (int) transactions.get(3).get("id");
-
-        journalEntries = this.journalEntryHelper.getJournalEntriesByTransactionId("L" + waive2TransactionId);
-        assertEquals(10.0f, (float) journalEntries.get(0).get("amount"));
-        assertEquals(expenseAccount.getAccountID(), (int) journalEntries.get(0).get("glAccountId"));
-        assertEquals("DEBIT", ((HashMap) journalEntries.get(0).get("entryType")).get("value"));
-        assertEquals(10.0f, (float) journalEntries.get(1).get("amount"));
-        assertEquals(assetAccount.getAccountID(), (int) journalEntries.get(1).get("glAccountId"));
-        assertEquals("CREDIT", ((HashMap) journalEntries.get(1).get("entryType")).get("value"));
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec, loanID);
-        assertEquals(2, loanSchedule.size());
-        assertEquals(10.0f, loanSchedule.get(1).get("feeChargesDue"));
-        assertEquals(0.0f, loanSchedule.get(1).get("feeChargesOutstanding"));
-        assertEquals(10.0f, loanSchedule.get(1).get("feeChargesWaived"));
-        assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue"));
-        assertEquals(0, loanSchedule.get(1).get("penaltyChargesWaived"));
-        assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesOutstanding"));
-        assertEquals(1020.0f, loanSchedule.get(1).get("totalDueForPeriod"));
-        assertEquals(1010.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
-        assertEquals(10.0f, loanSchedule.get(1).get("totalWaivedForPeriod"));
-
-        loanSummary = this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "summary");
-        assertEquals(10.0f, loanSummary.get("penaltyChargesCharged"));
-        assertEquals(10.0f, loanSummary.get("penaltyChargesOutstanding"));
-        assertEquals(0.0f, loanSummary.get("penaltyChargesWaived"));
-        assertEquals(10.0f, loanSummary.get("feeChargesCharged"));
-        assertEquals(0.0f, loanSummary.get("feeChargesOutstanding"));
-        assertEquals(10.0f, loanSummary.get("feeChargesWaived"));
-        assertEquals(1010.0f, loanSummary.get("totalOutstanding"));
-        assertEquals(10.0f, loanSummary.get("totalWaived"));
-
-        this.loanTransactionHelper.undoWaiveChargesForLoan(loanID, waive2TransactionId, "");
-
-        transactions = this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "transactions");
-        assertEquals(10.0f, (float) transactions.get(3).get("amount"));
-        assertEquals(9, (int) ((HashMap) transactions.get(3).get("type")).get("id"));
-        assertEquals(true, transactions.get(3).get("manuallyReversed"));
-
-        journalEntries = this.journalEntryHelper.getJournalEntriesByTransactionId("L" + waive2TransactionId);
-        assertEquals(10.0f, (float) journalEntries.get(0).get("amount"));
-        assertEquals(expenseAccount.getAccountID(), (int) journalEntries.get(0).get("glAccountId"));
-        assertEquals("CREDIT", ((HashMap) journalEntries.get(0).get("entryType")).get("value"));
-        assertEquals(10.0f, (float) journalEntries.get(1).get("amount"));
-        assertEquals(assetAccount.getAccountID(), (int) journalEntries.get(1).get("glAccountId"));
-        assertEquals("DEBIT", ((HashMap) journalEntries.get(1).get("entryType")).get("value"));
-        assertEquals(10.0f, (float) journalEntries.get(2).get("amount"));
-        assertEquals(expenseAccount.getAccountID(), (int) journalEntries.get(2).get("glAccountId"));
-        assertEquals("DEBIT", ((HashMap) journalEntries.get(2).get("entryType")).get("value"));
-        assertEquals(10.0f, (float) journalEntries.get(3).get("amount"));
-        assertEquals(assetAccount.getAccountID(), (int) journalEntries.get(3).get("glAccountId"));
-        assertEquals("CREDIT", ((HashMap) journalEntries.get(3).get("entryType")).get("value"));
-
-        loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec, loanID);
-        assertEquals(2, loanSchedule.size());
-        assertEquals(10.0f, loanSchedule.get(1).get("feeChargesDue"));
-        assertEquals(10.0f, loanSchedule.get(1).get("feeChargesOutstanding"));
-        assertEquals(0.0f, loanSchedule.get(1).get("feeChargesWaived"));
-        assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesDue"));
-        assertEquals(0, loanSchedule.get(1).get("penaltyChargesWaived"));
-        assertEquals(10.0f, loanSchedule.get(1).get("penaltyChargesOutstanding"));
-        assertEquals(1020.0f, loanSchedule.get(1).get("totalDueForPeriod"));
-        assertEquals(1020.0f, loanSchedule.get(1).get("totalOutstandingForPeriod"));
-        assertEquals(0.0f, loanSchedule.get(1).get("totalWaivedForPeriod"));
-
-        loanSummary = this.loanTransactionHelper.getLoanDetail(this.requestSpec, this.responseSpec, loanID, "summary");
-        assertEquals(10.0f, loanSummary.get("penaltyChargesCharged"));
-        assertEquals(10.0f, loanSummary.get("penaltyChargesOutstanding"));
-        assertEquals(0.0f, loanSummary.get("penaltyChargesWaived"));
-        assertEquals(10.0f, loanSummary.get("feeChargesCharged"));
-        assertEquals(10.0f, loanSummary.get("feeChargesOutstanding"));
-        assertEquals(0.0f, loanSummary.get("feeChargesWaived"));
-        assertEquals(1020.0f, loanSummary.get("totalOutstanding"));
-        assertEquals(0.0f, loanSummary.get("totalWaived"));
-    }
-
-    @Test
-    public void chargeOff() {
-        try {
-            GlobalConfigurationHelper.updateIsAutomaticExternalIdGenerationEnabled(this.requestSpec, this.responseSpec, true);
-            GlobalConfigurationHelper.updateIsBusinessDateEnabled(this.requestSpec, this.responseSpec, true);
-            businessDateHelper.updateBusinessDate(new BusinessDateRequest().type(BusinessDateType.BUSINESS_DATE.getName())
-                    .date("2022.09.30").dateFormat("yyyy.MM.dd").locale("en"));
-            final Account assetAccount = this.accountHelper.createAssetAccount();
-            final Account incomeAccount = this.accountHelper.createIncomeAccount();
-            final Account expenseAccount = this.accountHelper.createExpenseAccount();
-            final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
-            String randomText = UUID.randomUUID().toString();
-            Integer chargeOffReasonId = CodeHelper.createChargeOffCodeValue(requestSpec, responseSpec, randomText, 1);
-            final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterestMultiDisbursement(assetAccount,
-                    incomeAccount, expenseAccount, overpaymentAccount);
-
-            final Integer clientID = ClientHelper.createClient(requestSpec, responseSpec, "01 January 2011");
-
-            final Integer loanID = applyForLoanApplication(clientID, loanProductID);
-
-            HashMap<String, Object> loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(requestSpec, responseSpec, loanID);
-            LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-            ResponseSpecification errorResponseSpec = new ResponseSpecBuilder().expectStatusCode(403).build();
-            LoanTransactionHelper errorLoanTransactionHelper = new LoanTransactionHelper(this.requestSpec, errorResponseSpec);
-
-            CallFailedRuntimeException exception = assertThrows(CallFailedRuntimeException.class, () -> {
-                errorLoanTransactionHelper.chargeOffLoan((long) loanID,
-                        new PostLoansLoanIdTransactionsRequest().transactionDate("4 September 2022").locale("en").dateFormat("dd MMMM yyyy")
-                                .externalId(UUID.randomUUID().toString()).chargeOffReasonId((long) chargeOffReasonId));
-            });
-
-            assertEquals(403, exception.getResponse().code());
-            assertTrue(exception.getMessage().contains("error.msg.loan.is.not.active"));
-
-            exception = assertThrows(CallFailedRuntimeException.class, () -> {
-                this.loanTransactionHelper.undoChargeOffLoan((long) loanID, new PostLoansLoanIdTransactionsRequest());
-            });
-            assertEquals(403, exception.getResponse().code());
-            assertTrue(exception.getMessage().contains("error.msg.loan.is.not.active"));
-
-            loanStatusHashMap = this.loanTransactionHelper.approveLoan("02 September 2022", loanID);
-            LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-            LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-            loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithTransactionAmount("02 September 2022", loanID, "1000");
-            loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithTransactionAmount("03 September 2022", loanID, "1000");
-            LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-            exception = assertThrows(CallFailedRuntimeException.class, () -> {
-                this.loanTransactionHelper.chargeOffLoan((long) loanID,
-                        new PostLoansLoanIdTransactionsRequest().transactionDate("1 October 2022").locale("en").dateFormat("dd MMMM yyyy")
-                                .chargeOffReasonId((long) chargeOffReasonId));
-            });
-            assertEquals(403, exception.getResponse().code());
-            assertTrue(exception.getMessage().contains("error.msg.loan.transaction.cannot.be.a.future.date"));
-
-            GetLoansLoanIdResponse loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-            assertTrue(loanDetails.getStatus().getActive());
-            assertEquals(2000.0, loanDetails.getSummary().getTotalOutstanding());
-            assertFalse(loanDetails.getChargedOff());
-            assertNull(loanDetails.getSummary().getChargeOffReasonId());
-            assertNull(loanDetails.getSummary().getChargeOffReason());
-            assertNull(loanDetails.getTimeline().getChargedOffOnDate());
-            assertNull(loanDetails.getTimeline().getChargedOffByUsername());
-            assertNull(loanDetails.getTimeline().getChargedOffByFirstname());
-            assertNull(loanDetails.getTimeline().getChargedOffByLastname());
-
-            Integer flatPenaltySpecifiedDueDate = ChargesHelper.createCharges(requestSpec, responseSpec,
-                    ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "3", true));
-            this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper
-                    .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatPenaltySpecifiedDueDate), "04 September 2022", "3"));
-            Integer chargeId = this.loanTransactionHelper.addChargesForLoan(loanID, LoanTransactionHelper
-                    .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatPenaltySpecifiedDueDate), "04 September 2022", "5"));
-
-            PostLoansLoanIdChargesChargeIdResponse waiveChargeResponse = this.loanTransactionHelper.waiveLoanCharge((long) loanID,
-                    (long) chargeId, new PostLoansLoanIdChargesChargeIdRequest());
-
-            String transactionExternalId = UUID.randomUUID().toString();
-            this.loanTransactionHelper.chargeOffLoan((long) loanID,
-                    new PostLoansLoanIdTransactionsRequest().transactionDate("4 September 2022").locale("en").dateFormat("dd MMMM yyyy")
-                            .externalId(transactionExternalId).chargeOffReasonId((long) chargeOffReasonId));
-
-            loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-            assertTrue(loanDetails.getStatus().getActive());
-            assertEquals(2003.0, loanDetails.getSummary().getTotalOutstanding());
-            assertTrue(loanDetails.getChargedOff());
-            assertEquals((long) chargeOffReasonId, loanDetails.getSummary().getChargeOffReasonId());
-            assertEquals(randomText, loanDetails.getSummary().getChargeOffReason());
-            assertEquals(LocalDate.of(2022, 9, 4), loanDetails.getTimeline().getChargedOffOnDate());
-            assertEquals("mifos", loanDetails.getTimeline().getChargedOffByUsername());
-            assertEquals("App", loanDetails.getTimeline().getChargedOffByFirstname());
-            assertEquals("Administrator", loanDetails.getTimeline().getChargedOffByLastname());
-
-            GetLoansLoanIdTransactions chargeOffTransaction = loanDetails.getTransactions().get(loanDetails.getTransactions().size() - 1);
-
-            assertEquals(2003.0, chargeOffTransaction.getAmount());
-            assertEquals(2000.0, chargeOffTransaction.getPrincipalPortion());
-            assertEquals(3.0, chargeOffTransaction.getPenaltyChargesPortion());
-
-            exception = assertThrows(CallFailedRuntimeException.class, () -> {
-                errorLoanTransactionHelper.chargeOffLoan((long) loanID,
-                        new PostLoansLoanIdTransactionsRequest().transactionDate("4 September 2022").locale("en").dateFormat("dd MMMM yyyy")
-                                .externalId(UUID.randomUUID().toString()).chargeOffReasonId((long) chargeOffReasonId));
-            });
-            assertEquals(403, exception.getResponse().code());
-            assertTrue(exception.getMessage().contains("error.msg.loan.is.already.charged.off"));
-
-            HashMap chargeAddingError = errorLoanTransactionHelper.addChargesForLoanGetFullResponse(loanID, LoanTransactionHelper
-                    .getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(flatPenaltySpecifiedDueDate), "04 September 2022", "3"));
-
-            assertEquals("error.msg.loan.is.charged.off",
-                    ((Map) ((List) chargeAddingError.get("errors")).get(0)).get("userMessageGlobalisationCode"));
-
-            exception = assertThrows(CallFailedRuntimeException.class, () -> {
-                errorLoanTransactionHelper.undoWaiveLoanCharge((long) loanID, waiveChargeResponse.getSubResourceId(),
-                        new PutChargeTransactionChangesRequest());
-            });
-            assertEquals(403, exception.getResponse().code());
-            assertTrue(exception.getMessage().contains("error.msg.transaction.date.cannot.be.earlier.than.charge.off.date"));
-
-            this.loanTransactionHelper.undoChargeOffLoan((long) loanID, new PostLoansLoanIdTransactionsRequest());
-
-            loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-            assertFalse(loanDetails.getChargedOff());
-            assertNull(loanDetails.getSummary().getChargeOffReasonId());
-            assertNull(loanDetails.getSummary().getChargeOffReason());
-            assertNull(loanDetails.getTimeline().getChargedOffOnDate());
-
-            GetLoansLoanIdTransactions undoChargeOffTransaction = loanDetails.getTransactions()
-                    .get(loanDetails.getTransactions().size() - 1);
-            assertTrue(undoChargeOffTransaction.getType().getChargeoff());
-            assertTrue(undoChargeOffTransaction.getManuallyReversed());
-
-            exception = assertThrows(CallFailedRuntimeException.class, () -> {
-                errorLoanTransactionHelper.undoChargeOffLoan((long) loanID, new PostLoansLoanIdTransactionsRequest());
-            });
-            assertEquals(403, exception.getResponse().code());
-            assertTrue(exception.getMessage().contains("error.msg.loan.is.not.charged.off"));
-
-            PostLoansLoanIdTransactionsResponse loanRepaymentResponse = this.loanTransactionHelper.makeLoanRepayment((long) loanID,
-                    new PostLoansLoanIdTransactionsRequest().dateFormat("dd MMMM yyyy").transactionDate("05 September 2022").locale("en")
-                            .transactionAmount(5.0));
-
-            exception = assertThrows(CallFailedRuntimeException.class, () -> {
-                errorLoanTransactionHelper.chargeOffLoan((long) loanID,
-                        new PostLoansLoanIdTransactionsRequest().transactionDate("04 September 2022").locale("en")
-                                .dateFormat("dd MMMM yyyy").externalId(UUID.randomUUID().toString())
-                                .chargeOffReasonId((long) chargeOffReasonId));
-            });
-
-            assertEquals(403, exception.getResponse().code());
-            assertTrue(exception.getMessage().contains("error.msg.loan.charge.off.is.before.than.the.last.user.transaction"));
-
-            this.loanTransactionHelper.chargeOffLoan((long) loanID,
-                    new PostLoansLoanIdTransactionsRequest().transactionDate("06 September 2022").locale("en").dateFormat("dd MMMM yyyy")
-                            .externalId(UUID.randomUUID().toString()).chargeOffReasonId((long) chargeOffReasonId));
-
-            loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-            chargeOffTransaction = loanDetails.getTransactions().get(loanDetails.getTransactions().size() - 1);
-
-            assertEquals(1998.0, chargeOffTransaction.getAmount());
-            assertEquals(1998.0, chargeOffTransaction.getPrincipalPortion());
-
-            this.loanTransactionHelper.makeLoanRepayment((long) loanID, new PostLoansLoanIdTransactionsRequest().dateFormat("dd MMMM yyyy")
-                    .transactionDate("07 September 2022").locale("en").transactionAmount(5.0));
-
-            exception = assertThrows(CallFailedRuntimeException.class, () -> {
-                errorLoanTransactionHelper.undoChargeOffLoan((long) loanID, new PostLoansLoanIdTransactionsRequest());
-            });
-            assertEquals(403, exception.getResponse().code());
-            assertTrue(exception.getMessage().contains("error.msg.loan.charge.off.is.not.the.last.user.transaction"));
-
-            exception = assertThrows(CallFailedRuntimeException.class, () -> {
-                errorLoanTransactionHelper.makeWriteoff((long) loanID, new PostLoansLoanIdTransactionsRequest().dateFormat("dd MMMM yyyy")
-                        .transactionDate("05 September 2022").locale("en"));
-            });
-            assertEquals(403, exception.getResponse().code());
-            assertTrue(exception.getMessage().contains("error.msg.transaction.date.cannot.be.earlier.than.charge.off.date"));
-
-            exception = assertThrows(CallFailedRuntimeException.class, () -> {
-                errorLoanTransactionHelper.closeLoan((long) loanID, new PostLoansLoanIdTransactionsRequest().dateFormat("dd MMMM yyyy")
-                        .transactionDate("05 September 2022").locale("en"));
-            });
-            assertEquals(403, exception.getResponse().code());
-            assertTrue(exception.getMessage().contains("error.msg.transaction.date.cannot.be.earlier.than.charge.off.date"));
-
-            exception = assertThrows(CallFailedRuntimeException.class, () -> {
-                errorLoanTransactionHelper.forecloseLoan((long) loanID, new PostLoansLoanIdTransactionsRequest().dateFormat("dd MMMM yyyy")
-                        .transactionDate("05 September 2022").locale("en"));
-            });
-            assertEquals(403, exception.getResponse().code());
-            assertTrue(exception.getMessage().contains("error.msg.transaction.date.cannot.be.earlier.than.charge.off.date"));
-
-            exception = assertThrows(CallFailedRuntimeException.class, () -> {
-                errorLoanTransactionHelper.closeRescheduledLoan((long) loanID, new PostLoansLoanIdTransactionsRequest()
-                        .dateFormat("dd MMMM yyyy").transactionDate("05 September 2022").locale("en"));
-            });
-            assertEquals(403, exception.getResponse().code());
-            assertTrue(exception.getMessage().contains("error.msg.loan.is.charged.off"));
-
-            HashMap disbursementDetailREsponse = (HashMap) errorLoanTransactionHelper.addAndDeleteDisbursementDetail(loanID, "1000",
-                    "03 September 2022", List.of(this.loanTransactionHelper.createTrancheDetail(null, "05 September 2022", "200")), "");
-
-            assertEquals("error.msg.loan.is.charged.off",
-                    ((Map) ((List) disbursementDetailREsponse.get("errors")).get(0)).get("userMessageGlobalisationCode"));
-
-            exception = assertThrows(CallFailedRuntimeException.class, () -> {
-                errorLoanTransactionHelper.undoLastDisbursalLoan((long) loanID, new PostLoansLoanIdRequest());
-            });
-            assertEquals(403, exception.getResponse().code());
-            assertTrue(exception.getMessage().contains("error.msg.loan.is.charged.off"));
-
-            exception = assertThrows(CallFailedRuntimeException.class, () -> {
-                errorLoanTransactionHelper.undoDisbursalLoan((long) loanID, new PostLoansLoanIdRequest());
-            });
-            assertEquals(403, exception.getResponse().code());
-            assertTrue(exception.getMessage().contains("error.msg.loan.is.charged.off"));
-
-            exception = assertThrows(CallFailedRuntimeException.class, () -> {
-                errorLoanTransactionHelper.makeCreditBalanceRefund((long) loanID, new PostLoansLoanIdTransactionsRequest()
-                        .dateFormat("dd MMMM yyyy").transactionDate("05 September 2022").locale("en").transactionAmount(5.0));
-            });
-            assertEquals(403, exception.getResponse().code());
-            assertTrue(exception.getMessage().contains("error.msg.transaction.date.cannot.be.earlier.than.charge.off.date"));
-
-            exception = assertThrows(CallFailedRuntimeException.class, () -> {
-                errorLoanTransactionHelper.disburseLoan((long) loanID,
-                        new PostLoansLoanIdRequest().actualDisbursementDate("4 September 2022").transactionAmount(new BigDecimal("10"))
-                                .locale("en").dateFormat("dd MMMM yyyy"));
-            });
-            assertEquals(403, exception.getResponse().code());
-            assertTrue(exception.getMessage().contains("error.msg.transaction.date.cannot.be.earlier.than.charge.off.date"));
-
-            this.loanTransactionHelper.makeLoanRepayment((long) loanID, new PostLoansLoanIdTransactionsRequest().dateFormat("dd MMMM yyyy")
-                    .transactionDate("07 September 2022").locale("en").transactionAmount(5000.0));
-
-            exception = assertThrows(CallFailedRuntimeException.class, () -> {
-                errorLoanTransactionHelper.makeRefundByCash((long) loanID, new PostLoansLoanIdTransactionsRequest()
-                        .dateFormat("dd MMMM yyyy").transactionDate("05 September 2022").locale("en").transactionAmount(5.0));
-            });
-            assertEquals(403, exception.getResponse().code());
-            assertTrue(exception.getMessage().contains("error.msg.transaction.date.cannot.be.earlier.than.charge.off.date"));
-
-            this.loanTransactionHelper.makeCreditBalanceRefund((long) loanID, new PostLoansLoanIdTransactionsRequest()
-                    .dateFormat("dd MMMM yyyy").transactionDate("08 September 2022").locale("en").transactionAmount(3007.0));
-        } finally {
-            GlobalConfigurationHelper.updateIsBusinessDateEnabled(requestSpec, responseSpec, Boolean.FALSE);
-        }
-    }
-
-    @Test
-    public void testCloseOpenMaturityDate() {
-        GlobalConfigurationHelper.updateIsAutomaticExternalIdGenerationEnabled(this.requestSpec, this.responseSpec, true);
-        final Account assetAccount = this.accountHelper.createAssetAccount();
-        final Account incomeAccount = this.accountHelper.createIncomeAccount();
-        final Account expenseAccount = this.accountHelper.createExpenseAccount();
-        final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
-
-        final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterest(assetAccount, incomeAccount, expenseAccount,
-                overpaymentAccount);
-
-        final Integer clientID = ClientHelper.createClient(requestSpec, responseSpec, "01 January 2011");
-
-        final Integer loanID = applyForLoanApplication(clientID, loanProductID);
-
-        HashMap<String, Object> loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(requestSpec, responseSpec, loanID);
-        LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-        loanStatusHashMap = this.loanTransactionHelper.approveLoan("02 September 2022", loanID);
-        LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-        LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-        loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("03 September 2022", loanID, "1000");
-        LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-        GetLoansLoanIdResponse loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-        LocalDate expectedMaturityDate = loanDetails.getTimeline().getExpectedMaturityDate();
-        LocalDate actualMaturityDate = loanDetails.getTimeline().getActualMaturityDate();
-
-        assertTrue(expectedMaturityDate.isEqual(actualMaturityDate));
-
-        this.loanTransactionHelper.makeRepayment("04 September 2022", Float.parseFloat("500"), loanID);
-        this.loanTransactionHelper.makeRepayment("05 September 2022", Float.parseFloat("700"), loanID);
-
-        loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-
-        expectedMaturityDate = loanDetails.getTimeline().getExpectedMaturityDate();
-        actualMaturityDate = loanDetails.getTimeline().getActualMaturityDate();
-
-        assertNotNull(expectedMaturityDate);
-        assertNull(actualMaturityDate);
-
-        this.loanTransactionHelper.reverseLoanTransaction((long) loanID, loanDetails.getTransactions().get(1).getId(),
-                new PostLoansLoanIdTransactionsTransactionIdRequest().dateFormat("dd MMMM yyyy").transactionDate("04 September 2022")
-                        .transactionAmount(0.0).locale("en"));
-
-        loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-
-        expectedMaturityDate = loanDetails.getTimeline().getExpectedMaturityDate();
-        actualMaturityDate = loanDetails.getTimeline().getActualMaturityDate();
-
-        assertNotNull(expectedMaturityDate);
-        assertNotNull(actualMaturityDate);
-
-        assertTrue(expectedMaturityDate.isEqual(actualMaturityDate));
-
-    }
-
-    @Test
-    public void testReverseReplay() {
-        try {
-            GlobalConfigurationHelper.updateIsAutomaticExternalIdGenerationEnabled(this.requestSpec, this.responseSpec, true);
-            final Account assetAccount = this.accountHelper.createAssetAccount();
-            final Account incomeAccount = this.accountHelper.createIncomeAccount();
-            final Account expenseAccount = this.accountHelper.createExpenseAccount();
-            final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
-
-            final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterest(assetAccount, incomeAccount,
-                    expenseAccount, overpaymentAccount);
-
-            final Integer clientID = ClientHelper.createClient(requestSpec, responseSpec, "01 January 2011");
-
-            final Integer loanID = applyForLoanApplication(clientID, loanProductID);
-
-            HashMap<String, Object> loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(requestSpec, responseSpec, loanID);
-            LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-            loanStatusHashMap = this.loanTransactionHelper.approveLoan("02 September 2022", loanID);
-            LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-            LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-            loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("03 September 2022", loanID, "1000");
-            LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-            this.loanTransactionHelper.makeRepayment("04 September 2022", Float.parseFloat("500"), loanID);
-            this.loanTransactionHelper.makeRepayment("05 September 2022", Float.parseFloat("10"), loanID);
-            this.loanTransactionHelper.makeRepayment("06 September 2022", Float.parseFloat("400"), loanID);
-            this.loanTransactionHelper.makeRepayment("07 September 2022", Float.parseFloat("390"), loanID);
-
-            GetLoansLoanIdResponse loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-
-            assertEquals(300.0, loanDetails.getTotalOverpaid());
-
-            assertEquals(500.0, loanDetails.getTransactions().get(1).getAmount());
-            assertEquals(500.0, loanDetails.getTransactions().get(1).getPrincipalPortion());
-            assertEquals(LocalDate.of(2022, 9, 4), loanDetails.getTransactions().get(1).getDate());
-
-            assertEquals(10.0, loanDetails.getTransactions().get(2).getAmount());
-            assertEquals(10.0, loanDetails.getTransactions().get(2).getPrincipalPortion());
-            assertEquals(LocalDate.of(2022, 9, 5), loanDetails.getTransactions().get(2).getDate());
-
-            assertEquals(400.0, loanDetails.getTransactions().get(3).getAmount());
-            assertEquals(400.0, loanDetails.getTransactions().get(3).getPrincipalPortion());
-            assertEquals(LocalDate.of(2022, 9, 6), loanDetails.getTransactions().get(3).getDate());
-
-            assertEquals(390.0, loanDetails.getTransactions().get(4).getAmount());
-            assertEquals(90.0, loanDetails.getTransactions().get(4).getPrincipalPortion());
-            assertEquals(300.0, loanDetails.getTransactions().get(4).getOverpaymentPortion());
-            assertEquals(LocalDate.of(2022, 9, 7), loanDetails.getTransactions().get(4).getDate());
-
-            this.loanTransactionHelper.reverseLoanTransaction((long) loanID, loanDetails.getTransactions().get(2).getId(),
-                    new PostLoansLoanIdTransactionsTransactionIdRequest().dateFormat("dd MMMM yyyy").transactionDate("05 September 2022")
-                            .transactionAmount(0.0).locale("en"));
-
-            loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-
-            assertEquals(290.0, loanDetails.getTotalOverpaid());
-
-            assertEquals(500.0, loanDetails.getTransactions().get(1).getAmount());
-            assertEquals(500.0, loanDetails.getTransactions().get(1).getPrincipalPortion());
-            assertEquals(LocalDate.of(2022, 9, 4), loanDetails.getTransactions().get(1).getDate());
-
-            assertEquals(10.0, loanDetails.getTransactions().get(2).getAmount());
-            assertEquals(10.0, loanDetails.getTransactions().get(2).getPrincipalPortion());
-            assertEquals(LocalDate.of(2022, 9, 5), loanDetails.getTransactions().get(2).getDate());
-            assertTrue(loanDetails.getTransactions().get(2).getManuallyReversed());
-
-            assertEquals(400.0, loanDetails.getTransactions().get(3).getAmount());
-            assertEquals(400.0, loanDetails.getTransactions().get(3).getPrincipalPortion());
-            assertEquals(LocalDate.of(2022, 9, 6), loanDetails.getTransactions().get(3).getDate());
-
-            assertEquals(390.0, loanDetails.getTransactions().get(4).getAmount());
-            assertEquals(100.0, loanDetails.getTransactions().get(4).getPrincipalPortion());
-            assertEquals(290.0, loanDetails.getTransactions().get(4).getOverpaymentPortion());
-            assertEquals(LocalDate.of(2022, 9, 7), loanDetails.getTransactions().get(4).getDate());
-
-            this.loanTransactionHelper.reverseLoanTransaction((long) loanID, loanDetails.getTransactions().get(1).getId(),
-                    new PostLoansLoanIdTransactionsTransactionIdRequest().dateFormat("dd MMMM yyyy").transactionDate("05 September 2022")
-                            .transactionAmount(0.0).locale("en"));
-
-            loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-
-            assertEquals(210.0, loanDetails.getSummary().getTotalOutstanding());
-
-            assertEquals(500.0, loanDetails.getTransactions().get(1).getAmount());
-            assertEquals(500.0, loanDetails.getTransactions().get(1).getPrincipalPortion());
-            assertEquals(LocalDate.of(2022, 9, 4), loanDetails.getTransactions().get(1).getDate());
-            assertTrue(loanDetails.getTransactions().get(2).getManuallyReversed());
-
-            assertEquals(10.0, loanDetails.getTransactions().get(2).getAmount());
-            assertEquals(10.0, loanDetails.getTransactions().get(2).getPrincipalPortion());
-            assertEquals(LocalDate.of(2022, 9, 5), loanDetails.getTransactions().get(2).getDate());
-            assertTrue(loanDetails.getTransactions().get(2).getManuallyReversed());
-
-            assertEquals(400.0, loanDetails.getTransactions().get(3).getAmount());
-            assertEquals(400.0, loanDetails.getTransactions().get(3).getPrincipalPortion());
-            assertEquals(LocalDate.of(2022, 9, 6), loanDetails.getTransactions().get(3).getDate());
-
-            assertEquals(390.0, loanDetails.getTransactions().get(4).getAmount());
-            assertEquals(390.0, loanDetails.getTransactions().get(4).getPrincipalPortion());
-            assertEquals(LocalDate.of(2022, 9, 7), loanDetails.getTransactions().get(4).getDate());
-
-            this.loanTransactionHelper.makeRepayment("04 September 2022", Float.parseFloat("500"), loanID);
-
-            loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-
-            assertEquals(290.0, loanDetails.getTotalOverpaid());
-
-            assertEquals(500.0, loanDetails.getTransactions().get(1).getAmount());
-            assertEquals(500.0, loanDetails.getTransactions().get(1).getPrincipalPortion());
-            assertEquals(LocalDate.of(2022, 9, 4), loanDetails.getTransactions().get(1).getDate());
-            assertTrue(loanDetails.getTransactions().get(1).getManuallyReversed());
-
-            assertEquals(500.0, loanDetails.getTransactions().get(2).getAmount());
-            assertEquals(500.0, loanDetails.getTransactions().get(2).getPrincipalPortion());
-            assertEquals(LocalDate.of(2022, 9, 4), loanDetails.getTransactions().get(2).getDate());
-
-            assertEquals(10.0, loanDetails.getTransactions().get(3).getAmount());
-            assertEquals(10.0, loanDetails.getTransactions().get(3).getPrincipalPortion());
-            assertEquals(LocalDate.of(2022, 9, 5), loanDetails.getTransactions().get(3).getDate());
-            assertTrue(loanDetails.getTransactions().get(3).getManuallyReversed());
-
-            assertEquals(400.0, loanDetails.getTransactions().get(4).getAmount());
-            assertEquals(400.0, loanDetails.getTransactions().get(4).getPrincipalPortion());
-            assertEquals(LocalDate.of(2022, 9, 6), loanDetails.getTransactions().get(4).getDate());
-
-            assertEquals(390.0, loanDetails.getTransactions().get(5).getAmount());
-            assertEquals(100.0, loanDetails.getTransactions().get(5).getPrincipalPortion());
-            assertEquals(290.0, loanDetails.getTransactions().get(5).getOverpaymentPortion());
-            assertEquals(LocalDate.of(2022, 9, 7), loanDetails.getTransactions().get(5).getDate());
-        } finally {
-            GlobalConfigurationHelper.updateIsAutomaticExternalIdGenerationEnabled(this.requestSpec, this.responseSpec, false);
-        }
-    }
-
-    @Test
-    public void testCreditBalanceRefundAfterMaturityWithReverseReplayOfRepayments() {
-        try {
-            GlobalConfigurationHelper.updateIsAutomaticExternalIdGenerationEnabled(this.requestSpec, this.responseSpec, true);
-            GlobalConfigurationHelper.updateIsBusinessDateEnabled(this.requestSpec, this.responseSpec, true);
-            businessDateHelper.updateBusinessDate(new BusinessDateRequest().type(BusinessDateType.BUSINESS_DATE.getName())
-                    .date("2022.10.10").dateFormat("yyyy.MM.dd").locale("en"));
-
-            final Account assetAccount = this.accountHelper.createAssetAccount();
-            final Account incomeAccount = this.accountHelper.createIncomeAccount();
-            final Account expenseAccount = this.accountHelper.createExpenseAccount();
-            final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
-
-            final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterest(assetAccount, incomeAccount,
-                    expenseAccount, overpaymentAccount);
-
-            final Integer clientID = ClientHelper.createClient(requestSpec, responseSpec, "01 January 2011");
-
-            final Integer loanID = applyForLoanApplication(clientID, loanProductID);
-
-            HashMap<String, Object> loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(requestSpec, responseSpec, loanID);
-            LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-            loanStatusHashMap = this.loanTransactionHelper.approveLoan("02 September 2022", loanID);
-            LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-            LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-            loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("03 September 2022", loanID, "1000");
-            LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-            this.loanTransactionHelper.makeRepayment("04 September 2022", Float.parseFloat("100"), loanID);
-            this.loanTransactionHelper.makeRepayment("05 September 2022", Float.parseFloat("1100"), loanID);
-
-            GetLoansLoanIdResponse loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-            assertEquals(200.0, loanDetails.getTotalOverpaid());
-            assertTrue(loanDetails.getStatus().getOverpaid());
-
-            this.loanTransactionHelper.makeCreditBalanceRefund((long) loanID, new PostLoansLoanIdTransactionsRequest()
-                    .transactionAmount(200.0).transactionDate("10 October 2022").dateFormat("dd MMMM yyyy").locale("en").paymentTypeId(1L));
-
-            loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-            assertTrue(loanDetails.getStatus().getClosedObligationsMet());
-
-            assertEquals(2, loanDetails.getRepaymentSchedule().getPeriods().size());
-            assertEquals(1000, loanDetails.getRepaymentSchedule().getPeriods().get(1).getPrincipalDue());
-
-            assertEquals(100.0, loanDetails.getTransactions().get(1).getAmount());
-            assertEquals(100.0, loanDetails.getTransactions().get(1).getPrincipalPortion());
-            assertEquals(LocalDate.of(2022, 9, 4), loanDetails.getTransactions().get(1).getDate());
-            assertEquals(900.0, loanDetails.getTransactions().get(1).getOutstandingLoanBalance());
-            assertEquals(1100.0, loanDetails.getTransactions().get(2).getAmount());
-            assertEquals(900.0, loanDetails.getTransactions().get(2).getPrincipalPortion());
-            assertEquals(200.0, loanDetails.getTransactions().get(2).getOverpaymentPortion());
-            assertEquals(LocalDate.of(2022, 9, 5), loanDetails.getTransactions().get(2).getDate());
-            assertEquals(0.0, loanDetails.getTransactions().get(2).getOutstandingLoanBalance());
-            assertEquals(200.0, loanDetails.getTransactions().get(3).getAmount());
-            assertEquals(200.0, loanDetails.getTransactions().get(3).getOverpaymentPortion());
-            assertEquals(LocalDate.of(2022, 10, 10), loanDetails.getTransactions().get(3).getDate());
-            assertEquals(0.0, loanDetails.getTransactions().get(3).getOutstandingLoanBalance());
-            assertEquals(1L, loanDetails.getTransactions().get(3).getPaymentDetailData().getPaymentType().getId());
-            GetJournalEntriesTransactionIdResponse journalEntriesForTransaction = journalEntryHelper
-                    .getJournalEntries("L" + loanDetails.getTransactions().get(3).getId());
-            List<JournalEntryTransactionItem> journalItems = journalEntriesForTransaction.getPageItems();
-            assertEquals(2, journalItems.size());
-            assertEquals(200.0,
-                    journalItems.stream()
-                            .filter(j -> "DEBIT".equalsIgnoreCase(j.getEntryType().getValue())
-                                    && j.getGlAccountId().equals(overpaymentAccount.getAccountID().longValue()))
-                            .findFirst().get().getAmount());
-            assertEquals(200.0, journalItems.stream().filter(j -> "CREDIT".equalsIgnoreCase(j.getEntryType().getValue())
-                    && j.getGlAccountId().equals(assetAccount.getAccountID().longValue())).findFirst().get().getAmount());
-
-            this.loanTransactionHelper.reverseLoanTransaction(loanDetails.getId(), loanDetails.getTransactions().get(1).getId(),
-                    new PostLoansLoanIdTransactionsTransactionIdRequest().dateFormat("dd MMMM yyyy").transactionAmount(0.0)
-                            .transactionDate("10 October 2022").locale("en"));
-
-            loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-
-            assertEquals(100.0, loanDetails.getTransactions().get(1).getAmount());
-            assertEquals(100.0, loanDetails.getTransactions().get(1).getPrincipalPortion());
-            assertEquals(LocalDate.of(2022, 9, 4), loanDetails.getTransactions().get(1).getDate());
-            assertTrue(loanDetails.getTransactions().get(1).getManuallyReversed());
-
-            assertEquals(1100.0, loanDetails.getTransactions().get(2).getAmount());
-            assertEquals(1000.0, loanDetails.getTransactions().get(2).getPrincipalPortion());
-            assertEquals(100.0, loanDetails.getTransactions().get(2).getOverpaymentPortion());
-            assertEquals(LocalDate.of(2022, 9, 5), loanDetails.getTransactions().get(2).getDate());
-            assertEquals(0.0, loanDetails.getTransactions().get(2).getOutstandingLoanBalance());
-            assertEquals(1, loanDetails.getTransactions().get(2).getTransactionRelations().size());
-
-            assertEquals(200.0, loanDetails.getTransactions().get(3).getAmount());
-            assertEquals(100.0, loanDetails.getTransactions().get(3).getPrincipalPortion());
-            assertEquals(100.0, loanDetails.getTransactions().get(3).getOverpaymentPortion());
-            assertEquals(100.0, loanDetails.getTransactions().get(3).getOutstandingLoanBalance());
-            assertEquals(LocalDate.of(2022, 10, 10), loanDetails.getTransactions().get(3).getDate());
-            assertEquals(1, loanDetails.getTransactions().get(3).getTransactionRelations().size());
-
-            assertTrue(loanDetails.getStatus().getActive());
-
-            assertEquals(3, loanDetails.getRepaymentSchedule().getPeriods().size());
-            assertEquals(1000, loanDetails.getRepaymentSchedule().getPeriods().get(1).getPrincipalDue());
-            assertTrue(loanDetails.getRepaymentSchedule().getPeriods().get(1).getComplete());
-            assertEquals(200, loanDetails.getRepaymentSchedule().getPeriods().get(2).getPrincipalDue());
-            assertFalse(loanDetails.getRepaymentSchedule().getPeriods().get(2).getComplete());
-            assertEquals(100.0, loanDetails.getRepaymentSchedule().getPeriods().get(2).getPrincipalPaid());
-            assertEquals(100.0, loanDetails.getRepaymentSchedule().getPeriods().get(2).getPrincipalOutstanding());
-
-            journalEntriesForTransaction = journalEntryHelper.getJournalEntries("L" + loanDetails.getTransactions().get(3).getId());
-            journalItems = journalEntriesForTransaction.getPageItems();
-            assertEquals(3, journalItems.size());
-            assertEquals(1,
-                    journalItems.stream().filter(item -> item.getAmount() == 200.0d)
-                            .filter(j -> "CREDIT".equalsIgnoreCase(j.getEntryType().getValue())
-                                    && j.getGlAccountId().equals(assetAccount.getAccountID().longValue()))
-                            .count());
-            assertEquals(1,
-                    journalItems.stream().filter(item -> item.getAmount() == 100.0d)
-                            .filter(j -> "DEBIT".equalsIgnoreCase(j.getEntryType().getValue())
-                                    && j.getGlAccountId().equals(overpaymentAccount.getAccountID().longValue()))
-                            .count());
-            assertEquals(1,
-                    journalItems.stream().filter(item -> item.getAmount() == 100.0d)
-                            .filter(j -> "DEBIT".equalsIgnoreCase(j.getEntryType().getValue())
-                                    && j.getGlAccountId().equals(assetAccount.getAccountID().longValue()))
-                            .count());
-
-        } finally {
-            GlobalConfigurationHelper.updateIsAutomaticExternalIdGenerationEnabled(this.requestSpec, this.responseSpec, false);
-            GlobalConfigurationHelper.updateIsBusinessDateEnabled(this.requestSpec, this.responseSpec, false);
-        }
-    }
-
-    @Test
-    public void testCreditBalanceRefundBeforeMaturityWithReverseReplayOfRepaymentsAndRefund() {
-        try {
-            GlobalConfigurationHelper.updateIsAutomaticExternalIdGenerationEnabled(this.requestSpec, this.responseSpec, true);
-            GlobalConfigurationHelper.updateIsBusinessDateEnabled(this.requestSpec, this.responseSpec, true);
-            businessDateHelper.updateBusinessDate(new BusinessDateRequest().type(BusinessDateType.BUSINESS_DATE.getName())
-                    .date("2022.10.10").dateFormat("yyyy.MM.dd").locale("en"));
-
-            final Account assetAccount = this.accountHelper.createAssetAccount();
-            final Account incomeAccount = this.accountHelper.createIncomeAccount();
-            final Account expenseAccount = this.accountHelper.createExpenseAccount();
-            final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
-
-            final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterest(assetAccount, incomeAccount,
-                    expenseAccount, overpaymentAccount);
-
-            final Integer clientID = ClientHelper.createClient(requestSpec, responseSpec, "01 January 2011");
-
-            final Integer loanID = applyForLoanApplication(clientID, loanProductID);
-
-            HashMap<String, Object> loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(requestSpec, responseSpec, loanID);
-            LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-            loanStatusHashMap = this.loanTransactionHelper.approveLoan("02 September 2022", loanID);
-            LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-            LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-            loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("03 September 2022", loanID, "1000");
-            LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-            this.loanTransactionHelper.makeRepayment("04 September 2022", Float.parseFloat("500"), loanID);
-            this.loanTransactionHelper.makeRepayment("05 September 2022", Float.parseFloat("700"), loanID);
-
-            GetLoansLoanIdResponse loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-            assertEquals(200.0, loanDetails.getTotalOverpaid());
-            assertTrue(loanDetails.getStatus().getOverpaid());
-
-            this.loanTransactionHelper.makeCreditBalanceRefund((long) loanID, new PostLoansLoanIdTransactionsRequest()
-                    .transactionAmount(200.0).transactionDate("06 September 2022").dateFormat("dd MMMM yyyy").locale("en"));
-
-            this.loanTransactionHelper.makeMerchantIssuedRefund((long) loanID, new PostLoansLoanIdTransactionsRequest().locale("en")
-                    .dateFormat("dd MMMM yyyy").transactionDate("07 September 2022").transactionAmount(500.0));
-
-            this.loanTransactionHelper.makeCreditBalanceRefund((long) loanID, new PostLoansLoanIdTransactionsRequest()
-                    .transactionAmount(500.0).transactionDate("08 September 2022").dateFormat("dd MMMM yyyy").locale("en"));
-
-            loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-            assertTrue(loanDetails.getStatus().getClosedObligationsMet());
-
-            assertEquals(2, loanDetails.getRepaymentSchedule().getPeriods().size());
-            assertEquals(1000, loanDetails.getRepaymentSchedule().getPeriods().get(1).getPrincipalDue());
-
-            assertEquals(500.0, loanDetails.getTransactions().get(1).getAmount());
-            assertEquals(500.0, loanDetails.getTransactions().get(1).getPrincipalPortion());
-            assertEquals(LocalDate.of(2022, 9, 4), loanDetails.getTransactions().get(1).getDate());
-            assertEquals(500.0, loanDetails.getTransactions().get(1).getOutstandingLoanBalance());
-
-            assertEquals(700.0, loanDetails.getTransactions().get(2).getAmount());
-            assertEquals(500.0, loanDetails.getTransactions().get(2).getPrincipalPortion());
-            assertEquals(200.0, loanDetails.getTransactions().get(2).getOverpaymentPortion());
-            assertEquals(LocalDate.of(2022, 9, 5), loanDetails.getTransactions().get(2).getDate());
-            assertEquals(0.0, loanDetails.getTransactions().get(2).getOutstandingLoanBalance());
-
-            assertEquals(200.0, loanDetails.getTransactions().get(3).getAmount());
-            assertEquals(200.0, loanDetails.getTransactions().get(3).getOverpaymentPortion());
-            assertEquals(LocalDate.of(2022, 9, 6), loanDetails.getTransactions().get(3).getDate());
-            assertEquals(0.0, loanDetails.getTransactions().get(3).getOutstandingLoanBalance());
-
-            assertEquals(500.0, loanDetails.getTransactions().get(4).getAmount());
-            assertEquals(500.0, loanDetails.getTransactions().get(4).getOverpaymentPortion());
-            assertEquals(LocalDate.of(2022, 9, 7), loanDetails.getTransactions().get(4).getDate());
-            assertEquals(0.0, loanDetails.getTransactions().get(4).getOutstandingLoanBalance());
-
-            assertEquals(500.0, loanDetails.getTransactions().get(5).getAmount());
-            assertEquals(500.0, loanDetails.getTransactions().get(5).getOverpaymentPortion());
-            assertEquals(LocalDate.of(2022, 9, 8), loanDetails.getTransactions().get(5).getDate());
-            assertEquals(0.0, loanDetails.getTransactions().get(5).getOutstandingLoanBalance());
-
-            this.loanTransactionHelper.reverseLoanTransaction(loanDetails.getId(), loanDetails.getTransactions().get(2).getId(),
-                    new PostLoansLoanIdTransactionsTransactionIdRequest().dateFormat("dd MMMM yyyy").transactionAmount(0.0)
-                            .transactionDate("07 September 2022").locale("en"));
-
-            loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-
-            assertEquals(500.0, loanDetails.getTransactions().get(1).getAmount());
-            assertEquals(500.0, loanDetails.getTransactions().get(1).getPrincipalPortion());
-            assertEquals(LocalDate.of(2022, 9, 4), loanDetails.getTransactions().get(1).getDate());
-            assertEquals(500.0, loanDetails.getTransactions().get(1).getOutstandingLoanBalance());
-
-            assertEquals(700.0, loanDetails.getTransactions().get(2).getAmount());
-            assertEquals(500.0, loanDetails.getTransactions().get(2).getPrincipalPortion());
-            assertEquals(200.0, loanDetails.getTransactions().get(2).getOverpaymentPortion());
-            assertEquals(LocalDate.of(2022, 9, 5), loanDetails.getTransactions().get(2).getDate());
-            assertEquals(0.0, loanDetails.getTransactions().get(2).getOutstandingLoanBalance());
-            assertTrue(loanDetails.getTransactions().get(2).getManuallyReversed());
-
-            assertEquals(200.0, loanDetails.getTransactions().get(3).getAmount());
-            assertEquals(200.0, loanDetails.getTransactions().get(3).getPrincipalPortion());
-            assertEquals(LocalDate.of(2022, 9, 6), loanDetails.getTransactions().get(3).getDate());
-            assertEquals(700.0, loanDetails.getTransactions().get(3).getOutstandingLoanBalance());
-            assertEquals(1, loanDetails.getTransactions().get(3).getTransactionRelations().size());
-
-            assertEquals(500.0, loanDetails.getTransactions().get(4).getAmount());
-            assertEquals(500.0, loanDetails.getTransactions().get(4).getPrincipalPortion());
-            assertEquals(LocalDate.of(2022, 9, 7), loanDetails.getTransactions().get(4).getDate());
-            assertEquals(200.0, loanDetails.getTransactions().get(4).getOutstandingLoanBalance());
-            assertEquals(1, loanDetails.getTransactions().get(4).getTransactionRelations().size());
-
-            assertEquals(500.0, loanDetails.getTransactions().get(5).getAmount());
-            assertEquals(500.0, loanDetails.getTransactions().get(5).getPrincipalPortion());
-            assertEquals(LocalDate.of(2022, 9, 8), loanDetails.getTransactions().get(5).getDate());
-            assertEquals(700.0, loanDetails.getTransactions().get(5).getOutstandingLoanBalance());
-            assertEquals(1, loanDetails.getTransactions().get(5).getTransactionRelations().size());
-
-            assertTrue(loanDetails.getStatus().getActive());
-
-            assertEquals(2, loanDetails.getRepaymentSchedule().getPeriods().size());
-            assertEquals(1700, loanDetails.getRepaymentSchedule().getPeriods().get(1).getPrincipalDue());
-            assertFalse(loanDetails.getRepaymentSchedule().getPeriods().get(1).getComplete());
-            assertEquals(1000.0, loanDetails.getRepaymentSchedule().getPeriods().get(1).getPrincipalPaid());
-            assertEquals(700.0, loanDetails.getRepaymentSchedule().getPeriods().get(1).getPrincipalOutstanding());
-
-        } finally {
-            GlobalConfigurationHelper.updateIsAutomaticExternalIdGenerationEnabled(this.requestSpec, this.responseSpec, false);
-            GlobalConfigurationHelper.updateIsBusinessDateEnabled(this.requestSpec, this.responseSpec, false);
-        }
-    }
-
-    @Test
-    public void accrualIsCalculatedWhenTheLoanIsClosed() {
-        try {
-            GlobalConfigurationHelper.updateIsAutomaticExternalIdGenerationEnabled(this.requestSpec, this.responseSpec, true);
-            GlobalConfigurationHelper.updateIsBusinessDateEnabled(this.requestSpec, this.responseSpec, true);
-            businessDateHelper.updateBusinessDate(new BusinessDateRequest().type(BusinessDateType.BUSINESS_DATE.getName())
-                    .date("2022.10.10").dateFormat("yyyy.MM.dd").locale("en"));
-
-            final Account assetAccount = this.accountHelper.createAssetAccount();
-            final Account incomeAccount = this.accountHelper.createIncomeAccount();
-            final Account expenseAccount = this.accountHelper.createExpenseAccount();
-            final Account overpaymentAccount = this.accountHelper.createLiabilityAccount();
-
-            final Integer loanProductID = createLoanProductWithPeriodicAccrualAccountingNoInterest(assetAccount, incomeAccount,
-                    expenseAccount, overpaymentAccount);
-
-            final Integer clientID = ClientHelper.createClient(requestSpec, responseSpec, "01 January 2011");
-            List<HashMap> charges = new ArrayList<>();
-            Integer installmentFee = ChargesHelper.createCharges(requestSpec, responseSpec,
-                    ChargesHelper.getLoanInstallmentJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "10", false));
-            addCharges(charges, installmentFee, "10", null);
-
-            final Integer loanID = applyForLoanApplication(clientID, loanProductID, charges);
-
-            HashMap<String, Object> loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(requestSpec, responseSpec, loanID);
-            LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
-
-            loanStatusHashMap = this.loanTransactionHelper.approveLoan("02 September 2022", loanID);
-            LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
-            LoanStatusChecker.verifyLoanIsWaitingForDisbursal(loanStatusHashMap);
-
-            loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("03 September 2022", loanID, "1000");
-            LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-
-            this.loanTransactionHelper.makeRepayment("04 September 2022", Float.parseFloat("5"), loanID);
-
-            this.periodicAccrualAccountingHelper.runPeriodicAccrualAccounting("04 September 2022");
-
-            Integer penalty = ChargesHelper.createCharges(requestSpec, responseSpec,
-                    ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "11", true));
-            LocalDate targetDate = LocalDate.of(2022, 9, 6);
-            final String penaltyCharge1AddedDate = dateFormatter.format(targetDate);
-
-            Integer penalty1LoanChargeId = this.loanTransactionHelper.addChargesForLoan(loanID,
-                    LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(penalty), penaltyCharge1AddedDate, "11"));
-
-            this.loanTransactionHelper.waiveLoanCharge((long) loanID, (long) penalty1LoanChargeId,
-                    new PostLoansLoanIdChargesChargeIdRequest());
-
-            this.loanTransactionHelper.makeRepayment("08 September 2022", Float.parseFloat("1010"), loanID);
-
-            GetLoansLoanIdResponse loanDetails = this.loanTransactionHelper.getLoanDetails((long) loanID);
-
-            GetLoansLoanIdTransactions lastAccrualTransaction = loanDetails.getTransactions().stream()
-                    .filter(t -> Boolean.TRUE.equals(t.getType().getAccrual())).findFirst().get();
-            assertEquals(15, lastAccrualTransaction.getAmount());
-            assertEquals(5, lastAccrualTransaction.getPenaltyChargesPortion());
-            assertEquals(10, lastAccrualTransaction.getFeeChargesPortion());
-
-            GetLoansLoanIdTransactionsTransactionIdResponse accrualTransactionDetails = this.loanTransactionHelper
-                    .getLoanTransactionDetails((long) loanID, lastAccrualTransaction.getId());
-
-            assertEquals(2, accrualTransactionDetails.getLoanChargePaidByList().size());
-            accrualTransactionDetails.getLoanChargePaidByList().forEach(loanCharge -> {
-                if (loanCharge.getChargeId().equals((long) penalty1LoanChargeId)) {
-                    assertEquals(5, loanCharge.getAmount());
-                } else {
-                    assertEquals(10, loanCharge.getAmount());
-                }
-            });
-
-        } finally {
-            GlobalConfigurationHelper.updateIsAutomaticExternalIdGenerationEnabled(this.requestSpec, this.responseSpec, false);
-            GlobalConfigurationHelper.updateIsBusinessDateEnabled(this.requestSpec, this.responseSpec, false);
-        }
-    }
-
-    private Integer applyForLoanApplication(final Integer clientID, final Integer loanProductID, final List<HashMap> charges) {
-        LOG.info("--------------------------------APPLYING FOR LOAN APPLICATION--------------------------------");
-        final String loanApplicationJSON = new LoanApplicationTestBuilder().withPrincipal("1000").withLoanTermFrequency("1")
-                .withLoanTermFrequencyAsMonths().withNumberOfRepayments("1").withRepaymentEveryAfter("1")
-                .withRepaymentFrequencyTypeAsMonths().withInterestRatePerPeriod("0").withInterestTypeAsFlatBalance()
-                .withAmortizationTypeAsEqualPrincipalPayments().withInterestCalculationPeriodTypeSameAsRepaymentPeriod()
-                .withCharges(charges).withExpectedDisbursementDate("03 September 2022").withSubmittedOnDate("01 September 2022")
-                .withLoanType("individual").build(clientID.toString(), loanProductID.toString(), null);
-        return this.loanTransactionHelper.getLoanId(loanApplicationJSON);
-    }
-
-    private Integer applyForLoanApplication(final Integer clientID, final Integer loanProductID) {
-        LOG.info("--------------------------------APPLYING FOR LOAN APPLICATION--------------------------------");
-        final String loanApplicationJSON = new LoanApplicationTestBuilder().withPrincipal("1000").withLoanTermFrequency("1")
-                .withLoanTermFrequencyAsMonths().withNumberOfRepayments("1").withRepaymentEveryAfter("1")
-                .withRepaymentFrequencyTypeAsMonths().withInterestRatePerPeriod("0").withInterestTypeAsFlatBalance()
-                .withAmortizationTypeAsEqualPrincipalPayments().withInterestCalculationPeriodTypeSameAsRepaymentPeriod()
-                .withExpectedDisbursementDate("03 September 2022").withSubmittedOnDate("01 September 2022").withLoanType("individual")
-                .build(clientID.toString(), loanProductID.toString(), null);
-        return this.loanTransactionHelper.getLoanId(loanApplicationJSON);
-    }
-
-    private Integer createLoanProductWithPeriodicAccrualAccountingNoInterest(final Account... accounts) {
-        LOG.info("------------------------------CREATING NEW LOAN PRODUCT ---------------------------------------");
-        final String loanProductJSON = new LoanProductTestBuilder().withPrincipal("1000").withRepaymentTypeAsMonth()
-                .withRepaymentAfterEvery("1").withNumberOfRepayments("1").withRepaymentTypeAsMonth().withinterestRatePerPeriod("0")
-                .withInterestRateFrequencyTypeAsMonths().withAmortizationTypeAsEqualPrincipalPayment().withInterestTypeAsFlat()
-                .withAccountingRulePeriodicAccrual(accounts).withDaysInMonth("30").withDaysInYear("365").withMoratorium("0", "0")
-                .build(null);
-        return this.loanTransactionHelper.getLoanProductId(loanProductJSON);
-    }
-
-    private Integer createLoanProductWithPeriodicAccrualAccountingNoInterestMultiDisbursement(final Account... accounts) {
-        LOG.info("------------------------------CREATING NEW LOAN PRODUCT ---------------------------------------");
-        final String loanProductJSON = new LoanProductTestBuilder().withPrincipal("1000").withRepaymentTypeAsMonth()
-                .withRepaymentAfterEvery("1").withNumberOfRepayments("1").withRepaymentTypeAsMonth().withinterestRatePerPeriod("0")
-                .withInterestRateFrequencyTypeAsMonths().withAmortizationTypeAsEqualPrincipalPayment().withInterestTypeAsDecliningBalance()
-                .withAccountingRulePeriodicAccrual(accounts).withInterestCalculationPeriodTypeAsRepaymentPeriod(true).withDaysInMonth("30")
-                .withDaysInYear("365").withMoratorium("0", "0").withMultiDisburse().withDisallowExpectedDisbursements(true).build(null);
-        return this.loanTransactionHelper.getLoanProductId(loanProductJSON);
-    }
-
-    private void validateIfValuesAreNotOverridden(Integer loanID, Integer loanProductID) {
-        String loanProductDetails = this.loanTransactionHelper.getLoanProductDetails(this.requestSpec, this.responseSpec, loanProductID);
-        String loanDetails = this.loanTransactionHelper.getLoanDetails(this.requestSpec, this.responseSpec, loanID);
-        List<String> comparisonAttributes = Arrays.asList("amortizationType", "interestType", "transactionProcessingStrategyCode",
-                "interestCalculationPeriodType", "repaymentFrequencyType", "graceOnPrincipalPayment", "graceOnInterestPayment",
-                "inArrearsTolerance", "graceOnArrearsAgeing");
-
-        for (String comparisonAttribute : comparisonAttributes) {
-            Object val1 = JsonPath.from(loanProductDetails).get(comparisonAttribute);
-            Object val2 = JsonPath.from(loanDetails).get(comparisonAttribute);
-            assertEquals(val1, val2);
-        }
-    }
-
-    private JsonObject createLoanProductConfigurationDetail(JsonObject loanProductConfiguration, Boolean bool) {
-        loanProductConfiguration.addProperty("amortizationType", bool);
-        loanProductConfiguration.addProperty("interestType", bool);
-        loanProductConfiguration.addProperty("transactionProcessingStrategyCode", bool);
-        loanProductConfiguration.addProperty("interestCalculationPeriodType", bool);
-        loanProductConfiguration.addProperty("inArrearsTolerance", bool);
-        loanProductConfiguration.addProperty("repaymentEvery", bool);
-        loanProductConfiguration.addProperty("graceOnPrincipalAndInterestPayment", bool);
-        loanProductConfiguration.addProperty("graceOnArrearsAgeing", bool);
-        return loanProductConfiguration;
-    }
-
-    private Integer applyForLoanApplicationWithProductConfigurationAsTrue(final Integer clientID, final Integer loanProductID,
-            String principal) {
-        LOG.info("--------------------------------APPLYING FOR LOAN APPLICATION--------------------------------");
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
-        Assertions.assertNotNull(collateralId);
-        List<HashMap> collaterals = new ArrayList<>();
-
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
-                String.valueOf(clientID), collateralId);
-        Assertions.assertNotNull(clientCollateralId);
-        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
-        final String loanApplicationJSON = new LoanApplicationTestBuilder() //
-                .withPrincipal(principal) //
-                .withRepaymentEveryAfter("1") //
-                .withLoanTermFrequency("4") //
-                .withLoanTermFrequencyAsMonths() //
-                .withNumberOfRepayments("4") //
-                .withRepaymentFrequencyTypeAsMonths() //
-                .withInterestRatePerPeriod("2") //
-                .withInterestCalculationPeriodTypeSameAsRepaymentPeriod() //
-                .withExpectedDisbursementDate("01 March 2014") //
-                .withSubmittedOnDate("01 March 2014") //
-                .withCollaterals(collaterals).build(clientID.toString(), loanProductID.toString(), null);
-        return this.loanTransactionHelper.getLoanId(loanApplicationJSON);
-    }
-
-    private Integer applyForLoanApplicationWithProductConfigurationAsFalse(final Integer clientID, final Integer loanProductID,
-            String principal) {
-        LOG.info("--------------------------------APPLYING FOR LOAN APPLICATION--------------------------------");
-        final Integer collateralId = CollateralManagementHelper.createCollateralProduct(this.requestSpec, this.responseSpec);
-        Assertions.assertNotNull(collateralId);
-        List<HashMap> collaterals = new ArrayList<>();
-
-        final Integer clientCollateralId = CollateralManagementHelper.createClientCollateral(this.requestSpec, this.responseSpec,
-                String.valueOf(clientID), collateralId);
-        Assertions.assertNotNull(clientCollateralId);
-        addCollaterals(collaterals, clientCollateralId, BigDecimal.valueOf(1));
-        final String loanApplicationJSON = new LoanApplicationTestBuilder()
-                //
-                .withPrincipal(principal)
-                //
-                .withRepaymentEveryAfter("2")
-                //
-                .withAmortizationTypeAsEqualPrincipalPayments().withRepaymentFrequencyTypeAsWeeks()
-                .withRepaymentStrategy(LoanProductTestBuilder.RBI_INDIA_STRATEGY).withInterestTypeAsFlatBalance()
-                .withInterestCalculationPeriodTypeSameAsRepaymentPeriod().withPrincipalGrace("1").withInterestGrace("1")
-                .withLoanTermFrequency("4") //
-                .withLoanTermFrequencyAsMonths() //
-                .withNumberOfRepayments("4") //
-                .withRepaymentFrequencyTypeAsMonths() //
-                .withInterestRatePerPeriod("2") //
-                .withInterestCalculationPeriodTypeSameAsRepaymentPeriod() //
-                .withExpectedDisbursementDate("01 March 2014") //
-                .withSubmittedOnDate("01 March 2014") //
-                .withCollaterals(collaterals).build(clientID.toString(), loanProductID.toString(), null);
-
-        return this.loanTransactionHelper.getLoanId(loanApplicationJSON);
-    }
-
-    private Integer getDayOfWeek(Calendar date) {
-        int dayOfWeek = 0;
-        if (null != date) {
-            dayOfWeek = date.get(Calendar.DAY_OF_WEEK) - 1;
-            if (dayOfWeek == 0) {
-                dayOfWeek = 7;
-            }
-        }
-        return dayOfWeek;
-    }
-
-    private Integer getDayOfMonth(Calendar date) {
-        int dayOfMonth = 0;
-        if (null != date) {
-            dayOfMonth = date.get(Calendar.DAY_OF_MONTH);
-            if (dayOfMonth > 28) {
-                dayOfMonth = 28;
-            }
-        }
-
-        return dayOfMonth;
+    private PostLoanProductsRequest createOnePeriod30DaysLongNoInterestPeriodicAccrualProduct() {
+        return new PostLoanProductsRequest().name(Utils.uniqueRandomStringGenerator("LOAN_PRODUCT_", 6))//
+                .shortName(Utils.uniqueRandomStringGenerator("", 4))//
+                .description("Loan Product Description")//
+                .includeInBorrowerCycle(false)//
+                .currencyCode("USD")//
+                .digitsAfterDecimal(2)//
+                .inMultiplesOf(0)//
+                .installmentAmountInMultiplesOf(1)//
+                .useBorrowerCycle(false)//
+                .minPrincipal(100.0)//
+                .principal(1000.0)//
+                .maxPrincipal(10000.0)//
+                .minNumberOfRepayments(1)//
+                .numberOfRepayments(1)//
+                .maxNumberOfRepayments(30)//
+                .isLinkedToFloatingInterestRates(false)//
+                .minInterestRatePerPeriod((double) 0)//
+                .interestRatePerPeriod((double) 0)//
+                .maxInterestRatePerPeriod((double) 0)//
+                .interestRateFrequencyType(2)//
+                .repaymentEvery(30)//
+                .repaymentFrequencyType(0)//
+                .amortizationType(1)//
+                .interestType(0)//
+                .isEqualAmortization(false)//
+                .interestCalculationPeriodType(1)//
+                .transactionProcessingStrategyCode(
+                        LoanProductTestBuilder.DUE_PENALTY_FEE_INTEREST_PRINCIPAL_IN_ADVANCE_PRINCIPAL_PENALTY_FEE_INTEREST_STRATEGY)//
+                .daysInYearType(1)//
+                .daysInMonthType(1)//
+                .canDefineInstallmentAmount(true)//
+                .graceOnArrearsAgeing(3)//
+                .overdueDaysForNPA(179)//
+                .accountMovesOutOfNPAOnlyOnArrearsCompletion(false)//
+                .principalThresholdForLastInstallment(50)//
+                .allowVariableInstallments(false)//
+                .canUseForTopup(false)//
+                .isInterestRecalculationEnabled(false)//
+                .holdGuaranteeFunds(false)//
+                .multiDisburseLoan(true)//
+                .allowAttributeOverrides(new AllowAttributeOverrides()//
+                        .amortizationType(true)//
+                        .interestType(true)//
+                        .transactionProcessingStrategyCode(true)//
+                        .interestCalculationPeriodType(true)//
+                        .inArrearsTolerance(true)//
+                        .repaymentEvery(true)//
+                        .graceOnPrincipalAndInterestPayment(true)//
+                        .graceOnArrearsAgeing(true))//
+                .allowPartialPeriodInterestCalcualtion(true)//
+                .maxTrancheCount(10)//
+                .outstandingLoanBalance(10000.0)//
+                .charges(Collections.emptyList())//
+                .accountingRule(3)//
+                .fundSourceAccountId(SUSPENSE_CLEARING_ACCOUNT.getAccountID().longValue())//
+                .loanPortfolioAccountId(LOANS_RECEIVABLE_ACCOUNT.getAccountID().longValue())//
+                .transfersInSuspenseAccountId(SUSPENSE_ACCOUNT.getAccountID().longValue())//
+                .interestOnLoanAccountId(INTEREST_INCOME_ACCOUNT.getAccountID().longValue())//
+                .incomeFromFeeAccountId(FEE_INCOME_ACCOUNT.getAccountID().longValue())//
+                .incomeFromPenaltyAccountId(FEE_INCOME_ACCOUNT.getAccountID().longValue())//
+                .incomeFromRecoveryAccountId(RECOVERIES_ACCOUNT.getAccountID().longValue())//
+                .writeOffAccountId(WRITTEN_OFF_ACCOUNT.getAccountID().longValue())//
+                .overpaymentLiabilityAccountId(OVERPAYMENT_ACCOUNT.getAccountID().longValue())//
+                .receivableInterestAccountId(INTEREST_FEE_RECEIVABLE_ACCOUNT.getAccountID().longValue())//
+                .receivableFeeAccountId(INTEREST_FEE_RECEIVABLE_ACCOUNT.getAccountID().longValue())//
+                .receivablePenaltyAccountId(INTEREST_FEE_RECEIVABLE_ACCOUNT.getAccountID().longValue())//
+                .dateFormat(DATETIME_PATTERN)//
+                .locale("en_GB")//
+                .disallowExpectedDisbursements(true)//
+                .allowApprovedDisbursedAmountsOverApplied(true)//
+                .overAppliedCalculationType("percentage")//
+                .overAppliedNumber(50)//
+                .goodwillCreditAccountId(GOODWILL_EXPENSE_ACCOUNT.getAccountID().longValue())//
+                .incomeFromGoodwillCreditInterestAccountId(INTEREST_INCOME_CHARGE_OFF_ACCOUNT.getAccountID().longValue())//
+                .incomeFromGoodwillCreditFeesAccountId(FEE_CHARGE_OFF_ACCOUNT.getAccountID().longValue())//
+                .incomeFromGoodwillCreditPenaltyAccountId(FEE_CHARGE_OFF_ACCOUNT.getAccountID().longValue())//
+                .incomeFromChargeOffInterestAccountId(INTEREST_INCOME_CHARGE_OFF_ACCOUNT.getAccountID().longValue())//
+                .incomeFromChargeOffFeesAccountId(FEE_CHARGE_OFF_ACCOUNT.getAccountID().longValue())//
+                .chargeOffExpenseAccountId(CREDIT_LOSS_BAD_DEBT_ACCOUNT.getAccountID().longValue())//
+                .chargeOffFraudExpenseAccountId(CREDIT_LOSS_BAD_DEBT_FRAUD_ACCOUNT.getAccountID().longValue())//
+                .incomeFromChargeOffPenaltyAccountId(FEE_CHARGE_OFF_ACCOUNT.getAccountID().longValue());
     }
 }
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/SchedulerJobsTestResults.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/SchedulerJobsTestResults.java
index a94cfdc37..c6c7e3500 100644
--- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/SchedulerJobsTestResults.java
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/SchedulerJobsTestResults.java
@@ -56,7 +56,6 @@ import org.apache.fineract.client.models.JournalEntryTransactionItem;
 import org.apache.fineract.client.models.PostClientsResponse;
 import org.apache.fineract.client.models.PostLoansLoanIdTransactionsRequest;
 import org.apache.fineract.client.models.PutJobsJobIDRequest;
-import org.apache.fineract.client.util.CallFailedRuntimeException;
 import org.apache.fineract.infrastructure.businessdate.domain.BusinessDateType;
 import org.apache.fineract.integrationtests.common.BusinessDateHelper;
 import org.apache.fineract.integrationtests.common.ClientHelper;
@@ -656,62 +655,68 @@ public class SchedulerJobsTestResults {
 
     @Test
     public void testLoanCOBJobOutcome() {
-        this.savingsAccountHelper = new SavingsAccountHelper(requestSpec, responseSpec);
-        this.loanTransactionHelper = new LoanTransactionHelper(requestSpec, responseSpec);
+        try {
+            GlobalConfigurationHelper.updateIsBusinessDateEnabled(requestSpec, responseSpec, Boolean.TRUE);
+            this.savingsAccountHelper = new SavingsAccountHelper(requestSpec, responseSpec);
+            this.loanTransactionHelper = new LoanTransactionHelper(requestSpec, responseSpec);
 
-        final Integer clientID = ClientHelper.createClient(requestSpec, responseSpec);
-        Assertions.assertNotNull(clientID);
+            final Integer clientID = ClientHelper.createClient(requestSpec, responseSpec);
+            Assertions.assertNotNull(clientID);
 
-        Integer overdueFeeChargeId = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanOverdueFeeJSONWithCalculationTypePercentage("1"));
-        Assertions.assertNotNull(overdueFeeChargeId);
+            Integer overdueFeeChargeId = ChargesHelper.createCharges(requestSpec, responseSpec,
+                    ChargesHelper.getLoanOverdueFeeJSONWithCalculationTypePercentage("1"));
+            Assertions.assertNotNull(overdueFeeChargeId);
 
-        Integer fee = ChargesHelper.createCharges(requestSpec, responseSpec,
-                ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "10", false));
-        Assertions.assertNotNull(fee);
+            Integer fee = ChargesHelper.createCharges(requestSpec, responseSpec,
+                    ChargesHelper.getLoanSpecifiedDueDateJSON(ChargesHelper.CHARGE_CALCULATION_TYPE_FLAT, "10", false));
+            Assertions.assertNotNull(fee);
 
-        final Integer loanProductID = createLoanProduct(overdueFeeChargeId.toString());
-        Assertions.assertNotNull(loanProductID);
-        List<Integer> loanIDs = new ArrayList<>();
-        HashMap loanStatusHashMap;
-        for (int i = 0; i < 3; i++) {
-            final Integer loanID = applyForLoanApplication(clientID.toString(), loanProductID.toString(), null, "10 January 2020");
+            final Integer loanProductID = createLoanProduct(overdueFeeChargeId.toString());
+            Assertions.assertNotNull(loanProductID);
+            List<Integer> loanIDs = new ArrayList<>();
+            HashMap loanStatusHashMap;
+            for (int i = 0; i < 3; i++) {
+                final Integer loanID = applyForLoanApplication(clientID.toString(), loanProductID.toString(), null, "10 January 2020");
 
-            Assertions.assertNotNull(loanID);
+                Assertions.assertNotNull(loanID);
 
-            loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(requestSpec, responseSpec, loanID);
-            LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
+                loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(requestSpec, responseSpec, loanID);
+                LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
 
-            loanStatusHashMap = this.loanTransactionHelper.approveLoan("01 March 2020", loanID);
-            LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
+                loanStatusHashMap = this.loanTransactionHelper.approveLoan("01 March 2020", loanID);
+                LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
 
-            String loanDetails = this.loanTransactionHelper.getLoanDetails(requestSpec, responseSpec, loanID);
-            loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("02 March 2020", loanID,
-                    JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
-            LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-            loanIDs.add(loanID);
+                String loanDetails = this.loanTransactionHelper.getLoanDetails(requestSpec, responseSpec, loanID);
+                loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("02 March 2020", loanID,
+                        JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
+                LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
+                loanIDs.add(loanID);
 
-            this.loanTransactionHelper.addChargesForLoan(loanID,
-                    LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(fee), "02 March 2020", "10", null));
-        }
+                this.loanTransactionHelper.addChargesForLoan(loanID,
+                        LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(fee), "02 March 2020", "10", null));
+            }
 
-        String jobName = "Loan COB";
-        this.schedulerJobHelper.executeAndAwaitJob(jobName);
-        for (Integer loanId : loanIDs) {
-            List<HashMap> repaymentScheduleDataAfter = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec,
-                    loanId);
+            BusinessDateHelper.updateBusinessDate(requestSpec, responseSpec, BusinessDateType.COB_DATE, LocalDate.of(2020, 9, 2));
+            String jobName = "Loan COB";
+            this.schedulerJobHelper.executeAndAwaitJob(jobName);
+            for (Integer loanId : loanIDs) {
+                List<HashMap> repaymentScheduleDataAfter = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec,
+                        loanId);
 
-            Assertions.assertEquals(10.00f, (Float) repaymentScheduleDataAfter.get(1).get("feeChargesDue"),
-                    "Verifying From Fee Charges due for first Repayment after Successful completion of Scheduler Job");
-            Assertions.assertEquals(39.39f, (Float) repaymentScheduleDataAfter.get(1).get("penaltyChargesDue"),
-                    "Verifying From Penalty Charges due for first Repayment after Successful completion of Scheduler Job");
-            Assertions.assertEquals(39.39f, (Float) repaymentScheduleDataAfter.get(2).get("penaltyChargesDue"),
-                    "Verifying From Penalty Charges due for first Repayment after Successful completion of Scheduler Job");
-            Assertions.assertEquals(39.39f, (Float) repaymentScheduleDataAfter.get(3).get("penaltyChargesDue"),
-                    "Verifying From Penalty Charges due for first Repayment after Successful completion of Scheduler Job");
-            Assertions.assertEquals(39.39f, (Float) repaymentScheduleDataAfter.get(4).get("penaltyChargesDue"),
-                    "Verifying From Penalty Charges due for first Repayment after Successful completion of Scheduler Job");
+                Assertions.assertEquals(10.00f, (Float) repaymentScheduleDataAfter.get(1).get("feeChargesDue"),
+                        "Verifying From Fee Charges due for first Repayment after Successful completion of Scheduler Job");
+                Assertions.assertEquals(39.39f, (Float) repaymentScheduleDataAfter.get(1).get("penaltyChargesDue"),
+                        "Verifying From Penalty Charges due for first Repayment after Successful completion of Scheduler Job");
+                Assertions.assertEquals(39.39f, (Float) repaymentScheduleDataAfter.get(2).get("penaltyChargesDue"),
+                        "Verifying From Penalty Charges due for first Repayment after Successful completion of Scheduler Job");
+                Assertions.assertEquals(39.39f, (Float) repaymentScheduleDataAfter.get(3).get("penaltyChargesDue"),
+                        "Verifying From Penalty Charges due for first Repayment after Successful completion of Scheduler Job");
+                Assertions.assertEquals(39.39f, (Float) repaymentScheduleDataAfter.get(4).get("penaltyChargesDue"),
+                        "Verifying From Penalty Charges due for first Repayment after Successful completion of Scheduler Job");
 
+            }
+        } finally {
+            GlobalConfigurationHelper.updateIsBusinessDateEnabled(requestSpec, responseSpec, Boolean.FALSE);
         }
     }
 
@@ -720,7 +725,7 @@ public class SchedulerJobsTestResults {
         try {
             GlobalConfigurationHelper.updateIsBusinessDateEnabled(requestSpec, responseSpec, Boolean.TRUE);
 
-            BusinessDateHelper.updateBusinessDate(requestSpec, responseSpec, BusinessDateType.COB_DATE, LocalDate.of(2020, 3, 2));
+            BusinessDateHelper.updateBusinessDate(requestSpec, responseSpec, BusinessDateType.COB_DATE, LocalDate.of(2020, 6, 2));
             this.savingsAccountHelper = new SavingsAccountHelper(requestSpec, responseSpec);
             this.loanTransactionHelper = new LoanTransactionHelper(requestSpec, responseSpec);
 
@@ -741,16 +746,16 @@ public class SchedulerJobsTestResults {
             HashMap loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(requestSpec, responseSpec, loanID);
             LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
 
-            loanStatusHashMap = this.loanTransactionHelper.approveLoan("01 March 2020", loanID);
+            loanStatusHashMap = this.loanTransactionHelper.approveLoan("01 June 2020", loanID);
             LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
 
             String loanDetails = this.loanTransactionHelper.getLoanDetails(requestSpec, responseSpec, loanID);
-            loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("02 March 2020", loanID,
+            loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("02 June 2020", loanID,
                     JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
             LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
 
             this.loanTransactionHelper.addChargesForLoan(loanID,
-                    LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(fee), "02 March 2020", "10", null));
+                    LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(String.valueOf(fee), "02 June 2020", "10", null));
 
             String jobName = "Loan COB";
             this.schedulerJobHelper.executeAndAwaitJob(jobName);
@@ -765,7 +770,7 @@ public class SchedulerJobsTestResults {
             // First accrual transaction
             assertTrue(getLoansLoanIdResponse.getTransactions().get(1).getType().getAccrual());
             assertEquals(10.0f, getLoansLoanIdResponse.getTransactions().get(1).getFeeChargesPortion());
-            assertEquals(LocalDate.of(2020, 3, 2), getLoansLoanIdResponse.getTransactions().get(1).getDate());
+            assertEquals(LocalDate.of(2020, 6, 2), getLoansLoanIdResponse.getTransactions().get(1).getDate());
             Long transactionId = getLoansLoanIdResponse.getTransactions().get(1).getId();
 
             final GetJournalEntriesTransactionIdResponse journalEntriesResponse = journalEntryHelper.getJournalEntries("L" + transactionId);
@@ -774,8 +779,8 @@ public class SchedulerJobsTestResults {
             assertEquals(2, journalEntries.size());
             assertEquals(10, journalEntries.get(0).getAmount());
             assertEquals(10, journalEntries.get(1).getAmount());
-            assertEquals(LocalDate.of(2020, 3, 2), journalEntries.get(1).getTransactionDate());
-            assertEquals(LocalDate.of(2020, 3, 2), journalEntries.get(0).getTransactionDate());
+            assertEquals(LocalDate.of(2020, 6, 2), journalEntries.get(1).getTransactionDate());
+            assertEquals(LocalDate.of(2020, 6, 2), journalEntries.get(0).getTransactionDate());
         } finally {
             GlobalConfigurationHelper.updateIsBusinessDateEnabled(requestSpec, responseSpec, Boolean.FALSE);
         }
@@ -806,31 +811,31 @@ public class SchedulerJobsTestResults {
             loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(requestSpec, responseSpec, loanID);
             LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
 
-            loanStatusHashMap = loanTransactionHelper.approveLoan("01 March 2020", loanID);
+            loanStatusHashMap = loanTransactionHelper.approveLoan("01 July 2020", loanID);
             LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
 
             String loanDetails = loanTransactionHelper.getLoanDetails(requestSpec, responseSpec, loanID);
-            loanStatusHashMap = loanTransactionHelper.disburseLoanWithNetDisbursalAmount("02 March 2020", loanID,
+            loanStatusHashMap = loanTransactionHelper.disburseLoanWithNetDisbursalAmount("02 July 2020", loanID,
                     JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
             LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-            BusinessDateHelper.updateBusinessDate(requestSpec, responseSpec, BusinessDateType.COB_DATE, LocalDate.of(2020, 3, 2));
+            BusinessDateHelper.updateBusinessDate(requestSpec, responseSpec, BusinessDateType.COB_DATE, LocalDate.of(2020, 7, 2));
             String jobName = "Loan COB";
 
             schedulerJobHelper.executeAndAwaitJob(jobName);
             GetLoansLoanIdResponse loan = loanTransactionHelper.getLoan(requestSpec, responseSpec, loanID);
-            Assertions.assertEquals(LocalDate.of(2020, 3, 2), loan.getLastClosedBusinessDate());
+            Assertions.assertEquals(LocalDate.of(2020, 7, 2), loan.getLastClosedBusinessDate());
 
-            BusinessDateHelper.updateBusinessDate(requestSpec, responseSpec, BusinessDateType.COB_DATE, LocalDate.of(2020, 3, 3));
+            BusinessDateHelper.updateBusinessDate(requestSpec, responseSpec, BusinessDateType.COB_DATE, LocalDate.of(2020, 7, 3));
             schedulerJobHelper.executeAndAwaitJob(jobName);
 
             loan = loanTransactionHelper.getLoan(requestSpec, responseSpec, loanID);
-            Assertions.assertEquals(LocalDate.of(2020, 3, 3), loan.getLastClosedBusinessDate());
+            Assertions.assertEquals(LocalDate.of(2020, 7, 3), loan.getLastClosedBusinessDate());
 
-            BusinessDateHelper.updateBusinessDate(requestSpec, responseSpec, BusinessDateType.COB_DATE, LocalDate.of(2020, 3, 5));
+            BusinessDateHelper.updateBusinessDate(requestSpec, responseSpec, BusinessDateType.COB_DATE, LocalDate.of(2020, 7, 5));
             schedulerJobHelper.executeAndAwaitJob(jobName);
 
             loan = loanTransactionHelper.getLoan(requestSpec, responseSpec, loanID);
-            Assertions.assertEquals(LocalDate.of(2020, 3, 3), loan.getLastClosedBusinessDate());
+            Assertions.assertEquals(LocalDate.of(2020, 7, 3), loan.getLastClosedBusinessDate());
         } finally {
             GlobalConfigurationHelper.updateIsBusinessDateEnabled(requestSpec, responseSpec, Boolean.FALSE);
         }
@@ -840,7 +845,7 @@ public class SchedulerJobsTestResults {
     public void testLoanCOBApplyPenaltyOnDue() {
         try {
             GlobalConfigurationHelper.updateIsBusinessDateEnabled(requestSpec, responseSpec, Boolean.TRUE);
-
+            BusinessDateHelper.updateBusinessDate(requestSpec, responseSpec, BusinessDateType.COB_DATE, LocalDate.of(2019, 2, 2));
             // set penalty wait period to 0
             GlobalConfigurationHelper.updateValueForGlobalConfiguration(this.requestSpec, this.responseSpec, "10", "0");
             this.loanTransactionHelper = new LoanTransactionHelper(requestSpec, responseSpec);
@@ -856,21 +861,21 @@ public class SchedulerJobsTestResults {
             Assertions.assertNotNull(loanProductID);
             HashMap loanStatusHashMap;
 
-            final Integer loanID = applyForLoanApplication(clientID.toString(), loanProductID.toString(), null, "10 January 2020");
+            final Integer loanID = applyForLoanApplication(clientID.toString(), loanProductID.toString(), null, "10 January 2019");
 
             Assertions.assertNotNull(loanID);
 
             loanStatusHashMap = LoanStatusChecker.getStatusOfLoan(requestSpec, responseSpec, loanID);
             LoanStatusChecker.verifyLoanIsPending(loanStatusHashMap);
 
-            loanStatusHashMap = this.loanTransactionHelper.approveLoan("01 March 2020", loanID);
+            loanStatusHashMap = this.loanTransactionHelper.approveLoan("01 March 2019", loanID);
             LoanStatusChecker.verifyLoanIsApproved(loanStatusHashMap);
 
             String loanDetails = this.loanTransactionHelper.getLoanDetails(requestSpec, responseSpec, loanID);
-            loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("02 March 2020", loanID,
+            loanStatusHashMap = this.loanTransactionHelper.disburseLoanWithNetDisbursalAmount("02 March 2019", loanID,
                     JsonPath.from(loanDetails).get("netDisbursalAmount").toString());
             LoanStatusChecker.verifyLoanIsActive(loanStatusHashMap);
-            BusinessDateHelper.updateBusinessDate(requestSpec, responseSpec, BusinessDateType.COB_DATE, LocalDate.of(2020, 4, 1));
+            BusinessDateHelper.updateBusinessDate(requestSpec, responseSpec, BusinessDateType.COB_DATE, LocalDate.of(2019, 4, 1));
             String jobName = "Loan COB";
 
             this.schedulerJobHelper.executeAndAwaitJob(jobName);
@@ -879,7 +884,7 @@ public class SchedulerJobsTestResults {
             Assertions.assertEquals(0, (Integer) repaymentScheduleDataAfter.get(1).get("penaltyChargesDue"),
                     "Verifying From Penalty Charges due fot first Repayment after Successful completion of Scheduler Job");
 
-            LocalDate lastBusinessDateBeforeFastForward = LocalDate.of(2020, 4, 2);
+            LocalDate lastBusinessDateBeforeFastForward = LocalDate.of(2019, 4, 2);
             BusinessDateHelper.updateBusinessDate(requestSpec, responseSpec, BusinessDateType.COB_DATE, lastBusinessDateBeforeFastForward);
             this.schedulerJobHelper.executeAndAwaitJob(jobName);
             repaymentScheduleDataAfter = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec, loanID);
@@ -888,10 +893,34 @@ public class SchedulerJobsTestResults {
 
             List<Map> transactions = this.loanTransactionHelper.getLoanTransactions(this.requestSpec, this.responseSpec, loanID);
             Assertions.assertEquals(39.39f, (Float) transactions.get(2).get("amount"));
-            Assertions.assertEquals(2020, ((List) transactions.get(2).get("date")).get(0));
+            Assertions.assertEquals(2019, ((List) transactions.get(2).get("date")).get(0));
             Assertions.assertEquals(4, ((List) transactions.get(2).get("date")).get(1));
             Assertions.assertEquals(2, ((List) transactions.get(2).get("date")).get(2));
+        } finally {
+            GlobalConfigurationHelper.updateIsBusinessDateEnabled(requestSpec, responseSpec, Boolean.FALSE);
+            GlobalConfigurationHelper.updateValueForGlobalConfiguration(this.requestSpec, this.responseSpec, "10", "2");
+        }
+    }
 
+    @Test
+    public void testLoanCOBApplyPenaltyOnDue1DayGracePeriod() {
+        try {
+            GlobalConfigurationHelper.updateIsBusinessDateEnabled(requestSpec, responseSpec, Boolean.TRUE);
+            BusinessDateHelper.updateBusinessDate(requestSpec, responseSpec, BusinessDateType.COB_DATE, LocalDate.of(2020, 2, 2));
+            // set penalty wait period to 0
+            GlobalConfigurationHelper.updateValueForGlobalConfiguration(this.requestSpec, this.responseSpec, "10", "0");
+            this.loanTransactionHelper = new LoanTransactionHelper(requestSpec, responseSpec);
+
+            final Integer clientID = ClientHelper.createClient(requestSpec, responseSpec);
+            Assertions.assertNotNull(clientID);
+
+            Integer overdueFeeChargeId = ChargesHelper.createCharges(requestSpec, responseSpec,
+                    ChargesHelper.getLoanOverdueFeeJSONWithCalculationTypePercentage("1"));
+            Assertions.assertNotNull(overdueFeeChargeId);
+
+            final Integer loanProductID = createLoanProduct(overdueFeeChargeId.toString());
+            Assertions.assertNotNull(loanProductID);
+            HashMap loanStatusHashMap;
             // Test penalty where there is 1 day grace period
             final Integer loanID2 = applyForLoanApplication(clientID.toString(), loanProductID.toString(), null, "10 January 2020");
 
@@ -910,10 +939,11 @@ public class SchedulerJobsTestResults {
 
             GlobalConfigurationHelper.updateValueForGlobalConfiguration(this.requestSpec, this.responseSpec, "10", "1");
             LocalDate dateToFastForward = LocalDate.of(2020, 5, 2);
-
+            String jobName = "Loan COB";
             BusinessDateHelper.updateBusinessDate(requestSpec, responseSpec, BusinessDateType.COB_DATE, dateToFastForward);
             this.schedulerJobHelper.executeAndAwaitJob(jobName);
-            repaymentScheduleDataAfter = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec, loanID2);
+            List<HashMap> repaymentScheduleDataAfter = this.loanTransactionHelper.getLoanRepaymentSchedule(requestSpec, responseSpec,
+                    loanID2);
             Assertions.assertEquals(0, (Integer) repaymentScheduleDataAfter.get(1).get("penaltyChargesDue"),
                     "Verifying From Penalty Charges due fot first Repayment after Successful completion of Scheduler Job");
 
@@ -923,7 +953,7 @@ public class SchedulerJobsTestResults {
             Assertions.assertEquals(39.39f, (Float) repaymentScheduleDataAfter.get(1).get("penaltyChargesDue"),
                     "Verifying From Penalty Charges due fot first Repayment after Successful completion of Scheduler Job");
 
-            transactions = this.loanTransactionHelper.getLoanTransactions(this.requestSpec, this.responseSpec, loanID2);
+            List<Map> transactions = this.loanTransactionHelper.getLoanTransactions(this.requestSpec, this.responseSpec, loanID2);
             Assertions.assertEquals(39.39f, (Float) transactions.get(2).get("amount"));
             Assertions.assertEquals(2020, ((List) transactions.get(2).get("date")).get(0));
             Assertions.assertEquals(5, ((List) transactions.get(2).get("date")).get(1));
@@ -1148,13 +1178,6 @@ public class SchedulerJobsTestResults {
             assertEquals(LocalDate.of(2022, 9, 5), loanDetails.getTransactions().get(1).getDate());
         } finally {
             GlobalConfigurationHelper.updateIsBusinessDateEnabled(requestSpec, responseSpec, Boolean.FALSE);
-        }
-
-        try {
-            this.schedulerJobHelper.updateSchedulerJob(16L, new PutJobsJobIDRequest().cronExpression("0 2 0 1/1 * ? *"));
-        } catch (CallFailedRuntimeException e) {
-            // Try again (maybe it was executed by scheduler at the same time when it was called... :/
-            Thread.sleep(2000);
             this.schedulerJobHelper.updateSchedulerJob(16L, new PutJobsJobIDRequest().cronExpression("0 2 0 1/1 * ? *"));
         }
     }
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java
index 314769d1e..46fa15454 100644
--- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java
@@ -68,6 +68,8 @@ import org.apache.fineract.client.models.PostLoansLoanIdResponse;
 import org.apache.fineract.client.models.PostLoansLoanIdTransactionsRequest;
 import org.apache.fineract.client.models.PostLoansLoanIdTransactionsResponse;
 import org.apache.fineract.client.models.PostLoansLoanIdTransactionsTransactionIdRequest;
+import org.apache.fineract.client.models.PostLoansRequest;
+import org.apache.fineract.client.models.PostLoansResponse;
 import org.apache.fineract.client.models.PutChargeTransactionChangesRequest;
 import org.apache.fineract.client.models.PutChargeTransactionChangesResponse;
 import org.apache.fineract.client.models.PutLoanProductsProductIdRequest;
@@ -790,6 +792,10 @@ public class LoanTransactionHelper extends IntegrationTest {
         return (Integer) response.get("resourceId");
     }
 
+    public PostLoansLoanIdChargesResponse addChargesForLoan(final Long loanId, PostLoansLoanIdChargesRequest request) {
+        return ok(fineract().loanCharges.executeLoanCharge(loanId, request, null));
+    }
+
     public PostLoansLoanIdChargesResponse addChargeForLoan(final Integer loanId, final String payload,
             final ResponseSpecification responseSpecParam) {
         log.info("--------------------------------- ADD CHARGES FOR LOAN --------------------------------");
@@ -1752,10 +1758,18 @@ public class LoanTransactionHelper extends IntegrationTest {
         return ok(fineract().loans.getDelinquencyTagHistory1(loanExternalId));
     }
 
+    public PostLoansResponse applyLoan(PostLoansRequest request) {
+        return ok(fineract().loans.calculateLoanScheduleOrSubmitLoanApplication(request, null));
+    }
+
     public PostLoansLoanIdResponse approveLoan(String loanExternalId, PostLoansLoanIdRequest request) {
         return ok(fineract().loans.stateTransitions1(loanExternalId, request, "approve"));
     }
 
+    public PostLoansLoanIdResponse approveLoan(Long loanId, PostLoansLoanIdRequest request) {
+        return ok(fineract().loans.stateTransitions(loanId, request, "approve"));
+    }
+
     public PostLoansLoanIdResponse rejectLoan(String loanExternalId, PostLoansLoanIdRequest request) {
         return ok(fineract().loans.stateTransitions1(loanExternalId, request, "reject"));
     }