diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/AccountingScenario.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/AccountingScenarioIntegrationTest.java
similarity index 99%
rename from mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/AccountingScenario.java
rename to mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/AccountingScenarioIntegrationTest.java
index 1d65ee261..fda9ed75f 100644
--- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/AccountingScenario.java
+++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/AccountingScenarioIntegrationTest.java
@@ -23,7 +23,7 @@ import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
 
 @SuppressWarnings("rawtypes")
-public class AccountingScenario {
+public class AccountingScenarioIntegrationTest {
     private RequestSpecification requestSpec;
     private ResponseSpecification responseSpec;
 
diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/LoanWithdrawnByApplicant.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/LoanWithdrawnByApplicantIntegrationTest.java
similarity index 98%
rename from mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/LoanWithdrawnByApplicant.java
rename to mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/LoanWithdrawnByApplicantIntegrationTest.java
index eae6b42d7..9f809bbad 100644
--- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/LoanWithdrawnByApplicant.java
+++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/LoanWithdrawnByApplicantIntegrationTest.java
@@ -18,7 +18,7 @@ import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
 
 @SuppressWarnings("rawtypes")
-public class LoanWithdrawnByApplicant {
+public class LoanWithdrawnByApplicantIntegrationTest {
 
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/ClientHelper.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/ClientHelper.java
index 69f0d58b5..713811068 100644
--- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/ClientHelper.java
+++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/common/ClientHelper.java
@@ -1,14 +1,13 @@
 package org.mifosplatform.integrationtests.common;
 
-import java.util.HashMap;
+import static org.junit.Assert.assertEquals;
 
+import java.util.HashMap;
 
 import com.google.gson.Gson;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
 
-import static org.junit.Assert.assertEquals;
-
 public class ClientHelper {
 
     private static final String CREATE_CLIENT_URL = "/mifosng-provider/api/v1/clients?tenantIdentifier=default";
@@ -18,9 +17,9 @@ public class ClientHelper {
     }
 
     public static Integer createClient(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
-            final String dateOfJoining) {
+            final String activationDate) {
         System.out.println("---------------------------------CREATING A CLIENT---------------------------------------------");
-        return Utils.performServerPost(requestSpec, responseSpec, CREATE_CLIENT_URL, getTestClientAsJSON(dateOfJoining), "clientId");
+        return Utils.performServerPost(requestSpec, responseSpec, CREATE_CLIENT_URL, getTestClientAsJSON(activationDate), "clientId");
     }
 
     public static String getTestClientAsJSON(final String dateOfJoining) {
@@ -31,7 +30,8 @@ public class ClientHelper {
         map.put("externalId", randomIDGenerator("ID_", 7));
         map.put("dateFormat", "dd MMMM yyyy");
         map.put("locale", "en");
-        map.put("joinedDate", dateOfJoining);
+        map.put("active", "true");
+        map.put("activationDate", dateOfJoining);
         System.out.println("map : " + map);
         return new Gson().toJson(map);
     }