diff --git a/extensions/database/pom.xml b/extensions/database/pom.xml
index e304c8f6d..ca36ea32b 100644
--- a/extensions/database/pom.xml
+++ b/extensions/database/pom.xml
@@ -140,7 +140,12 @@
       <artifactId>jackson-annotations</artifactId>
       <version>2.9.1</version>
     </dependency>
-   
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.6</version>
+    </dependency>
+  
 
     <dependency>
       <groupId>org.testng</groupId>
@@ -148,6 +153,13 @@
       <version>6.9.10</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>2.8.9</version>
+      <scope>test</scope>
+    </dependency>
+
 
   </dependencies>
 
diff --git a/extensions/database/test/conf/appveyor_tests.xml b/extensions/database/tests/conf/appveyor_tests.xml
similarity index 100%
rename from extensions/database/test/conf/appveyor_tests.xml
rename to extensions/database/tests/conf/appveyor_tests.xml
diff --git a/extensions/database/test/conf/tests.xml b/extensions/database/tests/conf/tests.xml
similarity index 95%
rename from extensions/database/test/conf/tests.xml
rename to extensions/database/tests/conf/tests.xml
index f14cc34ad..27a73a24a 100644
--- a/extensions/database/test/conf/tests.xml
+++ b/extensions/database/tests/conf/tests.xml
@@ -35,7 +35,7 @@
                 <exclude name="requiresPgSQL"/>
                 <exclude name="requiresMariaDB" />
             </run>
-        </groups>
+        </groups> <!--
         <classes>
             <class name="com.google.refine.extension.database.DatabaseImportControllerTest"/>
             <class name="com.google.refine.extension.database.DatabaseServiceTest"/>
@@ -51,6 +51,10 @@
             <class name="com.google.refine.extension.database.mysql.MySQLDatabaseServiceTest"/>
             <class name="com.google.refine.extension.database.pgsql.PgSQLConnectionManagerTest"/>
             <class name="com.google.refine.extension.database.pgsql.PgSQLDatabaseServiceTest" />
-        </classes>
+        </classes> -->
+        <packages>
+          <package name="org.openrefine.wikidata.*" />
+        </packages>
+
     </test>
 </suite>
diff --git a/extensions/database/test/conf/travis-mariadb.sql b/extensions/database/tests/conf/travis-mariadb.sql
similarity index 100%
rename from extensions/database/test/conf/travis-mariadb.sql
rename to extensions/database/tests/conf/travis-mariadb.sql
diff --git a/extensions/database/test/conf/travis-mysql.sql b/extensions/database/tests/conf/travis-mysql.sql
similarity index 100%
rename from extensions/database/test/conf/travis-mysql.sql
rename to extensions/database/tests/conf/travis-mysql.sql
diff --git a/extensions/database/test/conf/travis-pgsql.sql b/extensions/database/tests/conf/travis-pgsql.sql
similarity index 100%
rename from extensions/database/test/conf/travis-pgsql.sql
rename to extensions/database/tests/conf/travis-pgsql.sql
diff --git a/extensions/database/test/conf/travis_tests.xml b/extensions/database/tests/conf/travis_tests.xml
similarity index 100%
rename from extensions/database/test/conf/travis_tests.xml
rename to extensions/database/tests/conf/travis_tests.xml
diff --git a/extensions/database/test/log4j-test.properties b/extensions/database/tests/log4j-test.properties
similarity index 100%
rename from extensions/database/test/log4j-test.properties
rename to extensions/database/tests/log4j-test.properties
diff --git a/extensions/database/test/com/google/refine/extension/database/DBExtensionTestUtils.java b/extensions/database/tests/src/com/google/refine/extension/database/DBExtensionTestUtils.java
similarity index 99%
rename from extensions/database/test/com/google/refine/extension/database/DBExtensionTestUtils.java
rename to extensions/database/tests/src/com/google/refine/extension/database/DBExtensionTestUtils.java
index c8df3d8b3..a0d50fa06 100644
--- a/extensions/database/test/com/google/refine/extension/database/DBExtensionTestUtils.java
+++ b/extensions/database/tests/src/com/google/refine/extension/database/DBExtensionTestUtils.java
@@ -13,7 +13,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;
 
