diff --git a/src/main/scala/code/views/MapperViews.scala b/src/main/scala/code/views/MapperViews.scala
index feb3d1a46..ab8047b01 100644
--- a/src/main/scala/code/views/MapperViews.scala
+++ b/src/main/scala/code/views/MapperViews.scala
@@ -577,8 +577,22 @@ object MapperViews extends Views with MdcLoggable {
       })
     true
   }
-
-  def grantAccessToView(user : User, view : View) = {
+  
+  /**
+    * "Grant view access"  means to create the link between User <---> View.
+    *  All these links are handled in ViewPrivileges table. 
+    *  If ViewPrivileges.count(By(ViewPrivileges.view, v), By(ViewPrivileges.user, user.resourceUserId.value) ) == 0,
+    *  this means there is no link between v <--> user. 
+    *  So Just create one . 
+    * 
+    * @param user the user will to be granted access to.
+    * @param view the view will be granted access. 
+    *             
+    * @return create the link between user<--> view, return true. 
+    *         otherwise(If there existed view/ if there is no view ), it return false.
+    *         
+    */
+  def grantAccessToView(user : User, view : View): Boolean = {
     val v = ViewImpl.find(view.uid).orNull
     if ( ViewPrivileges.count(By(ViewPrivileges.view, v), By(ViewPrivileges.user, user.resourceUserId.value) ) == 0 )
     ViewPrivileges.create.
diff --git a/src/test/scala/code/api/directloginTest.scala b/src/test/scala/code/api/directloginTest.scala
index b7989841f..31c073369 100644
--- a/src/test/scala/code/api/directloginTest.scala
+++ b/src/test/scala/code/api/directloginTest.scala
@@ -4,7 +4,7 @@ import code.api.util.ErrorMessages
 import code.consumer.Consumers
 import code.loginattempts.LoginAttempt
 import code.model.dataAccess.AuthUser
-import code.model.{Consumer => OBPConsumer, Token => OBPToken}
+import code.setup.{APIResponse, ServerSetup}
 import net.liftweb.json.JsonAST.{JArray, JField, JObject, JString}
 import net.liftweb.mapper.By
 import net.liftweb.util.Helpers._
diff --git a/src/test/scala/code/api/oauthTest.scala b/src/test/scala/code/api/oauthTest.scala
index f78f196c6..074db7b38 100644
--- a/src/test/scala/code/api/oauthTest.scala
+++ b/src/test/scala/code/api/oauthTest.scala
@@ -40,6 +40,7 @@ import code.consumer.Consumers
 import code.loginattempts.LoginAttempt
 import code.model.dataAccess.AuthUser
 import code.model.{Consumer => OBPConsumer, Token => OBPToken}
+import code.setup.ServerSetup
 import dispatch.Defaults._
 import dispatch._
 import net.liftweb.common.{Box, Failure}
@@ -51,7 +52,6 @@ import org.scalatest.selenium._
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
-
 import code.util.Helper.MdcLoggable
 
 case class OAuthResponse(
diff --git a/src/test/scala/code/api/API12Test.scala b/src/test/scala/code/api/v1_2_0/API12Test.scala
similarity index 99%
rename from src/test/scala/code/api/API12Test.scala
rename to src/test/scala/code/api/v1_2_0/API12Test.scala
index 93a6db7de..a31fc4cbb 100644
--- a/src/test/scala/code/api/API12Test.scala
+++ b/src/test/scala/code/api/v1_2_0/API12Test.scala
@@ -29,23 +29,24 @@ Berlin 13359, Germany
   Ayoub Benali: ayoub AT tesobe DOT com
 
  */
-package code.api.v1_2
+package code.api.v1_2_0
 
 import java.util.Date
-import code.api.{User1AllPrivileges, DefaultUsers}
-import code.api.util.APIUtil
-import org.scalatest._
-import _root_.net.liftweb.util._
-import Helpers._
-import dispatch._
+
+import _root_.net.liftweb.json.JsonAST.JObject
 import _root_.net.liftweb.json.Serialization.write
-import _root_.net.liftweb.json.JsonAST.{JObject}
-import net.liftweb.json.JsonDSL._
-import scala.util.Random._
-import code.api.APIResponse
+import _root_.net.liftweb.util._
+import code.api.util.APIUtil
+import code.api.util.APIUtil.OAuth._
+import code.api.v1_2._
 import code.model.{Consumer => OBPConsumer, Token => OBPToken, _}
-import APIUtil.OAuth._
+import code.setup.{APIResponse, DefaultUsers, User1AllPrivileges}
 import code.views.Views
+import net.liftweb.json.JsonDSL._
+import net.liftweb.util.Helpers._
+import org.scalatest._
+
+import scala.util.Random._
 
 
 class API1_2Test extends User1AllPrivileges with DefaultUsers {
@@ -3659,8 +3660,8 @@ class API1_2Test extends User1AllPrivileges with DefaultUsers {
   }
 
   feature("transactions with params"){
-    import java.util.Calendar
     import java.text.SimpleDateFormat
+    import java.util.Calendar
     val defaultFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
     val rollbackFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
     scenario("we don't get transactions due to wrong value for obp_sort_direction parameter", API1_2, GetTransactions, GetTransactionsWithParams) {
diff --git a/src/test/scala/code/api/API121Test.scala b/src/test/scala/code/api/v1_2_1/API121Test.scala
similarity index 99%
rename from src/test/scala/code/api/API121Test.scala
rename to src/test/scala/code/api/v1_2_1/API121Test.scala
index 6334038bd..de18d8fc9 100644
--- a/src/test/scala/code/api/API121Test.scala
+++ b/src/test/scala/code/api/v1_2_1/API121Test.scala
@@ -31,23 +31,21 @@ Berlin 13359, Germany
  */
 package code.api.v1_2_1
 
-import code.api.{PrivateUser2Accounts, User1AllPrivileges, DefaultUsers}
-import code.api.util.APIUtil
-import code.bankconnectors.Connector
-import org.scalatest.Tag
-import _root_.net.liftweb.util._
-import Helpers._
-import dispatch._
 import _root_.net.liftweb.json.Serialization.write
-import net.liftweb.json.JsonDSL._
-import net.liftweb.json._
-import scala.util.Random._
+import code.api.util.APIUtil
+import code.api.util.APIUtil.OAuth._
+import code.bankconnectors.Connector
 import code.model.{Consumer => OBPConsumer, Token => OBPToken, _}
-import APIUtil.OAuth._
 import code.views.Views
 import net.liftweb.json.JsonAST.JString
-import code.api.APIResponse
-import net.liftweb.util.Props
+import net.liftweb.json.JsonDSL._
+import net.liftweb.json._
+import net.liftweb.util.Helpers._
+import _root_.net.liftweb.util.{Props, _}
+import code.setup.{APIResponse, DefaultUsers, PrivateUser2Accounts, User1AllPrivileges}
+import org.scalatest.Tag
+
+import scala.util.Random._
 
 class API1_2_1Test extends User1AllPrivileges with DefaultUsers with PrivateUser2Accounts {
 
@@ -4296,9 +4294,8 @@ class API1_2_1Test extends User1AllPrivileges with DefaultUsers with PrivateUser
   }
 
   feature("transactions with params"){
-    import java.util.Calendar
     import java.text.SimpleDateFormat
-    import java.util.Date
+    import java.util.{Calendar, Date}
 
     val defaultFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
     val rollbackFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
diff --git a/src/test/scala/code/api/v1_3_0/PhysicalCardsTest.scala b/src/test/scala/code/api/v1_3_0/PhysicalCardsTest.scala
index 522ac7959..f93b9a518 100644
--- a/src/test/scala/code/api/v1_3_0/PhysicalCardsTest.scala
+++ b/src/test/scala/code/api/v1_3_0/PhysicalCardsTest.scala
@@ -4,7 +4,6 @@ import java.util.Date
 
 import code.api.util.APIUtil.OAuth._
 import code.api.v2_1_0.{BranchJsonPost, TransactionRequestCommonBodyJSON}
-import code.api.{DefaultConnectorTestSetup, DefaultUsers, ServerSetup}
 import code.bankconnectors.{Connector, InboundUser, OBPQueryParam}
 import code.branches.Branches.{Branch, BranchId}
 import code.branches.MappedBranch
@@ -16,6 +15,7 @@ import code.model.dataAccess.ResourceUser
 import code.transactionrequests.TransactionRequests._
 import net.liftweb.common.{Box, Empty, Failure, Full}
 import code.products.Products.{Product, ProductCode}
+import code.setup.{DefaultConnectorTestSetup, DefaultUsers, ServerSetup}
 import code.transactionrequests.TransactionRequestTypeCharge
 import code.util.Helper.MdcLoggable
 
diff --git a/src/test/scala/code/api/v1_4_0/AtmsTest.scala b/src/test/scala/code/api/v1_4_0/AtmsTest.scala
index c8f05ca9c..b59dfdcbb 100644
--- a/src/test/scala/code/api/v1_4_0/AtmsTest.scala
+++ b/src/test/scala/code/api/v1_4_0/AtmsTest.scala
@@ -1,13 +1,12 @@
 package code.api.v1_4_0
 
-import code.api.DefaultUsers
 import code.api.v1_4_0.JSONFactory1_4_0.{AtmJson, AtmsJson}
 import code.api.util.APIUtil.OAuth._
-
 import code.atms.Atms.{Atm, AtmId}
 import code.atms.{Atms, AtmsProvider}
 import code.common.{Address, License, Location, Meta}
 import code.model.BankId
+import code.setup.DefaultUsers
 
 class AtmsTest extends V140ServerSetup with DefaultUsers {
 
diff --git a/src/test/scala/code/api/v1_4_0/BranchesTest.scala b/src/test/scala/code/api/v1_4_0/BranchesTest.scala
index 779887058..665f11588 100644
--- a/src/test/scala/code/api/v1_4_0/BranchesTest.scala
+++ b/src/test/scala/code/api/v1_4_0/BranchesTest.scala
@@ -1,13 +1,13 @@
 package code.api.v1_4_0
 
-import code.api.DefaultUsers
 import code.api.v1_4_0.JSONFactory1_4_0.{BranchJson, BranchesJson}
 import code.api.util.APIUtil.OAuth._
 import dispatch._
-import code.common.{License, Address, Location, Meta}
-import code.branches.Branches.{BranchId, Branch, Lobby, DriveUp}
+import code.common.{Address, License, Location, Meta}
+import code.branches.Branches.{Branch, BranchId, DriveUp, Lobby}
 import code.branches.{Branches, BranchesProvider}
 import code.model.BankId
+import code.setup.DefaultUsers
 
 /*
 Note This does not test retrieval from a backend.
diff --git a/src/test/scala/code/api/v1_4_0/CustomerTest.scala b/src/test/scala/code/api/v1_4_0/CustomerTest.scala
index 78f944b6b..313969166 100644
--- a/src/test/scala/code/api/v1_4_0/CustomerTest.scala
+++ b/src/test/scala/code/api/v1_4_0/CustomerTest.scala
@@ -2,7 +2,6 @@ package code.api.v1_4_0
 
 import java.text.SimpleDateFormat
 
-import code.api.DefaultUsers
 import code.api.util.{ApiRole, ErrorMessages}
 import code.api.v1_4_0.JSONFactory1_4_0.{CustomerFaceImageJson, CustomerJsonV140}
 import code.api.v2_0_0.{CreateCustomerJson, V200ServerSetup}
@@ -12,6 +11,7 @@ import net.liftweb.json.JsonAST._
 import net.liftweb.json.Serialization._
 import code.api.util.APIUtil.OAuth._
 import code.entitlement.Entitlement
+import code.setup.DefaultUsers
 import code.usercustomerlinks.UserCustomerLink
 
 class CustomerTest extends V200ServerSetup with DefaultUsers {
diff --git a/src/test/scala/code/api/v1_4_0/MappedCustomerMessagesTest.scala b/src/test/scala/code/api/v1_4_0/MappedCustomerMessagesTest.scala
index c7be7ddf2..62353c8d3 100644
--- a/src/test/scala/code/api/v1_4_0/MappedCustomerMessagesTest.scala
+++ b/src/test/scala/code/api/v1_4_0/MappedCustomerMessagesTest.scala
@@ -3,7 +3,6 @@ package code.api.v1_4_0
 import java.text.SimpleDateFormat
 import java.util.Date
 
-import code.api.DefaultUsers
 import code.api.util.{APIUtil, ApiRole}
 import code.api.v1_4_0.JSONFactory1_4_0.{AddCustomerMessageJson, CustomerFaceImageJson, CustomerJsonV140, CustomerMessagesJson}
 import code.customer.{Customer, MappedCustomerMessage, MockCustomerFaceImage}
@@ -12,6 +11,7 @@ import code.usercustomerlinks.UserCustomerLink
 import code.api.util.APIUtil.OAuth._
 import code.api.v2_0_0.CreateCustomerJson
 import code.entitlement.Entitlement
+import code.setup.DefaultUsers
 import net.liftweb.common.Box
 import net.liftweb.json.Serialization.write
 import net.liftweb.common.{Empty, Full}
diff --git a/src/test/scala/code/api/v1_4_0/ProductsTest.scala b/src/test/scala/code/api/v1_4_0/ProductsTest.scala
index 32b54dbd1..0b795954a 100644
--- a/src/test/scala/code/api/v1_4_0/ProductsTest.scala
+++ b/src/test/scala/code/api/v1_4_0/ProductsTest.scala
@@ -1,7 +1,5 @@
 package code.api.v1_4_0
 
-import code.api.DefaultUsers
-import code.api.ServerSetup
 import code.api.util.APIUtil.OAuth._
 import code.api.v1_4_0.JSONFactory1_4_0.{ProductJson, ProductsJson}
 import code.common.{License, Meta}
@@ -9,6 +7,7 @@ import code.model.BankId
 import code.products.Products.ProductCode
 import code.products.Products.Product
 import code.products.{Products, ProductsProvider}
+import code.setup.{DefaultUsers, ServerSetup}
 import dispatch._
 
 class ProductsTest extends ServerSetup with DefaultUsers with V140ServerSetup {
diff --git a/src/test/scala/code/api/v1_4_0/TransactionRequestsTest.scala b/src/test/scala/code/api/v1_4_0/TransactionRequestsTest.scala
index a8d47f758..c419bc846 100644
--- a/src/test/scala/code/api/v1_4_0/TransactionRequestsTest.scala
+++ b/src/test/scala/code/api/v1_4_0/TransactionRequestsTest.scala
@@ -1,18 +1,18 @@
 package code.api.v1_4_0
 
-import code.api.{DefaultUsers, ServerSetupWithTestData}
 import code.api.util.APIUtil.OAuth._
 import code.api.v1_2_1.AmountOfMoneyJsonV121
 import code.api.v1_4_0.JSONFactory1_4_0._
 import code.bankconnectors.Connector
 import code.model.{AccountId, BankAccount, TransactionRequestId}
+import code.setup.{DefaultUsers}
 import code.transactionrequests.TransactionRequests
 import net.liftweb.json.JsonAST.JString
 import net.liftweb.json.Serialization.write
 import net.liftweb.util.Props
 import org.scalatest.Tag
 
-class TransactionRequestsTest extends ServerSetupWithTestData with DefaultUsers with V140ServerSetup {
+class TransactionRequestsTest extends V140ServerSetup with DefaultUsers {
 
   object TransactionRequest extends Tag("transactionRequests")
 
diff --git a/src/test/scala/code/api/v1_4_0/V140ServerSetup.scala b/src/test/scala/code/api/v1_4_0/V140ServerSetup.scala
index 698ef58a5..dd7efc867 100644
--- a/src/test/scala/code/api/v1_4_0/V140ServerSetup.scala
+++ b/src/test/scala/code/api/v1_4_0/V140ServerSetup.scala
@@ -1,6 +1,6 @@
 package code.api.v1_4_0
 
-import code.api.ServerSetupWithTestData
+import code.setup.ServerSetupWithTestData
 
 trait V140ServerSetup extends ServerSetupWithTestData {
 
diff --git a/src/test/scala/code/api/v2_0_0/AccountTest.scala b/src/test/scala/code/api/v2_0_0/AccountTest.scala
index 0a645ddf7..6f6f45e2a 100644
--- a/src/test/scala/code/api/v2_0_0/AccountTest.scala
+++ b/src/test/scala/code/api/v2_0_0/AccountTest.scala
@@ -2,12 +2,12 @@ package code.api.v2_0_0
 
 import java.text.SimpleDateFormat
 
-import code.api.DefaultUsers
 import code.api.util.APIUtil.OAuth._
 import code.api.util.ErrorMessages
 import code.api.v1_2_1.{AmountOfMoneyJsonV121 => AmountOfMoneyJSON121}
 import code.model.BankId
 import code.model.dataAccess.MappedBankAccount
+import code.setup.DefaultUsers
 import net.liftweb.json.Serialization.write
 import net.liftweb.json.JsonAST._
 
diff --git a/src/test/scala/code/api/v2_0_0/CustomerTest.scala b/src/test/scala/code/api/v2_0_0/CustomerTest.scala
index 8323802e2..855373976 100644
--- a/src/test/scala/code/api/v2_0_0/CustomerTest.scala
+++ b/src/test/scala/code/api/v2_0_0/CustomerTest.scala
@@ -2,13 +2,13 @@ package code.api.v2_0_0
 
 import java.text.SimpleDateFormat
 
-import code.api.DefaultUsers
 import code.customer.Customer
 import code.model.BankId
 import code.api.util.APIUtil.OAuth._
 import code.api.util.{ApiRole, ErrorMessages}
 import code.api.v1_4_0.JSONFactory1_4_0.{CustomerFaceImageJson, CustomerJsonV140}
 import code.entitlement.Entitlement
+import code.setup.DefaultUsers
 import code.usercustomerlinks.UserCustomerLink
 import net.liftweb.json.JsonAST.{JField, JObject, JString}
 import net.liftweb.json.Serialization.write
diff --git a/src/test/scala/code/api/v2_0_0/EntitlementTests.scala b/src/test/scala/code/api/v2_0_0/EntitlementTests.scala
index aa2d71822..4fe4bb1e0 100644
--- a/src/test/scala/code/api/v2_0_0/EntitlementTests.scala
+++ b/src/test/scala/code/api/v2_0_0/EntitlementTests.scala
@@ -1,12 +1,12 @@
 package code.api.v2_0_0
 
-import code.api.DefaultUsers
 import code.api.util.ApiRole.CanGetEntitlementsForAnyUserAtAnyBank
 import code.api.util.{ApiRole, ErrorMessages}
 import code.entitlement.Entitlement
 import net.liftweb.json.JsonAST._
 import code.api.util.APIUtil.OAuth._
 import code.api.util.ErrorMessages.UserDoesNotHaveRole
+import code.setup.DefaultUsers
 
 
 /**
diff --git a/src/test/scala/code/api/v2_0_0/TransactionRequestsTest.scala b/src/test/scala/code/api/v2_0_0/TransactionRequestsTest.scala
index a7a425af8..cfcb83ed2 100644
--- a/src/test/scala/code/api/v2_0_0/TransactionRequestsTest.scala
+++ b/src/test/scala/code/api/v2_0_0/TransactionRequestsTest.scala
@@ -1,7 +1,7 @@
 package code.api.v2_0_0
 
 import code.api.util.ErrorMessages
-import code.api.{ErrorMessage, DefaultUsers, ServerSetupWithTestData}
+import code.api.ErrorMessage
 import code.api.util.APIUtil.OAuth._
 import code.api.v1_2_1.AmountOfMoneyJsonV121
 import code.api.v1_4_0.JSONFactory1_4_0.{ChallengeAnswerJSON, TransactionRequestAccountJsonV140}
@@ -13,8 +13,9 @@ import net.liftweb.json.Serialization.write
 import net.liftweb.util.Props
 import org.scalatest.Tag
 import code.api.util.ApiRole._
+import code.setup.{DefaultUsers, ServerSetupWithTestData}
 
-class TransactionRequestsTest extends ServerSetupWithTestData with DefaultUsers with V200ServerSetup {
+class TransactionRequestsTest extends V200ServerSetup with DefaultUsers {
 
   object TransactionRequest extends Tag("transactionRequests")
 
diff --git a/src/test/scala/code/api/v2_0_0/V200ServerSetup.scala b/src/test/scala/code/api/v2_0_0/V200ServerSetup.scala
index 203cfaf75..65a72543a 100644
--- a/src/test/scala/code/api/v2_0_0/V200ServerSetup.scala
+++ b/src/test/scala/code/api/v2_0_0/V200ServerSetup.scala
@@ -1,6 +1,6 @@
 package code.api.v2_0_0
 
-import code.api.ServerSetupWithTestData
+import code.setup.ServerSetupWithTestData
 
 trait V200ServerSetup extends ServerSetupWithTestData {
 
diff --git a/src/test/scala/code/api/v2_1_0/CreateBranchTest.scala b/src/test/scala/code/api/v2_1_0/CreateBranchTest.scala
index cfab50230..32505b229 100644
--- a/src/test/scala/code/api/v2_1_0/CreateBranchTest.scala
+++ b/src/test/scala/code/api/v2_1_0/CreateBranchTest.scala
@@ -1,12 +1,12 @@
 package code.api.v2_1_0
 
-import code.api.DefaultUsers
 import code.api.util.APIUtil.OAuth._
-import code.api.util.ApiRole.{CanCreateBranch}
+import code.api.util.ApiRole.CanCreateBranch
 import code.api.v1_4_0.JSONFactory1_4_0._
 import code.branches.Branches.BranchId
 import code.model.{AccountId, ViewId}
-import net.liftweb.json.JsonAST.{JString}
+import code.setup.DefaultUsers
+import net.liftweb.json.JsonAST.JString
 import net.liftweb.json.Serialization.write
 
 class CreateBranchTest extends V210ServerSetup with DefaultUsers {
diff --git a/src/test/scala/code/api/v2_1_0/CreateCounterpartyTest.scala b/src/test/scala/code/api/v2_1_0/CreateCounterpartyTest.scala
index 8c5115977..ad0be58ca 100644
--- a/src/test/scala/code/api/v2_1_0/CreateCounterpartyTest.scala
+++ b/src/test/scala/code/api/v2_1_0/CreateCounterpartyTest.scala
@@ -1,10 +1,9 @@
 package code.api.v2_1_0
 
-
-import code.api.DefaultUsers
 import code.api.util.APIUtil.OAuth._
 import code.api.util.ErrorMessages
 import code.model.{AccountId, ViewId}
+import code.setup.DefaultUsers
 import net.liftweb.json.JsonAST.{JField, JObject, JString}
 import net.liftweb.json.Serialization.write
 
diff --git a/src/test/scala/code/api/v2_1_0/CreateTransactionTypeTest.scala b/src/test/scala/code/api/v2_1_0/CreateTransactionTypeTest.scala
index 8d9d0c6c5..f52f65925 100644
--- a/src/test/scala/code/api/v2_1_0/CreateTransactionTypeTest.scala
+++ b/src/test/scala/code/api/v2_1_0/CreateTransactionTypeTest.scala
@@ -1,6 +1,5 @@
 package code.api.v2_1_0
 
-import code.api.DefaultUsers
 import code.api.util.APIUtil.OAuth._
 import code.api.util.ApiRole.{CanCreateAnyTransactionRequest, CanCreateTransactionType, CanGetEntitlementsForAnyUserAtAnyBank, CanGetEntitlementsForAnyUserAtOneBank}
 import code.api.util.{ApiRole, ErrorMessages}
@@ -9,6 +8,7 @@ import code.api.v2_0_0.{CreateAccountJSON, TransactionTypeJsonV200}
 import code.entitlement.Entitlement
 import code.model.dataAccess.MappedBankAccount
 import code.model.{AmountOfMoney, BankId, TransactionTypeId}
+import code.setup.DefaultUsers
 import code.transaction_types.MappedTransactionType
 import net.liftweb.json.JsonAST._
 import net.liftweb.json.Serialization._
diff --git a/src/test/scala/code/api/v2_1_0/CustomerTest.scala b/src/test/scala/code/api/v2_1_0/CustomerTest.scala
index 250aed92a..999c4b0b1 100644
--- a/src/test/scala/code/api/v2_1_0/CustomerTest.scala
+++ b/src/test/scala/code/api/v2_1_0/CustomerTest.scala
@@ -2,7 +2,6 @@ package code.api.v2_1_0
 
 import java.text.SimpleDateFormat
 
-import code.api.DefaultUsers
 import code.api.util.{ApiRole, ErrorMessages}
 import code.api.v1_4_0.JSONFactory1_4_0.CustomerFaceImageJson
 import code.customer.Customer
@@ -11,6 +10,7 @@ import code.model.BankId
 import net.liftweb.json.Serialization.write
 import code.api.util.APIUtil.OAuth._
 import code.api.v1_2_1.AmountOfMoneyJsonV121
+import code.setup.DefaultUsers
 import code.usercustomerlinks.UserCustomerLink
 import net.liftweb.json.JsonAST.{JField, JObject, JString}
 
diff --git a/src/test/scala/code/api/v2_1_0/EntitlementTests.scala b/src/test/scala/code/api/v2_1_0/EntitlementTests.scala
index 9a939fa0a..8b0353419 100644
--- a/src/test/scala/code/api/v2_1_0/EntitlementTests.scala
+++ b/src/test/scala/code/api/v2_1_0/EntitlementTests.scala
@@ -1,14 +1,13 @@
 package code.api.v2_1_0
 
-
 import code.api.util.APIUtil.OAuth._
-import code.api.DefaultUsers
 import code.api.util.ApiRole.{CanGetEntitlementsForAnyUserAtAnyBank, CanGetEntitlementsForAnyUserAtOneBank}
 import code.api.util.ErrorMessages.UserDoesNotHaveRole
 import code.entitlement.Entitlement
 import code.model.BankId
 import net.liftweb.json.JsonAST._
 import code.api.util.{ApiRole, ErrorMessages}
+import code.setup.DefaultUsers
 
 
 
diff --git a/src/test/scala/code/api/v2_1_0/TransactionRequestsTest.scala b/src/test/scala/code/api/v2_1_0/TransactionRequestsTest.scala
index 36bec3fb1..f114eade2 100644
--- a/src/test/scala/code/api/v2_1_0/TransactionRequestsTest.scala
+++ b/src/test/scala/code/api/v2_1_0/TransactionRequestsTest.scala
@@ -8,16 +8,17 @@ import code.api.util.ErrorMessages
 import code.api.v1_2_1.AmountOfMoneyJsonV121
 import code.api.v1_4_0.JSONFactory1_4_0.{ChallengeAnswerJSON, TransactionRequestAccountJsonV140}
 import code.api.v2_0_0.TransactionRequestBodyJsonV200
-import code.api.{APIResponse, ChargePolicy, DefaultUsers, ServerSetupWithTestData}
+import code.api.ChargePolicy
 import code.bankconnectors.Connector
 import code.fx.fx
 import code.model.{AccountId, AccountRoutingAddress, BankAccount, TransactionRequestId}
+import code.setup.{APIResponse, DefaultUsers, ServerSetupWithTestData}
 import net.liftweb.json.JsonAST.{JField, JObject, JString}
 import net.liftweb.json.Serialization.write
 import net.liftweb.util.Props
 import org.scalatest.Tag
 
-class TransactionRequestsTest extends ServerSetupWithTestData with DefaultUsers with V210ServerSetup {
+class TransactionRequestsTest extends V210ServerSetup with DefaultUsers {
 
   object TransactionRequest extends Tag("transactionRequests")
 
diff --git a/src/test/scala/code/api/v2_1_0/V210ServerSetup.scala b/src/test/scala/code/api/v2_1_0/V210ServerSetup.scala
index 14d094e1f..c670bbedb 100644
--- a/src/test/scala/code/api/v2_1_0/V210ServerSetup.scala
+++ b/src/test/scala/code/api/v2_1_0/V210ServerSetup.scala
@@ -1,6 +1,6 @@
 package code.api.v2_1_0
 
-import code.api.ServerSetupWithTestData
+import code.setup.ServerSetupWithTestData
 
 /**
  * Created by markom on 10/14/16.
diff --git a/src/test/scala/code/api/v2_2_0/API2_2_0Test.scala b/src/test/scala/code/api/v2_2_0/API2_2_0Test.scala
index ba4c03eed..92f8c5133 100644
--- a/src/test/scala/code/api/v2_2_0/API2_2_0Test.scala
+++ b/src/test/scala/code/api/v2_2_0/API2_2_0Test.scala
@@ -36,8 +36,8 @@ import _root_.net.liftweb.json.JsonAST.JObject
 import _root_.net.liftweb.json.Serialization.write
 import code.api.util.APIUtil.OAuth._
 import code.api.v1_2._
-import code.api.{APIResponse, DefaultUsers, User1AllPrivileges}
 import code.model.{Consumer => OBPConsumer, Token => OBPToken, _}
+import code.setup.{APIResponse, DefaultUsers, User1AllPrivileges}
 import net.liftweb.json.JsonDSL._
 import net.liftweb.util.Helpers._
 import org.scalatest._
diff --git a/src/test/scala/code/api/v2_2_0/V220ServerSetup.scala b/src/test/scala/code/api/v2_2_0/V220ServerSetup.scala
index 7d08ad3c8..d159f81bc 100644
--- a/src/test/scala/code/api/v2_2_0/V220ServerSetup.scala
+++ b/src/test/scala/code/api/v2_2_0/V220ServerSetup.scala
@@ -1,6 +1,6 @@
 package code.api.v2_2_0
 
-import code.api.ServerSetupWithTestData
+import code.setup.ServerSetupWithTestData
 
 /**
  * Created by markom on 10/14/16.
diff --git a/src/test/scala/code/api/v3_0_0/API3_0_0Test.scala b/src/test/scala/code/api/v3_0_0/API3_0_0Test.scala
index 04cfe5aff..3c4a72c6e 100644
--- a/src/test/scala/code/api/v3_0_0/API3_0_0Test.scala
+++ b/src/test/scala/code/api/v3_0_0/API3_0_0Test.scala
@@ -36,8 +36,8 @@ import _root_.net.liftweb.json.Serialization.write
 import code.api.util.APIUtil.OAuth._
 import code.api.v1_2._
 import code.api.v2_2_0.{AccountsJSONV220, ViewJSONV220, ViewsJSONV220}
-import code.api.{APIResponse, DefaultUsers, User1AllPrivileges}
 import code.model.{CreateViewJSON, UpdateViewJSON}
+import code.setup.{APIResponse, DefaultUsers, User1AllPrivileges}
 import net.liftweb.json.JsonDSL._
 import net.liftweb.util.Helpers._
 import org.scalatest._
diff --git a/src/test/scala/code/api/v3_0_0/AccountTest.scala b/src/test/scala/code/api/v3_0_0/AccountTest.scala
index 6972b0860..52f396033 100644
--- a/src/test/scala/code/api/v3_0_0/AccountTest.scala
+++ b/src/test/scala/code/api/v3_0_0/AccountTest.scala
@@ -1,9 +1,9 @@
 package code.api.v3_0_0
 
-import code.api.DefaultUsers
 import code.api.util.APIUtil.OAuth._
 import code.api.util.ErrorMessages
 import code.api.v1_2_1.{AmountOfMoneyJsonV121 => AmountOfMoneyJSON121}
+import code.setup.DefaultUsers
 import net.liftweb.json.JsonAST._
 import net.liftweb.json.Serialization.write
 
diff --git a/src/test/scala/code/api/v3_0_0/V300ServerSetup.scala b/src/test/scala/code/api/v3_0_0/V300ServerSetup.scala
index bfea91971..719f37daa 100644
--- a/src/test/scala/code/api/v3_0_0/V300ServerSetup.scala
+++ b/src/test/scala/code/api/v3_0_0/V300ServerSetup.scala
@@ -1,6 +1,6 @@
 package code.api.v3_0_0
 
-import code.api.ServerSetupWithTestData
+import code.setup.ServerSetupWithTestData
 
 /**
  * Created by Hongwei Zhang on 05/05/17.
diff --git a/src/test/scala/code/atms/MappedAtmsProviderTest.scala b/src/test/scala/code/atms/MappedAtmsProviderTest.scala
index b3a24e9f4..13b7737f3 100644
--- a/src/test/scala/code/atms/MappedAtmsProviderTest.scala
+++ b/src/test/scala/code/atms/MappedAtmsProviderTest.scala
@@ -1,8 +1,8 @@
 package code.atms
 
-import code.api.ServerSetup
 import code.atms.Atms.Atm
 import code.model.BankId
+import code.setup.ServerSetup
 import net.liftweb.mapper.By
 
 class MappedAtmsProviderTest extends ServerSetup {
diff --git a/src/test/scala/code/bankaccountcreation/BankAccountCreationListenerTest.scala b/src/test/scala/code/bankaccountcreation/BankAccountCreationListenerTest.scala
index 9dbe76d81..18e5dfee0 100644
--- a/src/test/scala/code/bankaccountcreation/BankAccountCreationListenerTest.scala
+++ b/src/test/scala/code/bankaccountcreation/BankAccountCreationListenerTest.scala
@@ -1,7 +1,5 @@
 package code.bankaccountcreation
 
-import code.api.DefaultConnectorTestSetup
-import code.api.ServerSetup
 import code.model.{BankId, User}
 import code.views.Views
 import net.liftweb.common.Full
@@ -12,6 +10,7 @@ import com.tesobe.model.CreateBankAccount
 import code.model.dataAccess.{BankAccountCreationListener, ResourceUser}
 import net.liftmodules.amqp.AMQPMessage
 import code.bankconnectors.Connector
+import code.setup.{DefaultConnectorTestSetup, ServerSetup}
 import code.users.Users
 
 class BankAccountCreationListenerTest extends ServerSetup with DefaultConnectorTestSetup {
diff --git a/src/test/scala/code/bankaccountcreation/BankAccountCreationTest.scala b/src/test/scala/code/bankaccountcreation/BankAccountCreationTest.scala
index 13f204330..45e2a70eb 100644
--- a/src/test/scala/code/bankaccountcreation/BankAccountCreationTest.scala
+++ b/src/test/scala/code/bankaccountcreation/BankAccountCreationTest.scala
@@ -1,9 +1,8 @@
 package code.bankaccountcreation
 
-import code.api.ServerSetup
-import code.api.{DefaultConnectorTestSetup, DefaultUsers}
 import code.bankconnectors.Connector
 import code.model.{AccountId, BankId}
+import code.setup.{DefaultConnectorTestSetup, DefaultUsers, ServerSetup}
 import org.scalatest.Tag
 
 class BankAccountCreationTest extends ServerSetup with DefaultUsers with DefaultConnectorTestSetup {
diff --git a/src/test/scala/code/branches/MappedBranchesProviderTest.scala b/src/test/scala/code/branches/MappedBranchesProviderTest.scala
index f8802a315..b4cb39f31 100644
--- a/src/test/scala/code/branches/MappedBranchesProviderTest.scala
+++ b/src/test/scala/code/branches/MappedBranchesProviderTest.scala
@@ -1,10 +1,10 @@
 package code.branches
 
-import code.api.ServerSetup
 import code.model.BankId
 import code.branches.Branches.BranchId
 import net.liftweb.mapper.By
 import code.branches.Branches.Branch
+import code.setup.ServerSetup
 
 class MappedBranchesProviderTest extends ServerSetup {
 
diff --git a/src/test/scala/code/crm/MappedCrmEventProviderTest.scala b/src/test/scala/code/crm/MappedCrmEventProviderTest.scala
index 4c20eee44..ccfdb33bb 100644
--- a/src/test/scala/code/crm/MappedCrmEventProviderTest.scala
+++ b/src/test/scala/code/crm/MappedCrmEventProviderTest.scala
@@ -2,13 +2,21 @@ package code.crm
 
 import java.util.Date
 
-import code.api.DefaultUsers
-import code.api.ServerSetup
-import code.model.BankId
+import code.setup.{DefaultUsers, ServerSetup}
 import net.liftweb.mapper.By
 
 class MappedCrmEventProviderTest extends ServerSetup with DefaultUsers {
-
+  
+  override def beforeAll() = {
+    super.beforeAll()
+    MappedCrmEvent.bulkDelete_!!()
+  }
+  
+  override def afterEach() = {
+    super.afterEach()
+    MappedCrmEvent.bulkDelete_!!()
+  }
+  
   def createCrmEvent1() = MappedCrmEvent.create
     .mCrmEventId("ASDFIUHUIUYFD444")
     .mBankId(mockBankId1.value)
diff --git a/src/test/scala/code/customer/MappedCustomerInfoTest.scala b/src/test/scala/code/customer/MappedCustomerInfoTest.scala
index b35e26c59..7da2264d7 100644
--- a/src/test/scala/code/customer/MappedCustomerInfoTest.scala
+++ b/src/test/scala/code/customer/MappedCustomerInfoTest.scala
@@ -3,7 +3,6 @@ package code.customer
 import java.text.SimpleDateFormat
 import java.util.{Date, UUID}
 
-import code.api.DefaultUsers
 import code.api.util.APIUtil.OAuth._
 import code.api.util.ApiRole
 import code.api.v1_4_0.JSONFactory1_4_0.CustomerFaceImageJson
@@ -12,6 +11,7 @@ import code.api.v2_0_0.CreateCustomerJson
 import code.entitlement.Entitlement
 import code.model.BankId
 import code.model.dataAccess.{MappedBank, ResourceUser}
+import code.setup.DefaultUsers
 import code.usercustomerlinks.UserCustomerLink
 import net.liftweb.common.{Box, Empty, Full}
 import net.liftweb.json.Serialization._
diff --git a/src/test/scala/code/entitlement/MappedEntitlementTest.scala b/src/test/scala/code/entitlement/MappedEntitlementTest.scala
index a2f03e35d..92f43eddc 100644
--- a/src/test/scala/code/entitlement/MappedEntitlementTest.scala
+++ b/src/test/scala/code/entitlement/MappedEntitlementTest.scala
@@ -1,9 +1,9 @@
 package code.entitlement
 
-import code.api.ServerSetup
 import code.api.util.ApiRole._
+import code.setup.ServerSetup
 import net.liftweb.mapper.By
-import net.liftweb.common.{Full}
+import net.liftweb.common.Full
 
 class MappedEntitlementTest extends ServerSetup {
 
diff --git a/src/test/scala/code/management/AccountsAPITest.scala b/src/test/scala/code/management/AccountsAPITest.scala
index e30d00dc3..9602c447a 100644
--- a/src/test/scala/code/management/AccountsAPITest.scala
+++ b/src/test/scala/code/management/AccountsAPITest.scala
@@ -5,6 +5,7 @@ import code.api.v1_2_1._
 import code.bankconnectors.Connector
 import code.model.{AccountId, BankId}
 import code.api.util.APIUtil.OAuth.{Consumer, Token, _}
+import code.setup.{APIResponse, DefaultUsers, PrivateUser2Accounts, User1AllPrivileges}
 import net.liftweb.common.Empty
 import org.scalatest.Tag
 
diff --git a/src/test/scala/code/management/ImporterTest.scala b/src/test/scala/code/management/ImporterTest.scala
index ec9d179e2..ae5e50e10 100644
--- a/src/test/scala/code/management/ImporterTest.scala
+++ b/src/test/scala/code/management/ImporterTest.scala
@@ -3,9 +3,9 @@ package code.management
 import java.text.SimpleDateFormat
 import java.util.TimeZone
 
-import code.api.{APIResponse, DefaultConnectorTestSetup, ServerSetup}
 import code.bankconnectors.Connector
 import code.model.{AccountId, Transaction}
+import code.setup.{APIResponse, DefaultConnectorTestSetup, ServerSetup}
 import code.util.Helper.MdcLoggable
 import net.liftweb.util.Props
 import net.liftweb.util.TimeHelpers._
diff --git a/src/test/scala/code/metrics/MetricsTest.scala b/src/test/scala/code/metrics/MetricsTest.scala
index 647226912..fcb1b5ebe 100644
--- a/src/test/scala/code/metrics/MetricsTest.scala
+++ b/src/test/scala/code/metrics/MetricsTest.scala
@@ -3,8 +3,8 @@ package code.metrics
 import java.text.SimpleDateFormat
 import java.util.Date
 
-import code.api.ServerSetup
 import code.bankconnectors.OBPLimit
+import code.setup.ServerSetup
 
 
 /*
diff --git a/src/test/scala/code/products/MappedProductsProviderTest.scala b/src/test/scala/code/products/MappedProductsProviderTest.scala
index 8fa38f089..d30214d07 100644
--- a/src/test/scala/code/products/MappedProductsProviderTest.scala
+++ b/src/test/scala/code/products/MappedProductsProviderTest.scala
@@ -1,8 +1,8 @@
 package code.products
 
-import code.api.ServerSetup
 import code.products.Products.Product
 import code.model.BankId
+import code.setup.ServerSetup
 import code.util.DefaultStringField
 import net.liftweb.mapper.By
 
diff --git a/src/test/scala/code/sandbox/PostCounterpartyMetadata.scala b/src/test/scala/code/sandbox/PostCounterpartyMetadata.scala
index 300f35d89..31117e5b9 100644
--- a/src/test/scala/code/sandbox/PostCounterpartyMetadata.scala
+++ b/src/test/scala/code/sandbox/PostCounterpartyMetadata.scala
@@ -41,7 +41,8 @@ TESOBE (http://www.tesobe.com/)
 * */
 
 import code.api.ObpJson.{BarebonesAccountsJson, _}
-import code.api.{SendServerRequests, _}
+import code.api._
+import code.setup.SendServerRequests
 import net.liftweb.common.Full
 import net.liftweb.json.JsonDSL._
 import net.liftweb.json._
diff --git a/src/test/scala/code/sandbox/PostCustomer.scala b/src/test/scala/code/sandbox/PostCustomer.scala
index 2612a1e03..d50d70421 100644
--- a/src/test/scala/code/sandbox/PostCustomer.scala
+++ b/src/test/scala/code/sandbox/PostCustomer.scala
@@ -43,7 +43,8 @@ TESOBE (http://www.tesobe.com/)
 import java.util.Date
 
 import code.api.ObpJson._
-import code.api.{SendServerRequests, _}
+import code.api._
+import code.setup.SendServerRequests
 import net.liftweb.common.{Box, Empty, Full}
 import net.liftweb.http.RequestVar
 import net.liftweb.json._
diff --git a/src/test/scala/code/sandbox/SandboxDataLoadingTest.scala b/src/test/scala/code/sandbox/SandboxDataLoadingTest.scala
index 64fc9c74d..89ce5b16d 100644
--- a/src/test/scala/code/sandbox/SandboxDataLoadingTest.scala
+++ b/src/test/scala/code/sandbox/SandboxDataLoadingTest.scala
@@ -37,7 +37,6 @@ import java.util.Date
 import bootstrap.liftweb.ToSchemify
 import code.TestServer
 import code.accountholder.AccountHolders
-import code.api.{APIResponse, SendServerRequests}
 import code.api.v1_2_1.APIMethods121
 import code.atms.Atms
 import code.atms.Atms.{Atm, AtmId, countOfAtms}
@@ -64,6 +63,7 @@ import net.liftweb.json.Serialization.write
 import code.bankconnectors.Connector
 import net.liftweb.common.{Empty, Full, ParamFailure}
 import code.api.util.APIUtil._
+import code.setup.{APIResponse, SendServerRequests}
 
 /*
 This tests:
diff --git a/src/test/scala/code/api/DefaultConnectorTestSetup.scala b/src/test/scala/code/setup/DefaultConnectorTestSetup.scala
similarity index 83%
rename from src/test/scala/code/api/DefaultConnectorTestSetup.scala
rename to src/test/scala/code/setup/DefaultConnectorTestSetup.scala
index 5a491d994..c55d5a03f 100644
--- a/src/test/scala/code/api/DefaultConnectorTestSetup.scala
+++ b/src/test/scala/code/setup/DefaultConnectorTestSetup.scala
@@ -1,4 +1,4 @@
-package code.api
+package code.setup
 
 //Set the default connector setup here by extending it
 trait DefaultConnectorTestSetup extends LocalMappedConnectorTestSetup
\ No newline at end of file
diff --git a/src/test/scala/code/api/DefaultUsers.scala b/src/test/scala/code/setup/DefaultUsers.scala
similarity index 90%
rename from src/test/scala/code/api/DefaultUsers.scala
rename to src/test/scala/code/setup/DefaultUsers.scala
index af09b9d87..312b18c08 100644
--- a/src/test/scala/code/api/DefaultUsers.scala
+++ b/src/test/scala/code/setup/DefaultUsers.scala
@@ -1,15 +1,19 @@
-package code.api
+package code.setup
 
-import code.token.Tokens
 import code.api.util.APIUtil.OAuth.{Consumer, Token}
 import code.consumer.Consumers
 import code.model.TokenType._
-import code.model.dataAccess.ResourceUser
 import code.model.{User, Consumer => OBPConsumer, Token => OBPToken}
+import code.token.Tokens
 import net.liftweb.util.Helpers._
 import net.liftweb.util.Props
 import net.liftweb.util.TimeHelpers.TimeSpan
 
+/**
+  * This trait prepare the login users, it simulate the Direct Login,
+  * Create the consumer -> create resource users --> create the tokens for this user --> provide the Login user 
+  * The login users are tuples (consumer, token), contains the consumer and token, used for direct login.
+  */
 trait DefaultUsers {
   
   //create the application(consumer, used it in the Login credential, mainly used the consume_key and consumer_secret)
diff --git a/src/test/scala/code/api/LocalMappedConnectorTestSetup.scala b/src/test/scala/code/setup/LocalMappedConnectorTestSetup.scala
similarity index 98%
rename from src/test/scala/code/api/LocalMappedConnectorTestSetup.scala
rename to src/test/scala/code/setup/LocalMappedConnectorTestSetup.scala
index 2353f164b..e42bee5ed 100644
--- a/src/test/scala/code/api/LocalMappedConnectorTestSetup.scala
+++ b/src/test/scala/code/setup/LocalMappedConnectorTestSetup.scala
@@ -1,10 +1,10 @@
-package code.api
+package code.setup
 
 import java.util.{Date, UUID}
 
 import bootstrap.liftweb.ToSchemify
 import code.accountholder.AccountHolders
-import code.entitlement.{Entitlement, MappedEntitlement}
+import code.entitlement.Entitlement
 import code.metadata.counterparties.{Counterparties, CounterpartyTrait}
 import code.model._
 import code.model.dataAccess._
diff --git a/src/test/scala/code/api/LocalRecordConnectorTestSetup.scala b/src/test/scala/code/setup/LocalRecordConnectorTestSetup.scala
similarity index 99%
rename from src/test/scala/code/api/LocalRecordConnectorTestSetup.scala
rename to src/test/scala/code/setup/LocalRecordConnectorTestSetup.scala
index 3769e3421..d1a1c3087 100644
--- a/src/test/scala/code/api/LocalRecordConnectorTestSetup.scala
+++ b/src/test/scala/code/setup/LocalRecordConnectorTestSetup.scala
@@ -1,4 +1,4 @@
-package code.api
+package code.setup
 
 import java.util.Date
 
diff --git a/src/test/scala/code/api/PrivateUser2Accounts.scala b/src/test/scala/code/setup/PrivateUser2Accounts.scala
similarity index 98%
rename from src/test/scala/code/api/PrivateUser2Accounts.scala
rename to src/test/scala/code/setup/PrivateUser2Accounts.scala
index 0651a6108..c7ef54b3b 100644
--- a/src/test/scala/code/api/PrivateUser2Accounts.scala
+++ b/src/test/scala/code/setup/PrivateUser2Accounts.scala
@@ -1,4 +1,4 @@
-package code.api
+package code.setup
 
 import code.bankconnectors.Connector
 import code.model.{AccountId, User}
diff --git a/src/test/scala/code/api/SendServerRequests.scala b/src/test/scala/code/setup/SendServerRequests.scala
similarity index 99%
rename from src/test/scala/code/api/SendServerRequests.scala
rename to src/test/scala/code/setup/SendServerRequests.scala
index 9f521f686..61a40f9b0 100644
--- a/src/test/scala/code/api/SendServerRequests.scala
+++ b/src/test/scala/code/setup/SendServerRequests.scala
@@ -29,12 +29,11 @@
   *Ayoub Benali: ayoub AT tesobe DOT com
   *
  */
-package code.api
+package code.setup
 
-
-import code.token.Tokens
 import code.api.util.APIUtil.OAuth
 import code.consumer.Consumers
+import code.token.Tokens
 import dispatch.Defaults._
 import dispatch._
 import net.liftweb.common.Full
diff --git a/src/test/scala/code/api/ServerSetup.scala b/src/test/scala/code/setup/ServerSetup.scala
similarity index 99%
rename from src/test/scala/code/api/ServerSetup.scala
rename to src/test/scala/code/setup/ServerSetup.scala
index 734b3517c..f896755a7 100644
--- a/src/test/scala/code/api/ServerSetup.scala
+++ b/src/test/scala/code/setup/ServerSetup.scala
@@ -30,16 +30,16 @@ Berlin 13359, Germany
 
  */
 
-package code.api
+package code.setup
 
 import java.text.SimpleDateFormat
 
 import code.TestServer
 import code.model.BankId
+import code.util.Helper.MdcLoggable
 import dispatch._
 import net.liftweb.json.{DefaultFormats, ShortTypeHints}
 import org.scalatest._
-import code.util.Helper.MdcLoggable
 
 trait ServerSetup extends FeatureSpec with SendServerRequests
   with BeforeAndAfterEach with GivenWhenThen
diff --git a/src/test/scala/code/api/TestConnectorSetup.scala b/src/test/scala/code/setup/TestConnectorSetup.scala
similarity index 98%
rename from src/test/scala/code/api/TestConnectorSetup.scala
rename to src/test/scala/code/setup/TestConnectorSetup.scala
index 1e0006458..ed73cbe96 100644
--- a/src/test/scala/code/api/TestConnectorSetup.scala
+++ b/src/test/scala/code/setup/TestConnectorSetup.scala
@@ -1,9 +1,9 @@
-package code.api
+package code.setup
 
 import java.util.{Calendar, Date}
 
 import code.bankconnectors.{Connector, OBPLimit, OBPOffset}
-import code.metadata.counterparties.{CounterpartyTrait, MappedCounterparty}
+import code.metadata.counterparties.CounterpartyTrait
 import code.model._
 import net.liftweb.util.Helpers._
 
diff --git a/src/test/scala/code/api/TestConnectorSetupWithStandardPermissions.scala b/src/test/scala/code/setup/TestConnectorSetupWithStandardPermissions.scala
similarity index 99%
rename from src/test/scala/code/api/TestConnectorSetupWithStandardPermissions.scala
rename to src/test/scala/code/setup/TestConnectorSetupWithStandardPermissions.scala
index 1a6d71621..4a8cd4e36 100644
--- a/src/test/scala/code/api/TestConnectorSetupWithStandardPermissions.scala
+++ b/src/test/scala/code/setup/TestConnectorSetupWithStandardPermissions.scala
@@ -1,9 +1,9 @@
-package code.api
+package code.setup
 
 import bootstrap.liftweb.ToSchemify
 import code.accountholder.AccountHolders
-import code.model.dataAccess._
 import code.model._
+import code.model.dataAccess._
 import code.views.Views
 import net.liftweb.mapper.MetaMapper
 import net.liftweb.mongodb._
diff --git a/src/test/scala/code/api/User1AllPrivileges.scala b/src/test/scala/code/setup/User1AllPrivileges.scala
similarity index 65%
rename from src/test/scala/code/api/User1AllPrivileges.scala
rename to src/test/scala/code/setup/User1AllPrivileges.scala
index 6b9f08f5d..0085497a9 100644
--- a/src/test/scala/code/api/User1AllPrivileges.scala
+++ b/src/test/scala/code/setup/User1AllPrivileges.scala
@@ -1,6 +1,6 @@
-package code.api
+package code.setup
 
-//a trait that grants authuser1 from DefaultUsers access to all views before each test
+//a trait that grants resourceUser1 from DefaultUsers access to all views before each test
 trait User1AllPrivileges extends ServerSetupWithTestData {
   self : DefaultUsers =>
 
diff --git a/src/test/scala/code/usercustomerlinks/MappedUserCustomerLinkProviderTest.scala b/src/test/scala/code/usercustomerlinks/MappedUserCustomerLinkProviderTest.scala
index 734fd214f..21206d2fc 100644
--- a/src/test/scala/code/usercustomerlinks/MappedUserCustomerLinkProviderTest.scala
+++ b/src/test/scala/code/usercustomerlinks/MappedUserCustomerLinkProviderTest.scala
@@ -2,8 +2,8 @@ package code.usercustomerlinks
 
 import java.util.Date
 
-import code.api.ServerSetup
-import net.liftweb.common.{Full}
+import code.setup.ServerSetup
+import net.liftweb.common.Full
 
 class MappedUserCustomerLinkProviderTest extends ServerSetup {