Merge pull request #5 from myrle-krantz/develop

Updating package names.
diff --git a/README.md b/README.md
index 546d112..ecd0a52 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,5 @@
 # Apache Fineract CN Test
 
-[![Join the chat at https://gitter.im/mifos-initiative/mifos.io](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mifos-initiative/mifos.io?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
-This project is an umbrella for all Mifos I/O Core components.
-
 ## Abstract
 Apache Fineract CN is an application framework for digital financial services, a system to support nationwide and cross-national financial transactions and help to level and speed the creation of an inclusive, interconnected digital economy for every nation in the world.
 
diff --git a/src/main/java/io/mifos/core/test/domain/DateStampChecker.java b/src/main/java/org/apache/fineract/cn/test/domain/DateStampChecker.java
similarity index 95%
rename from src/main/java/io/mifos/core/test/domain/DateStampChecker.java
rename to src/main/java/org/apache/fineract/cn/test/domain/DateStampChecker.java
index 7723f57..acfe2a3 100644
--- a/src/main/java/io/mifos/core/test/domain/DateStampChecker.java
+++ b/src/main/java/org/apache/fineract/cn/test/domain/DateStampChecker.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.test.domain;
+package org.apache.fineract.cn.test.domain;
 
-import io.mifos.core.lang.DateConverter;
+import org.apache.fineract.cn.lang.DateConverter;
 import org.junit.Assert;
 
 import java.time.Clock;
diff --git a/src/main/java/io/mifos/core/test/domain/TimeStampChecker.java b/src/main/java/org/apache/fineract/cn/test/domain/TimeStampChecker.java
similarity index 96%
rename from src/main/java/io/mifos/core/test/domain/TimeStampChecker.java
rename to src/main/java/org/apache/fineract/cn/test/domain/TimeStampChecker.java
index 2861bc0..7c244af 100644
--- a/src/main/java/io/mifos/core/test/domain/TimeStampChecker.java
+++ b/src/main/java/org/apache/fineract/cn/test/domain/TimeStampChecker.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.test.domain;
+package org.apache.fineract.cn.test.domain;
 
-import io.mifos.core.lang.DateConverter;
+import org.apache.fineract.cn.lang.DateConverter;
 import org.junit.Assert;
 
 import java.time.Clock;
diff --git a/src/main/java/io/mifos/core/test/domain/ValidationTest.java b/src/main/java/org/apache/fineract/cn/test/domain/ValidationTest.java
similarity index 97%
rename from src/main/java/io/mifos/core/test/domain/ValidationTest.java
rename to src/main/java/org/apache/fineract/cn/test/domain/ValidationTest.java
index d229ea6..dde27dd 100644
--- a/src/main/java/io/mifos/core/test/domain/ValidationTest.java
+++ b/src/main/java/org/apache/fineract/cn/test/domain/ValidationTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.test.domain;
+package org.apache.fineract.cn.test.domain;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/main/java/io/mifos/core/test/domain/ValidationTestCase.java b/src/main/java/org/apache/fineract/cn/test/domain/ValidationTestCase.java
similarity index 97%
rename from src/main/java/io/mifos/core/test/domain/ValidationTestCase.java
rename to src/main/java/org/apache/fineract/cn/test/domain/ValidationTestCase.java
index b6724a9..401384b 100644
--- a/src/main/java/io/mifos/core/test/domain/ValidationTestCase.java
+++ b/src/main/java/org/apache/fineract/cn/test/domain/ValidationTestCase.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.test.domain;
+package org.apache.fineract.cn.test.domain;
 
 import javax.validation.ConstraintViolation;
 import javax.validation.Validation;
diff --git a/src/main/java/io/mifos/core/test/env/ExtraProperties.java b/src/main/java/org/apache/fineract/cn/test/env/ExtraProperties.java
similarity index 96%
rename from src/main/java/io/mifos/core/test/env/ExtraProperties.java
rename to src/main/java/org/apache/fineract/cn/test/env/ExtraProperties.java
index 9af0527..f6b647e 100644
--- a/src/main/java/io/mifos/core/test/env/ExtraProperties.java
+++ b/src/main/java/org/apache/fineract/cn/test/env/ExtraProperties.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.test.env;
+package org.apache.fineract.cn.test.env;
 
 import java.util.Hashtable;
 
diff --git a/src/main/java/io/mifos/core/test/env/TestEnvironment.java b/src/main/java/org/apache/fineract/cn/test/env/TestEnvironment.java
similarity index 98%
rename from src/main/java/io/mifos/core/test/env/TestEnvironment.java
rename to src/main/java/org/apache/fineract/cn/test/env/TestEnvironment.java
index d986160..bcd0c35 100644
--- a/src/main/java/io/mifos/core/test/env/TestEnvironment.java
+++ b/src/main/java/org/apache/fineract/cn/test/env/TestEnvironment.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.test.env;
+package org.apache.fineract.cn.test.env;
 
-import io.mifos.core.lang.AutoTenantContext;
-import io.mifos.core.lang.security.RsaKeyPairFactory;
+import org.apache.fineract.cn.lang.AutoTenantContext;
+import org.apache.fineract.cn.lang.security.RsaKeyPairFactory;
 import org.junit.rules.ExternalResource;
 import org.springframework.util.Base64Utils;
 
diff --git a/src/main/java/io/mifos/core/test/fixture/DataStoreTenantInitializer.java b/src/main/java/org/apache/fineract/cn/test/fixture/DataStoreTenantInitializer.java
similarity index 96%
rename from src/main/java/io/mifos/core/test/fixture/DataStoreTenantInitializer.java
rename to src/main/java/org/apache/fineract/cn/test/fixture/DataStoreTenantInitializer.java
index eedfabe..344dfb4 100644
--- a/src/main/java/io/mifos/core/test/fixture/DataStoreTenantInitializer.java
+++ b/src/main/java/org/apache/fineract/cn/test/fixture/DataStoreTenantInitializer.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.test.fixture;
+package org.apache.fineract.cn.test.fixture;
 
 import org.junit.rules.ExternalResource;
 
diff --git a/src/main/java/io/mifos/core/test/fixture/TenantDataStoreContextTestRule.java b/src/main/java/org/apache/fineract/cn/test/fixture/TenantDataStoreContextTestRule.java
similarity index 97%
rename from src/main/java/io/mifos/core/test/fixture/TenantDataStoreContextTestRule.java
rename to src/main/java/org/apache/fineract/cn/test/fixture/TenantDataStoreContextTestRule.java
index 7401960..35c8e1a 100644
--- a/src/main/java/io/mifos/core/test/fixture/TenantDataStoreContextTestRule.java
+++ b/src/main/java/org/apache/fineract/cn/test/fixture/TenantDataStoreContextTestRule.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.test.fixture;
+package org.apache.fineract.cn.test.fixture;
 
-import io.mifos.core.test.env.TestEnvironment;
+import org.apache.fineract.cn.test.env.TestEnvironment;
 import org.junit.rules.ExternalResource;
 import org.springframework.util.Assert;
 
diff --git a/src/main/java/io/mifos/core/test/fixture/TenantDataStoreTestContext.java b/src/main/java/org/apache/fineract/cn/test/fixture/TenantDataStoreTestContext.java
similarity index 92%
rename from src/main/java/io/mifos/core/test/fixture/TenantDataStoreTestContext.java
rename to src/main/java/org/apache/fineract/cn/test/fixture/TenantDataStoreTestContext.java
index 8bfa2f2..e235d60 100644
--- a/src/main/java/io/mifos/core/test/fixture/TenantDataStoreTestContext.java
+++ b/src/main/java/org/apache/fineract/cn/test/fixture/TenantDataStoreTestContext.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.test.fixture;
+package org.apache.fineract.cn.test.fixture;
 
-import io.mifos.core.lang.AutoTenantContext;
-import io.mifos.core.test.env.TestEnvironment;
+import org.apache.fineract.cn.test.env.TestEnvironment;
+import org.apache.fineract.cn.lang.AutoTenantContext;
 
 /**
  * @author Myrle Krantz
diff --git a/src/main/java/io/mifos/core/test/fixture/cassandra/CassandraInitializer.java b/src/main/java/org/apache/fineract/cn/test/fixture/cassandra/CassandraInitializer.java
similarity index 95%
rename from src/main/java/io/mifos/core/test/fixture/cassandra/CassandraInitializer.java
rename to src/main/java/org/apache/fineract/cn/test/fixture/cassandra/CassandraInitializer.java
index 31a00b2..284d11c 100644
--- a/src/main/java/io/mifos/core/test/fixture/cassandra/CassandraInitializer.java
+++ b/src/main/java/org/apache/fineract/cn/test/fixture/cassandra/CassandraInitializer.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.test.fixture.cassandra;
+package org.apache.fineract.cn.test.fixture.cassandra;
 
 import com.datastax.driver.core.Cluster;
 import com.datastax.driver.core.DataType;
@@ -24,9 +24,9 @@
 import com.datastax.driver.core.schemabuilder.SchemaBuilder;
 import com.datastax.driver.mapping.Mapper;
 import com.datastax.driver.mapping.MappingManager;
-import io.mifos.core.cassandra.util.ContactPointUtils;
-import io.mifos.core.test.env.TestEnvironment;
-import io.mifos.core.test.fixture.DataStoreTenantInitializer;
+import org.apache.fineract.cn.test.env.TestEnvironment;
+import org.apache.fineract.cn.test.fixture.DataStoreTenantInitializer;
+import org.apache.fineract.cn.cassandra.util.ContactPointUtils;
 import org.cassandraunit.utils.EmbeddedCassandraServerHelper;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/io/mifos/core/test/fixture/cassandra/CassandraTenant.java b/src/main/java/org/apache/fineract/cn/test/fixture/cassandra/CassandraTenant.java
similarity index 97%
rename from src/main/java/io/mifos/core/test/fixture/cassandra/CassandraTenant.java
rename to src/main/java/org/apache/fineract/cn/test/fixture/cassandra/CassandraTenant.java
index 89e4d68..83d92fd 100644
--- a/src/main/java/io/mifos/core/test/fixture/cassandra/CassandraTenant.java
+++ b/src/main/java/org/apache/fineract/cn/test/fixture/cassandra/CassandraTenant.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.test.fixture.cassandra;
+package org.apache.fineract.cn.test.fixture.cassandra;
 
 import com.datastax.driver.mapping.annotations.Column;
 import com.datastax.driver.mapping.annotations.PartitionKey;
diff --git a/src/main/java/io/mifos/core/test/fixture/mariadb/MariaDBInitializer.java b/src/main/java/org/apache/fineract/cn/test/fixture/mariadb/MariaDBInitializer.java
similarity index 96%
rename from src/main/java/io/mifos/core/test/fixture/mariadb/MariaDBInitializer.java
rename to src/main/java/org/apache/fineract/cn/test/fixture/mariadb/MariaDBInitializer.java
index 912d8d3..9b5de8d 100644
--- a/src/main/java/io/mifos/core/test/fixture/mariadb/MariaDBInitializer.java
+++ b/src/main/java/org/apache/fineract/cn/test/fixture/mariadb/MariaDBInitializer.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.test.fixture.mariadb;
+package org.apache.fineract.cn.test.fixture.mariadb;
 
 import ch.vorburger.mariadb4j.DB;
-import io.mifos.core.mariadb.util.JdbcUrlBuilder;
-import io.mifos.core.test.env.TestEnvironment;
-import io.mifos.core.test.fixture.DataStoreTenantInitializer;
+import org.apache.fineract.cn.test.env.TestEnvironment;
+import org.apache.fineract.cn.test.fixture.DataStoreTenantInitializer;
 
 import java.sql.*;
+import org.apache.fineract.cn.mariadb.util.JdbcUrlBuilder;
 
 @SuppressWarnings({"WeakerAccess", "unused", "SqlNoDataSourceInspection", "SqlDialectInspection"})
 public final class MariaDBInitializer extends DataStoreTenantInitializer {
diff --git a/src/main/java/io/mifos/core/test/fixture/mariadb/MariaDBTenant.java b/src/main/java/org/apache/fineract/cn/test/fixture/mariadb/MariaDBTenant.java
similarity index 96%
rename from src/main/java/io/mifos/core/test/fixture/mariadb/MariaDBTenant.java
rename to src/main/java/org/apache/fineract/cn/test/fixture/mariadb/MariaDBTenant.java
index 7d75d4c..6cf8b16 100644
--- a/src/main/java/io/mifos/core/test/fixture/mariadb/MariaDBTenant.java
+++ b/src/main/java/org/apache/fineract/cn/test/fixture/mariadb/MariaDBTenant.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.test.fixture.mariadb;
+package org.apache.fineract.cn.test.fixture.mariadb;
 
-import io.mifos.core.test.env.TestEnvironment;
+import org.apache.fineract.cn.test.env.TestEnvironment;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/src/main/java/io/mifos/core/test/listener/EnableEventRecording.java b/src/main/java/org/apache/fineract/cn/test/listener/EnableEventRecording.java
similarity index 96%
rename from src/main/java/io/mifos/core/test/listener/EnableEventRecording.java
rename to src/main/java/org/apache/fineract/cn/test/listener/EnableEventRecording.java
index 40dedf6..0df4e65 100644
--- a/src/main/java/io/mifos/core/test/listener/EnableEventRecording.java
+++ b/src/main/java/org/apache/fineract/cn/test/listener/EnableEventRecording.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.test.listener;
+package org.apache.fineract.cn.test.listener;
 
 import org.springframework.context.annotation.Import;
 
diff --git a/src/main/java/io/mifos/core/test/listener/EventRecord.java b/src/main/java/org/apache/fineract/cn/test/listener/EventRecord.java
similarity index 96%
rename from src/main/java/io/mifos/core/test/listener/EventRecord.java
rename to src/main/java/org/apache/fineract/cn/test/listener/EventRecord.java
index de175e7..b735423 100644
--- a/src/main/java/io/mifos/core/test/listener/EventRecord.java
+++ b/src/main/java/org/apache/fineract/cn/test/listener/EventRecord.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.test.listener;
+package org.apache.fineract.cn.test.listener;
 
 /**
  * @author Myrle Krantz
diff --git a/src/main/java/io/mifos/core/test/listener/EventRecorder.java b/src/main/java/org/apache/fineract/cn/test/listener/EventRecorder.java
similarity index 66%
rename from src/main/java/io/mifos/core/test/listener/EventRecorder.java
rename to src/main/java/org/apache/fineract/cn/test/listener/EventRecorder.java
index f3e4364..60b2a92 100644
--- a/src/main/java/io/mifos/core/test/listener/EventRecorder.java
+++ b/src/main/java/org/apache/fineract/cn/test/listener/EventRecorder.java
@@ -16,21 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.test.listener;/*
- * Copyright 2016 The Mifos Initiative.
- *
- * Licensed 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.
- */
+package org.apache.fineract.cn.test.listener;
 
 import java.util.function.Function;
 
diff --git a/src/main/java/io/mifos/core/test/listener/EventRecorderBeanDefiner.java b/src/main/java/org/apache/fineract/cn/test/listener/EventRecorderBeanDefiner.java
similarity index 97%
rename from src/main/java/io/mifos/core/test/listener/EventRecorderBeanDefiner.java
rename to src/main/java/org/apache/fineract/cn/test/listener/EventRecorderBeanDefiner.java
index 62cee1f..9b29ff4 100644
--- a/src/main/java/io/mifos/core/test/listener/EventRecorderBeanDefiner.java
+++ b/src/main/java/org/apache/fineract/cn/test/listener/EventRecorderBeanDefiner.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.test.listener;
+package org.apache.fineract.cn.test.listener;
 
 import com.google.gson.GsonBuilder;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/io/mifos/core/test/listener/InMemoryEventRecorder.java b/src/main/java/org/apache/fineract/cn/test/listener/InMemoryEventRecorder.java
similarity index 97%
rename from src/main/java/io/mifos/core/test/listener/InMemoryEventRecorder.java
rename to src/main/java/org/apache/fineract/cn/test/listener/InMemoryEventRecorder.java
index 8a21c8c..19e85d6 100644
--- a/src/main/java/io/mifos/core/test/listener/InMemoryEventRecorder.java
+++ b/src/main/java/org/apache/fineract/cn/test/listener/InMemoryEventRecorder.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.test.listener;
+package org.apache.fineract.cn.test.listener;
 
 import com.google.gson.Gson;
-import io.mifos.core.lang.TenantContextHolder;
+import org.apache.fineract.cn.lang.TenantContextHolder;
 import org.slf4j.Logger;
 
 import java.util.Date;
diff --git a/src/test/java/io/mifos/core/test/domain/DateStampCheckerTest.java b/src/test/java/org/apache/fineract/cn/test/domain/DateStampCheckerTest.java
similarity index 93%
rename from src/test/java/io/mifos/core/test/domain/DateStampCheckerTest.java
rename to src/test/java/org/apache/fineract/cn/test/domain/DateStampCheckerTest.java
index 9164be3..eae774b 100644
--- a/src/test/java/io/mifos/core/test/domain/DateStampCheckerTest.java
+++ b/src/test/java/org/apache/fineract/cn/test/domain/DateStampCheckerTest.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.test.domain;
+package org.apache.fineract.cn.test.domain;
 
-import io.mifos.core.lang.DateConverter;
+import org.apache.fineract.cn.lang.DateConverter;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/io/mifos/core/test/domain/TimeStampCheckerTest.java b/src/test/java/org/apache/fineract/cn/test/domain/TimeStampCheckerTest.java
similarity index 96%
rename from src/test/java/io/mifos/core/test/domain/TimeStampCheckerTest.java
rename to src/test/java/org/apache/fineract/cn/test/domain/TimeStampCheckerTest.java
index 952bb76..6672080 100644
--- a/src/test/java/io/mifos/core/test/domain/TimeStampCheckerTest.java
+++ b/src/test/java/org/apache/fineract/cn/test/domain/TimeStampCheckerTest.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.test.domain;
+package org.apache.fineract.cn.test.domain;
 
-import io.mifos.core.lang.DateConverter;
+import org.apache.fineract.cn.lang.DateConverter;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/io/mifos/core/test/env/TestEnvironmentTest.java b/src/test/java/org/apache/fineract/cn/test/env/TestEnvironmentTest.java
similarity index 95%
rename from src/test/java/io/mifos/core/test/env/TestEnvironmentTest.java
rename to src/test/java/org/apache/fineract/cn/test/env/TestEnvironmentTest.java
index 0c7ccfe..78740dd 100644
--- a/src/test/java/io/mifos/core/test/env/TestEnvironmentTest.java
+++ b/src/test/java/org/apache/fineract/cn/test/env/TestEnvironmentTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.test.env;
+package org.apache.fineract.cn.test.env;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -31,7 +31,7 @@
 
   @Test
   public void shouldPopulateAllProperties() throws Exception {
-    final TestEnvironment testEnvironment = new TestEnvironment("mifosio-core");
+    final TestEnvironment testEnvironment = new TestEnvironment("fineract-cn-core");
     testEnvironment.populate();
 
     for (final Object key : testEnvironment.properties.keySet()) {
@@ -41,7 +41,7 @@
 
   @Test
   public void shouldGenerateUniqueId() {
-    final TestEnvironment testEnvironment = new TestEnvironment("mifosio-core");
+    final TestEnvironment testEnvironment = new TestEnvironment("fineract-cn-core");
     final String uniqueId = testEnvironment.generateUniqueIdentifer(UNIQUE_ID_PREFIX);
     final String uniqueId2 = testEnvironment.generateUniqueIdentifer(UNIQUE_ID_PREFIX);
     Assert.assertNotEquals(uniqueId, uniqueId2);
@@ -51,7 +51,7 @@
 
   @Test
   public void shouldGenerateZeroBufferedUniqueId() {
-    final TestEnvironment testEnvironment = new TestEnvironment("mifosio-core");
+    final TestEnvironment testEnvironment = new TestEnvironment("fineract-cn-core");
     final String uniqueId = testEnvironment.generateUniqueIdentifer(UNIQUE_ID_PREFIX, 5);
     Assert.assertTrue(uniqueId.startsWith(UNIQUE_ID_PREFIX));
     Assert.assertEquals(uniqueId.length() - UNIQUE_ID_PREFIX.length(), 5);
diff --git a/src/test/java/io/mifos/core/test/listener/InMemoryEventRecorderTest.java b/src/test/java/org/apache/fineract/cn/test/listener/InMemoryEventRecorderTest.java
similarity index 97%
rename from src/test/java/io/mifos/core/test/listener/InMemoryEventRecorderTest.java
rename to src/test/java/org/apache/fineract/cn/test/listener/InMemoryEventRecorderTest.java
index e343410..4663a31 100644
--- a/src/test/java/io/mifos/core/test/listener/InMemoryEventRecorderTest.java
+++ b/src/test/java/org/apache/fineract/cn/test/listener/InMemoryEventRecorderTest.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.mifos.core.test.listener;
+package org.apache.fineract.cn.test.listener;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import io.mifos.core.lang.TenantContextHolder;
+import org.apache.fineract.cn.lang.TenantContextHolder;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;