-import org.apache.commons.lang.text.StrSubstitutor;
+import org.apache.commons.lang3.text.StrSubstitutor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/extensions/database/test/com/google/refine/extension/database/DBExtensionTests.java b/extensions/database/tests/src/com/google/refine/extension/database/DBExtensionTests.java
similarity index 100%
rename from extensions/database/test/com/google/refine/extension/database/DBExtensionTests.java
rename to extensions/database/tests/src/com/google/refine/extension/database/DBExtensionTests.java
diff --git a/extensions/database/test/com/google/refine/extension/database/DatabaseImportControllerTest.java b/extensions/database/tests/src/com/google/refine/extension/database/DatabaseImportControllerTest.java
similarity index 100%
rename from extensions/database/test/com/google/refine/extension/database/DatabaseImportControllerTest.java
rename to extensions/database/tests/src/com/google/refine/extension/database/DatabaseImportControllerTest.java
diff --git a/extensions/database/test/com/google/refine/extension/database/DatabaseServiceTest.java b/extensions/database/tests/src/com/google/refine/extension/database/DatabaseServiceTest.java
similarity index 100%
rename from extensions/database/test/com/google/refine/extension/database/DatabaseServiceTest.java
rename to extensions/database/tests/src/com/google/refine/extension/database/DatabaseServiceTest.java
diff --git a/extensions/database/test/com/google/refine/extension/database/DatabaseTestConfig.java b/extensions/database/tests/src/com/google/refine/extension/database/DatabaseTestConfig.java
similarity index 100%
rename from extensions/database/test/com/google/refine/extension/database/DatabaseTestConfig.java
rename to extensions/database/tests/src/com/google/refine/extension/database/DatabaseTestConfig.java
diff --git a/extensions/database/test/com/google/refine/extension/database/SimpleTextEncryptorTest.java b/extensions/database/tests/src/com/google/refine/extension/database/SimpleTextEncryptorTest.java
similarity index 100%
rename from extensions/database/test/com/google/refine/extension/database/SimpleTextEncryptorTest.java
rename to extensions/database/tests/src/com/google/refine/extension/database/SimpleTextEncryptorTest.java
diff --git a/extensions/database/test/com/google/refine/extension/database/cmd/ConnectCommandTest.java b/extensions/database/tests/src/com/google/refine/extension/database/cmd/ConnectCommandTest.java
similarity index 100%
rename from extensions/database/test/com/google/refine/extension/database/cmd/ConnectCommandTest.java
rename to extensions/database/tests/src/com/google/refine/extension/database/cmd/ConnectCommandTest.java
diff --git a/extensions/database/test/com/google/refine/extension/database/cmd/ExecuteQueryCommandTest.java b/extensions/database/tests/src/com/google/refine/extension/database/cmd/ExecuteQueryCommandTest.java
similarity index 100%
rename from extensions/database/test/com/google/refine/extension/database/cmd/ExecuteQueryCommandTest.java
rename to extensions/database/tests/src/com/google/refine/extension/database/cmd/ExecuteQueryCommandTest.java
diff --git a/extensions/database/test/com/google/refine/extension/database/cmd/SavedConnectionCommandTest.java b/extensions/database/tests/src/com/google/refine/extension/database/cmd/SavedConnectionCommandTest.java
similarity index 100%
rename from extensions/database/test/com/google/refine/extension/database/cmd/SavedConnectionCommandTest.java
rename to extensions/database/tests/src/com/google/refine/extension/database/cmd/SavedConnectionCommandTest.java
diff --git a/extensions/database/test/com/google/refine/extension/database/cmd/TestConnectCommandTest.java b/extensions/database/tests/src/com/google/refine/extension/database/cmd/TestConnectCommandTest.java
similarity index 100%
rename from extensions/database/test/com/google/refine/extension/database/cmd/TestConnectCommandTest.java
rename to extensions/database/tests/src/com/google/refine/extension/database/cmd/TestConnectCommandTest.java
diff --git a/extensions/database/test/com/google/refine/extension/database/cmd/TestQueryCommandTest.java b/extensions/database/tests/src/com/google/refine/extension/database/cmd/TestQueryCommandTest.java
similarity index 100%
rename from extensions/database/test/com/google/refine/extension/database/cmd/TestQueryCommandTest.java
rename to extensions/database/tests/src/com/google/refine/extension/database/cmd/TestQueryCommandTest.java
diff --git a/extensions/database/test/com/google/refine/extension/database/mariadb/MariaDBConnectionManagerTest.java b/extensions/database/tests/src/com/google/refine/extension/database/mariadb/MariaDBConnectionManagerTest.java
similarity index 100%
rename from extensions/database/test/com/google/refine/extension/database/mariadb/MariaDBConnectionManagerTest.java
rename to extensions/database/tests/src/com/google/refine/extension/database/mariadb/MariaDBConnectionManagerTest.java
diff --git a/extensions/database/test/com/google/refine/extension/database/mariadb/MariaDBDatabaseServiceTest.java b/extensions/database/tests/src/com/google/refine/extension/database/mariadb/MariaDBDatabaseServiceTest.java
similarity index 100%
rename from extensions/database/test/com/google/refine/extension/database/mariadb/MariaDBDatabaseServiceTest.java
rename to extensions/database/tests/src/com/google/refine/extension/database/mariadb/MariaDBDatabaseServiceTest.java
diff --git a/extensions/database/test/com/google/refine/extension/database/mysql/MySQLConnectionManagerTest.java b/extensions/database/tests/src/com/google/refine/extension/database/mysql/MySQLConnectionManagerTest.java
similarity index 100%
rename from extensions/database/test/com/google/refine/extension/database/mysql/MySQLConnectionManagerTest.java
rename to extensions/database/tests/src/com/google/refine/extension/database/mysql/MySQLConnectionManagerTest.java
diff --git a/extensions/database/test/com/google/refine/extension/database/mysql/MySQLDatabaseServiceTest.java b/extensions/database/tests/src/com/google/refine/extension/database/mysql/MySQLDatabaseServiceTest.java
similarity index 100%
rename from extensions/database/test/com/google/refine/extension/database/mysql/MySQLDatabaseServiceTest.java
rename to extensions/database/tests/src/com/google/refine/extension/database/mysql/MySQLDatabaseServiceTest.java
diff --git a/extensions/database/test/com/google/refine/extension/database/pgsql/PgSQLConnectionManagerTest.java b/extensions/database/tests/src/com/google/refine/extension/database/pgsql/PgSQLConnectionManagerTest.java
similarity index 100%
rename from extensions/database/test/com/google/refine/extension/database/pgsql/PgSQLConnectionManagerTest.java
rename to extensions/database/tests/src/com/google/refine/extension/database/pgsql/PgSQLConnectionManagerTest.java
diff --git a/extensions/database/test/com/google/refine/extension/database/pgsql/PgSQLDatabaseServiceTest.java b/extensions/database/tests/src/com/google/refine/extension/database/pgsql/PgSQLDatabaseServiceTest.java
similarity index 100%
rename from extensions/database/test/com/google/refine/extension/database/pgsql/PgSQLDatabaseServiceTest.java
rename to extensions/database/tests/src/com/google/refine/extension/database/pgsql/PgSQLDatabaseServiceTest.java
diff --git a/extensions/database/test/com/google/refine/extension/database/stub/RefineDbServletStub.java b/extensions/database/tests/src/com/google/refine/extension/database/stub/RefineDbServletStub.java
similarity index 100%
rename from extensions/database/test/com/google/refine/extension/database/stub/RefineDbServletStub.java
rename to extensions/database/tests/src/com/google/refine/extension/database/stub/RefineDbServletStub.java