diff --git a/obp-api/src/test/scala/RunMTLSWebApp.scala b/obp-api/src/test/scala/RunMTLSWebApp.scala
index 06381729b..6169fd19b 100644
--- a/obp-api/src/test/scala/RunMTLSWebApp.scala
+++ b/obp-api/src/test/scala/RunMTLSWebApp.scala
@@ -89,7 +89,7 @@ object RunMTLSWebApp extends App with PropsProgrammatically {
     // RESET HEADER
     https.addCustomizer(customizer)
 
-    val sslContextFactory = new SslContextFactory()
+    val sslContextFactory = new SslContextFactory.Server()
     sslContextFactory.setKeyStorePath(this.getClass.getResource("/cert/server.jks").toExternalForm)
     sslContextFactory.setKeyStorePassword("123456")
 
diff --git a/obp-api/src/test/scala/RunTLSWebApp.scala b/obp-api/src/test/scala/RunTLSWebApp.scala
index dc4f7afff..718734b5a 100644
--- a/obp-api/src/test/scala/RunTLSWebApp.scala
+++ b/obp-api/src/test/scala/RunTLSWebApp.scala
@@ -89,7 +89,7 @@ object RunTLSWebApp extends App with PropsProgrammatically {
     // RESET HEADER
     https.addCustomizer(customizer)
 
-    val sslContextFactory = new SslContextFactory()
+    val sslContextFactory = new SslContextFactory.Server()
     sslContextFactory.setKeyStorePath(this.getClass.getResource("/cert/server.jks").toExternalForm)
     sslContextFactory.setKeyStorePassword("123456")
 
diff --git a/obp-api/src/test/scala/code/AppTest.scala b/obp-api/src/test/scala/code/AppTest.scala
index 2e8dedba9..20c50420c 100644
--- a/obp-api/src/test/scala/code/AppTest.scala
+++ b/obp-api/src/test/scala/code/AppTest.scala
@@ -27,33 +27,29 @@ TESOBE (http://www.tesobe.com/)
 package code
 
 import java.io.File
-import junit.framework._
-import Assert._
 import scala.xml.XML
 import net.liftweb.util._
 import net.liftweb.common._
+import org.scalatest.{FlatSpec, Matchers}
 
 object AppTest {
-  def suite: Test = {
-    val suite = new TestSuite(classOf[AppTest])
-    suite
-  }
-
   def main(args : Array[String]) {
-    junit.textui.TestRunner.run(suite)
+    // Use ScalaTest runner instead
+    println("Use 'sbt test' or 'mvn test' to run tests")
   }
 }
 
 /**
  * Unit test for simple App.
  */
-class AppTest extends TestCase("app") {
+class AppTest extends FlatSpec with Matchers {
 
   /**
-   * Rigourous Tests :-)
+   * Basic functionality test
    */
-  def testOK() = assertTrue(true)
-  // def testKO() = assertTrue(false);
+  "App" should "pass basic test" in {
+    true should be(true)
+  }
 
   /**
    * Tests to make sure the project's XML files are well-formed.
@@ -61,7 +57,7 @@ class AppTest extends TestCase("app") {
    * Finds every *.html and *.xml file in src/main/webapp (and its
    * subdirectories) and tests to make sure they are well-formed.
    */
-  def testXml() = {
+  it should "have well-formed XML files" in {
     var failed: List[File] = Nil
 
     def handledXml(file: String) =
diff --git a/obp-api/src/test/scala/code/api/DirectLoginTest.scala b/obp-api/src/test/scala/code/api/DirectLoginTest.scala
index 2cb1c92c3..9cca2d5e4 100644
--- a/obp-api/src/test/scala/code/api/DirectLoginTest.scala
+++ b/obp-api/src/test/scala/code/api/DirectLoginTest.scala
@@ -13,6 +13,7 @@ import code.setup.{APIResponse, ServerSetup, TestPasswordConfig}
 import code.userlocks.UserLocksProvider
 import com.github.dwickern.macros.NameOf.nameOf
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
 import net.liftweb.json.JsonAST.{JArray, JField, JObject, JString}
 import net.liftweb.mapper.By
diff --git a/obp-api/src/test/scala/code/api/OBPRestHelperTest.scala b/obp-api/src/test/scala/code/api/OBPRestHelperTest.scala
index a8bfc06c1..ddc90c77b 100644
--- a/obp-api/src/test/scala/code/api/OBPRestHelperTest.scala
+++ b/obp-api/src/test/scala/code/api/OBPRestHelperTest.scala
@@ -1,7 +1,6 @@
 package code.api
 
 import code.api.util.APIUtil.{ResourceDoc, EmptyBody}
-import code.api.OBPRestHelper
 import com.openbankproject.commons.util.{ApiVersion, ScannedApiVersion}
 import org.scalatest.{FlatSpec, Matchers, Tag}
 
diff --git a/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/ResourceDocsTest.scala b/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/ResourceDocsTest.scala
index a83097685..e758d413e 100644
--- a/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/ResourceDocsTest.scala
+++ b/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/ResourceDocsTest.scala
@@ -9,6 +9,7 @@ import code.api.v1_4_0.JSONFactory1_4_0.ResourceDocsJson
 import code.setup.{DefaultUsers, PropsReset}
 import com.github.dwickern.macros.NameOf.nameOf
 import com.openbankproject.commons.util.{ApiVersion, Functions}
+import scala.language.reflectiveCalls
 import net.liftweb.json
 import net.liftweb.json.JsonAST._
 import net.liftweb.json.{Formats, JString, Serializer, TypeInfo}
diff --git a/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/SwaggerDocsTest.scala b/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/SwaggerDocsTest.scala
index b96a1acf3..2fe764ed5 100644
--- a/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/SwaggerDocsTest.scala
+++ b/obp-api/src/test/scala/code/api/ResourceDocs1_4_0/SwaggerDocsTest.scala
@@ -5,6 +5,7 @@ import code.api.util.{ApiRole, CustomJsonFormats}
 import code.setup.{DefaultUsers, PropsReset}
 import com.github.dwickern.macros.NameOf.nameOf
 import com.openbankproject.commons.util.{ApiVersion, Functions}
+import scala.language.reflectiveCalls
 import io.swagger.parser.OpenAPIParser
 import net.liftweb.json
 import net.liftweb.json.JsonAST._
diff --git a/obp-api/src/test/scala/code/api/util/JavaWebSignatureTest.scala b/obp-api/src/test/scala/code/api/util/JavaWebSignatureTest.scala
index f62967346..837542615 100644
--- a/obp-api/src/test/scala/code/api/util/JavaWebSignatureTest.scala
+++ b/obp-api/src/test/scala/code/api/util/JavaWebSignatureTest.scala
@@ -11,6 +11,7 @@ import com.github.dwickern.macros.NameOf.nameOf
 import net.liftweb.common.Full
 import net.liftweb.util.Helpers._
 import org.scalatest.Tag
+import scala.language.postfixOps
 
 class JavaWebSignatureTest extends V400ServerSetup {
   /**
diff --git a/obp-api/src/test/scala/code/api/v1_4_0/BranchesTest.scala b/obp-api/src/test/scala/code/api/v1_4_0/BranchesTest.scala
index e9d6239ca..5eefca75e 100644
--- a/obp-api/src/test/scala/code/api/v1_4_0/BranchesTest.scala
+++ b/obp-api/src/test/scala/code/api/v1_4_0/BranchesTest.scala
@@ -1,4 +1,6 @@
 package code.api.v1_4_0
+// Note: This test intentionally uses deprecated model classes (LobbyStringT, DriveUpStringT)
+// to maintain backwards compatibility testing. These warnings are expected.
 
 import code.api.util.APIUtil.OAuth._
 import code.api.util.OBPQueryParam
diff --git a/obp-api/src/test/scala/code/api/v2_1_0/CreateTransactionTypeTest.scala b/obp-api/src/test/scala/code/api/v2_1_0/CreateTransactionTypeTest.scala
index 8a0bedf9b..f2d1c0d06 100644
--- a/obp-api/src/test/scala/code/api/v2_1_0/CreateTransactionTypeTest.scala
+++ b/obp-api/src/test/scala/code/api/v2_1_0/CreateTransactionTypeTest.scala
@@ -10,6 +10,7 @@ import code.setup.DefaultUsers
 import code.transaction_types.MappedTransactionType
 import com.github.dwickern.macros.NameOf.nameOf
 import com.openbankproject.commons.model.{AmountOfMoneyJsonV121, ErrorMessage, TransactionTypeId}
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
 import net.liftweb.json.Serialization._
 import org.scalatest.Tag
diff --git a/obp-api/src/test/scala/code/api/v2_1_0/EntitlementTests.scala b/obp-api/src/test/scala/code/api/v2_1_0/EntitlementTests.scala
index 0267f559e..ecec7ea29 100644
--- a/obp-api/src/test/scala/code/api/v2_1_0/EntitlementTests.scala
+++ b/obp-api/src/test/scala/code/api/v2_1_0/EntitlementTests.scala
@@ -10,6 +10,7 @@ import code.entitlement.Entitlement
 import code.setup.DefaultUsers
 import com.github.dwickern.macros.NameOf.nameOf
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
 
 
diff --git a/obp-api/src/test/scala/code/api/v2_2_0/API2_2_0Test.scala b/obp-api/src/test/scala/code/api/v2_2_0/API2_2_0Test.scala
index 34e50d2b3..c7b1deebc 100644
--- a/obp-api/src/test/scala/code/api/v2_2_0/API2_2_0Test.scala
+++ b/obp-api/src/test/scala/code/api/v2_2_0/API2_2_0Test.scala
@@ -27,20 +27,34 @@ TESOBE (http://www.tesobe.com/)
 package code.api.v2_2_0
 
 import code.api.Constant._
+import scala.language.reflectiveCalls
 import _root_.net.liftweb.json.Serialization.write
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON.createViewJsonV300
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.v1_2._
+import scala.language.reflectiveCalls
 import code.api.v1_2_1.UpdateViewJsonV121
+import scala.language.reflectiveCalls
 import code.setup.{APIResponse, DefaultUsers}
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.CreateViewJson
+import scala.language.reflectiveCalls
 import net.liftweb.util.Helpers._
+import scala.language.reflectiveCalls
 import org.scalatest._
+import scala.language.reflectiveCalls
 import code.api.v2_2_0.OBPAPI2_2_0.Implementations2_2_0
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 
 import scala.util.Random._
+import scala.language.reflectiveCalls
 
 
 class API2_2_0Test extends V220ServerSetup with DefaultUsers {
diff --git a/obp-api/src/test/scala/code/api/v2_2_0/ExchangeRateTest.scala b/obp-api/src/test/scala/code/api/v2_2_0/ExchangeRateTest.scala
index 2b9896867..aaf37c2a1 100644
--- a/obp-api/src/test/scala/code/api/v2_2_0/ExchangeRateTest.scala
+++ b/obp-api/src/test/scala/code/api/v2_2_0/ExchangeRateTest.scala
@@ -1,15 +1,25 @@
 package code.api.v2_2_0
 
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.InvalidISOCurrencyCode
+import scala.language.reflectiveCalls
 import code.consumer.Consumers
+import scala.language.reflectiveCalls
 import code.scope.Scope
+import scala.language.reflectiveCalls
 import code.setup.DefaultUsers
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 class ExchangeRateTest extends V220ServerSetup with DefaultUsers {
 
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/AccountTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/AccountTest.scala
index d7d759406..849bdd74a 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/AccountTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/AccountTest.scala
@@ -1,14 +1,23 @@
 package code.api.v3_0_0
 
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole.CanUseAccountFirehoseAtAnyBank
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.{AccountFirehoseNotAllowedOnThisInstance, UserHasMissingRoles}
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import code.setup.APIResponse
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 class AccountTest extends V300ServerSetup {
   /**
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/BranchesTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/BranchesTest.scala
index 579b8e4d8..ce4253ca3 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/BranchesTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/BranchesTest.scala
@@ -1,4 +1,6 @@
 package code.api.v3_0_0
+// Note: This test intentionally uses deprecated model classes (LobbyStringT, DriveUpStringT)
+// to maintain backwards compatibility testing. These warnings are expected.
 
 import code.api.util.APIUtil.OAuth._
 import code.api.util.ApiRole.CanDeleteBranchAtAnyBank
@@ -13,6 +15,8 @@ import code.setup.DefaultUsers
 import com.github.dwickern.macros.NameOf.nameOf
 import com.openbankproject.commons.model._
 import org.scalatest.Tag
+import scala.language.postfixOps
+import scala.language.reflectiveCalls
 
 import scala.concurrent.duration._
 import scala.concurrent.Await
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/CounterpartyTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/CounterpartyTest.scala
index 1dc35fe80..ece6cb43a 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/CounterpartyTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/CounterpartyTest.scala
@@ -1,10 +1,15 @@
 package code.api.v3_0_0
 
 import code.api.Constant._
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 class CounterpartyTest extends V300ServerSetup {
   /**
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/EntitlementRequestsTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/EntitlementRequestsTest.scala
index 47417995d..f763fcf75 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/EntitlementRequestsTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/EntitlementRequestsTest.scala
@@ -1,15 +1,25 @@
 package code.api.v3_0_0
 
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole.{CanGetEntitlementRequestsAtAnyBank}
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages._
+import scala.language.reflectiveCalls
 import code.api.util.{ApiRole}
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
+import scala.language.reflectiveCalls
 import code.setup.DefaultUsers
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 /*
 Note This does not test retrieval from a backend.
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/FirehoseTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/FirehoseTest.scala
index 45e6b1b36..1d50e0bbe 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/FirehoseTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/FirehoseTest.scala
@@ -1,16 +1,27 @@
 package code.api.v3_0_0
 
 import code.api.Constant
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole.{CanUseAccountFirehose, CanUseAccountFirehoseAtAnyBank}
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.AccountFirehoseNotAllowedOnThisInstance
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
+import scala.language.reflectiveCalls
 import code.setup.PropsReset
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 class FirehoseTest extends V300ServerSetup with PropsReset{
   /**
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/GetAdapterInfoTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/GetAdapterInfoTest.scala
index c3c7a1e0f..a363ee261 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/GetAdapterInfoTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/GetAdapterInfoTest.scala
@@ -26,15 +26,25 @@ TESOBE (http://www.tesobe.com/)
 package code.api.v3_0_0
 
 import code.api.util.ApiRole.canGetAdapterInfoAtOneBank
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.{UserHasMissingRoles, UserNotLoggedIn}
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
+import scala.language.reflectiveCalls
 import code.setup.DefaultUsers
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 class GetAdapterInfoTest extends V300ServerSetup with DefaultUsers {
 
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/TransactionsTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/TransactionsTest.scala
index 487c22e05..66e250d6b 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/TransactionsTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/TransactionsTest.scala
@@ -1,13 +1,21 @@
 package code.api.v3_0_0
 
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole.CanUseAccountFirehoseAtAnyBank
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.{AccountFirehoseNotAllowedOnThisInstance, UserHasMissingRoles}
+import scala.language.reflectiveCalls
 import code.api.util.{APIUtil, ErrorMessages}
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 class TransactionsTest extends V300ServerSetup {
 
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/UserTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/UserTest.scala
index bc0ade496..4eccea066 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/UserTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/UserTest.scala
@@ -1,20 +1,35 @@
 package code.api.v3_0_0
 
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.{ApiRole, ErrorMessages}
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole.CanGetAnyUser
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.UserHasMissingRoles
+import scala.language.reflectiveCalls
 import code.api.v2_0_0.JSONFactory200.UsersJsonV200
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
+import scala.language.reflectiveCalls
 import code.setup.DefaultUsers
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import net.liftweb.json.JsonAST._
+import scala.language.reflectiveCalls
 import net.liftweb.json.Serialization.write
+import scala.language.reflectiveCalls
 import net.liftweb.util.Helpers.randomString
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 
 class UserTest extends V300ServerSetup with DefaultUsers {
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/ViewsTests.scala b/obp-api/src/test/scala/code/api/v3_0_0/ViewsTests.scala
index 1d6df40d9..b567b3aa6 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/ViewsTests.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/ViewsTests.scala
@@ -27,21 +27,36 @@ TESOBE (http://www.tesobe.com/)
 package code.api.v3_0_0
 
 import code.api.Constant._
+import scala.language.reflectiveCalls
 import _root_.net.liftweb.json.Serialization.write
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON._
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import code.api.v1_2_1.{APIInfoJSON, PermissionJSON, PermissionsJSON}
+import scala.language.reflectiveCalls
 import code.api.v2_2_0.{ViewJSONV220, ViewsJSONV220}
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import code.setup.APIResponse
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.{CreateViewJson, UpdateViewJSON}
+import scala.language.reflectiveCalls
 import net.liftweb.util.Helpers._
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 import scala.util.Random.nextInt
+import scala.language.reflectiveCalls
 
 class ViewsTests extends V300ServerSetup {
 
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/WarehouseTest.scala b/obp-api/src/test/scala/code/api/v3_0_0/WarehouseTest.scala
index 3a88f90f2..00a364994 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/WarehouseTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/WarehouseTest.scala
@@ -3,15 +3,25 @@
 package code.api.v3_0_0
 
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole.CanSearchWarehouse
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.UserHasMissingRoles
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import code.setup.{APIResponse, DefaultUsers}
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import net.liftweb.json.Serialization.write
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 
 class WarehouseTest extends V300ServerSetup with DefaultUsers {
diff --git a/obp-api/src/test/scala/code/api/v3_0_0/WarehouseTestAsync.scala b/obp-api/src/test/scala/code/api/v3_0_0/WarehouseTestAsync.scala
index 6d0ee3188..9dfa99f9b 100644
--- a/obp-api/src/test/scala/code/api/v3_0_0/WarehouseTestAsync.scala
+++ b/obp-api/src/test/scala/code/api/v3_0_0/WarehouseTestAsync.scala
@@ -3,17 +3,28 @@
 package code.api.v3_0_0
 
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole.CanSearchWarehouse
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.UserHasMissingRoles
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import code.setup.{APIResponse, DefaultUsers}
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import net.liftweb.json.Serialization.write
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 import scala.concurrent.Future
+import scala.language.reflectiveCalls
 
 class WarehouseTestAsync extends V300ServerSetupAsync with DefaultUsers {
   /**
diff --git a/obp-api/src/test/scala/code/api/v3_1_0/AccountTest.scala b/obp-api/src/test/scala/code/api/v3_1_0/AccountTest.scala
index 68c6e0046..94db2bbb5 100644
--- a/obp-api/src/test/scala/code/api/v3_1_0/AccountTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_1_0/AccountTest.scala
@@ -1,31 +1,56 @@
 package code.api.v3_1_0
 
 import code.api.Constant
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.{AccountRouting, AccountRoutingJsonV121, AmountOfMoneyJsonV121, ErrorMessage, enums}
+import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON
+import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON.updateAccountRequestJsonV310
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.extractErrorMessageCode
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.{UserHasMissingRoles, UserNotLoggedIn}
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole
+import scala.language.reflectiveCalls
 import code.api.v2_0_0.BasicAccountJSON
+import scala.language.reflectiveCalls
 import code.api.v2_2_0.CreateAccountJSONV220
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.{CoreAccountsJsonV300, ModeratedCoreAccountJsonV300}
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import code.api.v3_1_0.OBPAPI3_1_0.Implementations3_1_0
+import scala.language.reflectiveCalls
 import code.api.v2_0_0.OBPAPI2_0_0.Implementations2_0_0
+import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
+import scala.language.reflectiveCalls
 import code.model.dataAccess.BankAccountRouting
+import scala.language.reflectiveCalls
 import code.setup.DefaultUsers
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.enums.AccountRoutingScheme
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import net.liftweb.json.Serialization.write
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 import java.util.UUID
+import scala.language.reflectiveCalls
 import java.util.concurrent.TimeUnit
+import scala.language.reflectiveCalls
 import scala.util.Random
+import scala.language.reflectiveCalls
 
 class AccountTest extends V310ServerSetup with DefaultUsers {
 
diff --git a/obp-api/src/test/scala/code/api/v3_1_0/ConsentTest.scala b/obp-api/src/test/scala/code/api/v3_1_0/ConsentTest.scala
index 894c29dbb..1b9db56e1 100644
--- a/obp-api/src/test/scala/code/api/v3_1_0/ConsentTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_1_0/ConsentTest.scala
@@ -26,22 +26,38 @@ TESOBE (http://www.tesobe.com/)
 package code.api.v3_1_0
 
 import code.api.Constant
+import scala.language.reflectiveCalls
 import code.api.RequestHeader
+import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON
+import scala.language.reflectiveCalls
 import code.api.util.{APIUtil, Consent}
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole._
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages._
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.{APIMethods300, UserJsonV300}
+import scala.language.reflectiveCalls
 import code.api.v3_1_0.OBPAPI3_1_0.Implementations3_1_0
+import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import net.liftweb.json.Serialization.write
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 import java.util.Date
+import scala.language.reflectiveCalls
 
 class ConsentTest extends V310ServerSetup {
 
diff --git a/obp-api/src/test/scala/code/api/v3_1_0/TransactionTest.scala b/obp-api/src/test/scala/code/api/v3_1_0/TransactionTest.scala
index f67ddc624..8a5b254a4 100644
--- a/obp-api/src/test/scala/code/api/v3_1_0/TransactionTest.scala
+++ b/obp-api/src/test/scala/code/api/v3_1_0/TransactionTest.scala
@@ -26,7 +26,6 @@ TESOBE (http://www.tesobe.com/)
 package code.api.v3_1_0
 
 import code.api.Constant._
-import com.openbankproject.commons.model.ErrorMessage
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON
 import code.api.util.APIUtil.OAuth._
 import code.api.util.ApiRole.CanCreateHistoricalTransaction
@@ -42,10 +41,11 @@ import code.api.v3_1_0.OBPAPI3_1_0.Implementations3_1_0
 import code.api.v3_1_0.OBPAPI3_1_0.Implementations2_2_0
 import code.entitlement.Entitlement
 import com.github.dwickern.macros.NameOf.nameOf
-import com.openbankproject.commons.model.AmountOfMoneyJsonV121
+import com.openbankproject.commons.model.{AmountOfMoneyJsonV121, ErrorMessage}
 import com.openbankproject.commons.util.ApiVersion
-import org.scalatest.Tag
 import net.liftweb.json.Serialization.write
+import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 class TransactionTest extends V310ServerSetup {
 
@@ -448,7 +448,7 @@ class TransactionTest extends V310ServerSetup {
 
       val responseError1 = makePostRequest(request310, write(postJsonCounterparty1))
       Then("We should get a 400")
-      
+
       responseError1.code should equal(400)
       responseError1.body.toString contains("from object should only contain bank_id and account_id or counterparty_id in the post json body.") should be (true)
 
diff --git a/obp-api/src/test/scala/code/api/v4_0_0/AccountTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/AccountTest.scala
index 3158ed64f..9fa32b652 100644
--- a/obp-api/src/test/scala/code/api/v4_0_0/AccountTest.scala
+++ b/obp-api/src/test/scala/code/api/v4_0_0/AccountTest.scala
@@ -329,7 +329,7 @@ class AccountTest extends V400ServerSetup {
       When("We make a request v4.0.0")
       val request400 = (v4_0_0_Request / "management" / "accounts" / "account-routing-regex-query").POST
       val postBody = getAccountByRoutingJson.copy(account_routing = AccountRoutingJsonV121("AccountNumber", "123456789-[A-Z]{3}"))
-      val response400 = makePostRequest(request400, write())
+      val response400 = makePostRequest(request400, write(postBody))
       Then("We should get a 401")
       response400.code should equal(401)
       And("error should be " + UserNotLoggedIn)
diff --git a/obp-api/src/test/scala/code/api/v4_0_0/AuthenticationTypeValidationTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/AuthenticationTypeValidationTest.scala
index 8852f2f6b..2088c9d49 100644
--- a/obp-api/src/test/scala/code/api/v4_0_0/AuthenticationTypeValidationTest.scala
+++ b/obp-api/src/test/scala/code/api/v4_0_0/AuthenticationTypeValidationTest.scala
@@ -1,20 +1,35 @@
 package code.api.v4_0_0
 
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole._
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages._
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations2_2_0
+import scala.language.reflectiveCalls
 import code.api.v4_0_0.OBPAPI4_0_0.Implementations4_0_0
+import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
+import scala.language.reflectiveCalls
 import code.setup.APIResponse
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import net.liftweb.json
+import scala.language.reflectiveCalls
 import net.liftweb.json.JsonAST.JBool
+import scala.language.reflectiveCalls
 import net.liftweb.json.{JArray, JString}
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 class AuthenticationTypeValidationTest extends V400ServerSetup {
   /**
diff --git a/obp-api/src/test/scala/code/api/v4_0_0/ConnectorMethodTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/ConnectorMethodTest.scala
index 488b11fb3..e2120abcf 100644
--- a/obp-api/src/test/scala/code/api/v4_0_0/ConnectorMethodTest.scala
+++ b/obp-api/src/test/scala/code/api/v4_0_0/ConnectorMethodTest.scala
@@ -281,7 +281,7 @@ class ConnectorMethodTest extends V400ServerSetup {
       val future = connectorMethod.getBank(BankId("Hello_bank_id"), None)
       val result = Await.result(future, Duration.apply(10, TimeUnit.SECONDS))
 
-      result shouldBe a[Full[(Bank, Option[CallContext])]]
+      result shouldBe a[net.liftweb.common.Box[_]]
       val Full((bank, _)) = result
 
       bank.bankId.value shouldBe "Hello_bank_id"
diff --git a/obp-api/src/test/scala/code/api/v4_0_0/ForceErrorValidationTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/ForceErrorValidationTest.scala
index b524417ee..6dae1a3f3 100644
--- a/obp-api/src/test/scala/code/api/v4_0_0/ForceErrorValidationTest.scala
+++ b/obp-api/src/test/scala/code/api/v4_0_0/ForceErrorValidationTest.scala
@@ -1,21 +1,37 @@
 package code.api.v4_0_0
 
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole._
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages._
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations2_2_0
+import scala.language.reflectiveCalls
 import code.api.v3_1_0.OBPAPI3_1_0.Implementations3_1_0
+import scala.language.reflectiveCalls
 import code.api.v4_0_0.OBPAPI4_0_0.Implementations4_0_0
+import scala.language.reflectiveCalls
 import code.api.dynamic.endpoint.APIMethodsDynamicEndpoint.ImplementationsDynamicEndpoint
+import scala.language.reflectiveCalls
 import code.api.dynamic.entity.APIMethodsDynamicEntity.ImplementationsDynamicEntity
+import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
+import scala.language.reflectiveCalls
 import code.setup.{APIResponse, PropsReset}
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import net.liftweb.json.{JInt, JString, prettyRender}
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 class ForceErrorValidationTest extends V400ServerSetup with PropsReset {
 
diff --git a/obp-api/src/test/scala/code/api/v4_0_0/JsonSchemaValidationTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/JsonSchemaValidationTest.scala
index 8ae253ae4..cde7f4bc6 100644
--- a/obp-api/src/test/scala/code/api/v4_0_0/JsonSchemaValidationTest.scala
+++ b/obp-api/src/test/scala/code/api/v4_0_0/JsonSchemaValidationTest.scala
@@ -1,20 +1,35 @@
 package code.api.v4_0_0
 
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole._
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages._
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations2_2_0
+import scala.language.reflectiveCalls
 import code.api.v4_0_0.OBPAPI4_0_0.Implementations4_0_0
+import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
+import scala.language.reflectiveCalls
 import code.setup.APIResponse
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import net.liftweb.json
+import scala.language.reflectiveCalls
 import net.liftweb.json.JsonAST.JBool
+import scala.language.reflectiveCalls
 import net.liftweb.json.{JArray, JString}
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 class JsonSchemaValidationTest extends V400ServerSetup {
   /**
diff --git a/obp-api/src/test/scala/code/api/v4_0_0/TransactionRequestsTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/TransactionRequestsTest.scala
index 2988f76c8..645b0ee95 100644
--- a/obp-api/src/test/scala/code/api/v4_0_0/TransactionRequestsTest.scala
+++ b/obp-api/src/test/scala/code/api/v4_0_0/TransactionRequestsTest.scala
@@ -179,8 +179,8 @@ class TransactionRequestsTest extends V400ServerSetup with DefaultUsers {
           cvv = cardJsonV500.cvv,
           card_number = cardJsonV500.card_number,
           name_on_card = cardJsonV500.name_on_card,
-          expiry_year = (cardJsonV500.expires_date.getYear+1900).toString,
-          expiry_month = (cardJsonV500.expires_date.getMonth+1).toString
+          expiry_year = (cardJsonV500.expires_date.toInstant.atZone(java.time.ZoneId.systemDefault()).getYear + 1900).toString,
+          expiry_month = (cardJsonV500.expires_date.toInstant.atZone(java.time.ZoneId.systemDefault()).getMonthValue).toString
         ),
         CounterpartyIdJson(counterpartyCounterparty.counterpartyId), 
         bodyValue, 
diff --git a/obp-api/src/test/scala/code/api/v5_0_0/AccountTest.scala b/obp-api/src/test/scala/code/api/v5_0_0/AccountTest.scala
index c6aae646c..0bb35ed9f 100644
--- a/obp-api/src/test/scala/code/api/v5_0_0/AccountTest.scala
+++ b/obp-api/src/test/scala/code/api/v5_0_0/AccountTest.scala
@@ -1,30 +1,54 @@
 package code.api.v5_0_0
 
 import code.api.Constant
+import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.extractErrorMessageCode
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages.{UserHasMissingRoles, UserNotLoggedIn}
+import scala.language.reflectiveCalls
 import code.api.v2_0_0.BasicAccountJSON
+import scala.language.reflectiveCalls
 import code.api.v2_0_0.OBPAPI2_0_0.Implementations2_0_0
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.CoreAccountsJsonV300
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import code.api.v3_1_0.CreateAccountResponseJsonV310
+import scala.language.reflectiveCalls
 import code.api.v4_0_0.{AccountsBalancesJsonV400, ModeratedCoreAccountJsonV400}
+import scala.language.reflectiveCalls
 import code.api.v5_0_0.OBPAPI5_0_0.Implementations5_0_0
+import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
+import scala.language.reflectiveCalls
 import code.setup.DefaultUsers
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.enums.AccountRoutingScheme
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.{AccountRoutingJsonV121, AmountOfMoneyJsonV121, ErrorMessage}
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import net.liftweb.json.Serialization.write
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 import java.util.UUID
+import scala.language.reflectiveCalls
 import java.util.concurrent.TimeUnit
+import scala.language.reflectiveCalls
 import scala.util.Random
+import scala.language.reflectiveCalls
 
 class AccountTest extends V500ServerSetup with DefaultUsers {
 
diff --git a/obp-api/src/test/scala/code/api/v5_0_0/ViewsTests.scala b/obp-api/src/test/scala/code/api/v5_0_0/ViewsTests.scala
index c2adc72c6..c99176de7 100644
--- a/obp-api/src/test/scala/code/api/v5_0_0/ViewsTests.scala
+++ b/obp-api/src/test/scala/code/api/v5_0_0/ViewsTests.scala
@@ -27,16 +27,26 @@ TESOBE (http://www.tesobe.com/)
 package code.api.v5_0_0
 
 import code.api.Constant._
+import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON._
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.v1_2_1.{PermissionJSON, PermissionsJSON}
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import code.setup.APIResponse
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 import scala.util.Random.nextInt
+import scala.language.reflectiveCalls
 
 class ViewsTests extends V500ServerSetup {
 
diff --git a/obp-api/src/test/scala/code/api/v5_1_0/ConsentObpTest.scala b/obp-api/src/test/scala/code/api/v5_1_0/ConsentObpTest.scala
index 6ce76e53b..dd934c797 100644
--- a/obp-api/src/test/scala/code/api/v5_1_0/ConsentObpTest.scala
+++ b/obp-api/src/test/scala/code/api/v5_1_0/ConsentObpTest.scala
@@ -26,21 +26,37 @@ TESOBE (http://www.tesobe.com/)
 package code.api.v5_1_0
 
 import code.api.{Constant, RequestHeader}
+import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole._
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages._
+import scala.language.reflectiveCalls
 import code.api.util.{APIUtil, Consent}
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.{APIMethods300, UserJsonV300}
+import scala.language.reflectiveCalls
 import code.api.v3_1_0.{ConsentJsonV310, PostConsentChallengeJsonV310, PostConsentEntitlementJsonV310, PostConsentViewJsonV310}
+import scala.language.reflectiveCalls
 import code.api.v3_1_0.OBPAPI3_1_0.Implementations3_1_0
+import scala.language.reflectiveCalls
 import code.api.v5_1_0.OBPAPI5_1_0.Implementations5_1_0
+import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.ErrorMessage
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import net.liftweb.json.Serialization.write
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 class ConsentObpTest extends V510ServerSetup {
 
diff --git a/obp-api/src/test/scala/code/api/v5_1_0/VRPConsentRequestTest.scala b/obp-api/src/test/scala/code/api/v5_1_0/VRPConsentRequestTest.scala
index 68789e3d5..3441b5a1e 100644
--- a/obp-api/src/test/scala/code/api/v5_1_0/VRPConsentRequestTest.scala
+++ b/obp-api/src/test/scala/code/api/v5_1_0/VRPConsentRequestTest.scala
@@ -26,33 +26,60 @@ TESOBE (http://www.tesobe.com/)
 package code.api.v5_1_0
 
 import code.api.RequestHeader
+import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON
+import scala.language.reflectiveCalls
 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON.{accountRoutingJsonV121, bankRoutingJsonV121, branchRoutingJsonV141, postCounterpartyLimitV510}
+import scala.language.reflectiveCalls
 import code.api.v5_0_0.ConsentJsonV500
+import scala.language.reflectiveCalls
 import code.api.util.APIUtil.OAuth._
+import scala.language.reflectiveCalls
 import code.api.util.ApiRole._
+import scala.language.reflectiveCalls
 import code.api.util.Consent
+import scala.language.reflectiveCalls
 import code.api.util.ErrorMessages._
+import scala.language.reflectiveCalls
 import code.api.util.ExampleValue.counterpartyNameExample
+import scala.language.reflectiveCalls
 import code.api.v2_1_0.{CounterpartyIdJson, TransactionRequestBodyCounterpartyJSON}
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.CoreAccountsJsonV300
+import scala.language.reflectiveCalls
 import code.api.v3_0_0.OBPAPI3_0_0.Implementations3_0_0
+import scala.language.reflectiveCalls
 import code.api.v3_1_0.PostConsentChallengeJsonV310
+import scala.language.reflectiveCalls
 import code.api.v4_0_0.OBPAPI4_0_0.Implementations4_0_0
+import scala.language.reflectiveCalls
 import code.api.v4_0_0.{TransactionRequestWithChargeJSON400, UsersJsonV400}
+import scala.language.reflectiveCalls
 import code.api.v5_0_0.ConsentRequestResponseJson
+import scala.language.reflectiveCalls
 import code.api.v5_0_0.OBPAPI5_0_0.Implementations5_0_0
+import scala.language.reflectiveCalls
 import code.api.v5_1_0.OBPAPI5_1_0.Implementations5_1_0
+import scala.language.reflectiveCalls
 import code.consent.ConsentStatus
+import scala.language.reflectiveCalls
 import code.entitlement.Entitlement
+import scala.language.reflectiveCalls
 import code.setup.PropsReset
+import scala.language.reflectiveCalls
 import com.github.dwickern.macros.NameOf.nameOf
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.model.{AmountOfMoneyJsonV121, ErrorMessage}
+import scala.language.reflectiveCalls
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import net.liftweb.json.Serialization.write
+import scala.language.reflectiveCalls
 import org.scalatest.Tag
+import scala.language.reflectiveCalls
 
 import scala.language.postfixOps
+import scala.language.reflectiveCalls
 
 class VRPConsentRequestTest extends V510ServerSetup with PropsReset{
 
diff --git a/obp-api/src/test/scala/code/api/v6_0_0/CustomerTest.scala b/obp-api/src/test/scala/code/api/v6_0_0/CustomerTest.scala
index 7c24dc652..9b14b44c7 100644
--- a/obp-api/src/test/scala/code/api/v6_0_0/CustomerTest.scala
+++ b/obp-api/src/test/scala/code/api/v6_0_0/CustomerTest.scala
@@ -31,7 +31,7 @@ import code.api.util.ApiRole.{CanCreateCustomer, CanGetCustomersAtOneBank}
 import code.api.util.ErrorMessages._
 import code.api.v3_1_0.PostCustomerNumberJsonV310
 import code.api.v6_0_0.OBPAPI6_0_0.Implementations6_0_0
-import code.api.v6_0_0.{CustomerJsonV600, CustomerJSONsV600, CustomerWithAttributesJsonV600, PostCustomerJsonV600}
+// Removed imports that shadow local object definitions: CustomerJsonV600, CustomerJSONsV600, CustomerWithAttributesJsonV600, PostCustomerJsonV600
 import code.customer.CustomerX
 import code.entitlement.Entitlement
 import code.usercustomerlinks.UserCustomerLink
diff --git a/obp-api/src/test/scala/code/api/v6_0_0/PasswordResetTest.scala b/obp-api/src/test/scala/code/api/v6_0_0/PasswordResetTest.scala
index 90aaeca7e..7fb54f504 100644
--- a/obp-api/src/test/scala/code/api/v6_0_0/PasswordResetTest.scala
+++ b/obp-api/src/test/scala/code/api/v6_0_0/PasswordResetTest.scala
@@ -31,7 +31,7 @@ import code.api.util.APIUtil.OAuth._
 import code.api.util.ApiRole._
 import com.openbankproject.commons.util.ApiVersion
 import code.api.util.ErrorMessages._
-import code.api.v6_0_0.APIMethods600
+// Removed import that shadows local object definition: APIMethods600
 
 import code.entitlement.Entitlement
 import code.model.dataAccess.{AuthUser, ResourceUser}
diff --git a/obp-api/src/test/scala/code/connector/ConnectorTest.scala b/obp-api/src/test/scala/code/connector/ConnectorTest.scala
index 8765540a7..13e12200e 100644
--- a/obp-api/src/test/scala/code/connector/ConnectorTest.scala
+++ b/obp-api/src/test/scala/code/connector/ConnectorTest.scala
@@ -1,15 +1,24 @@
 package code.connector
 
 import code.api.util.{CallContext, OBPQueryParam}
+import scala.language.postfixOps
 import code.api.v5_1_0.V510ServerSetup
+import scala.language.postfixOps
 import code.bankconnectors.Connector
+import scala.language.postfixOps
 import com.github.dwickern.macros.NameOf
+import scala.language.postfixOps
 import com.openbankproject.commons.model.OutboundAdapterCallContext
+import scala.language.postfixOps
 import com.openbankproject.commons.util.ReflectUtils
+import scala.language.postfixOps
 import org.scalatest.{FlatSpec, Matchers, Tag}
+import scala.language.postfixOps
 
 import scala.collection.immutable.List
+import scala.language.postfixOps
 import scala.reflect.runtime.universe
+import scala.language.postfixOps
 
 class ConnectorTest extends V510ServerSetup {
   object ConnectorTestTag extends Tag(NameOf.nameOfType[ConnectorTest])
diff --git a/obp-api/src/test/scala/code/connector/InternalConnectorTest.scala b/obp-api/src/test/scala/code/connector/InternalConnectorTest.scala
index a663cf707..792aea78e 100644
--- a/obp-api/src/test/scala/code/connector/InternalConnectorTest.scala
+++ b/obp-api/src/test/scala/code/connector/InternalConnectorTest.scala
@@ -8,6 +8,7 @@ import org.scalatest.{FlatSpec, Matchers}
 
 import scala.concurrent.duration._
 import scala.concurrent.Future
+import scala.language.postfixOps
 
 class InternalConnectorTest extends FlatSpec with Matchers {
 
diff --git a/obp-api/src/test/scala/code/connector/MessageDocTest.scala b/obp-api/src/test/scala/code/connector/MessageDocTest.scala
index ab322bd4b..260bf2990 100644
--- a/obp-api/src/test/scala/code/connector/MessageDocTest.scala
+++ b/obp-api/src/test/scala/code/connector/MessageDocTest.scala
@@ -7,6 +7,7 @@ import code.bankconnectors.LocalMappedConnector
 import code.setup.DefaultUsers
 import com.github.dwickern.macros.NameOf.nameOf
 import com.openbankproject.commons.util.ApiVersion
+import scala.language.reflectiveCalls
 import net.liftweb.json
 import net.liftweb.json.JValue
 import org.scalatest.Tag
diff --git a/obp-api/src/test/scala/code/connector/RestConnector_vMar2019_FrozenTest.scala b/obp-api/src/test/scala/code/connector/RestConnector_vMar2019_FrozenTest.scala
index e52490a45..352ac126c 100644
--- a/obp-api/src/test/scala/code/connector/RestConnector_vMar2019_FrozenTest.scala
+++ b/obp-api/src/test/scala/code/connector/RestConnector_vMar2019_FrozenTest.scala
@@ -12,6 +12,7 @@ import org.scalatest.matchers.{MatchResult, Matcher}
 import org.scalatest.{BeforeAndAfter, FlatSpec, Matchers, Tag}
 
 import scala.reflect.runtime.universe._
+import scala.language.postfixOps
 
 
 /**
diff --git a/obp-api/src/test/scala/code/util/FrozenClassUtil.scala b/obp-api/src/test/scala/code/util/FrozenClassUtil.scala
index af669f57d..b5a34c656 100644
--- a/obp-api/src/test/scala/code/util/FrozenClassUtil.scala
+++ b/obp-api/src/test/scala/code/util/FrozenClassUtil.scala
@@ -11,6 +11,7 @@ import net.liftweb.common.Loggable
 import org.apache.commons.io.IOUtils
 
 import scala.reflect.runtime.universe._
+import scala.language.postfixOps
 
 /**
   * this util is for persist metadata of frozen type, those frozen type is versionStatus = "STABLE" related example classes,