diff --git a/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedJsonDaoTest.java b/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedJsonDaoTest.java
index 41f14dab4..1fc9409eb 100644
--- a/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedJsonDaoTest.java
+++ b/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedJsonDaoTest.java
@@ -15,24 +15,20 @@
  */
 package li.strolch.persistence.postgresql.dao.test;
 
+import static li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler.SCRIPT_PREFIX_ARCHIVE;
+import static li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler.SCRIPT_PREFIX_STROLCH;
+import static li.strolch.persistence.postgresql.dao.test.CachedDaoTest.dropSchema;
 import static org.junit.Assert.assertEquals;
 
 import java.io.File;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.text.MessageFormat;
 
-import li.strolch.db.DbSchemaVersionCheck;
 import li.strolch.persistence.api.PersistenceHandler;
 import li.strolch.persistence.postgresql.DataType;
 import li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler;
 import li.strolch.testbase.runtime.AbstractModelTest;
 import li.strolch.testbase.runtime.RuntimeMock;
-import li.strolch.utils.Version;
-import li.strolch.utils.helper.StringHelper;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.postgresql.Driver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -58,7 +54,8 @@ public class CachedJsonDaoTest extends AbstractModelTest {
 	@BeforeClass
 	public static void beforeClass() throws Exception {
 
-		dropSchema(DB_URL, DB_USERNAME, DB_PASSWORD);
+		dropSchema(SCRIPT_PREFIX_ARCHIVE, DB_URL, DB_USERNAME, DB_PASSWORD);
+		dropSchema(SCRIPT_PREFIX_STROLCH, DB_URL, DB_USERNAME, DB_PASSWORD);
 
 		File rootPath = new File(RUNTIME_PATH);
 		File configSrc = new File(CONFIG_SRC);
@@ -72,23 +69,6 @@ public class CachedJsonDaoTest extends AbstractModelTest {
 		assertEquals(DataType.json, persistenceHandler.getDataType());
 	}
 
-	public static void dropSchema(String dbUrl, String dbUsername, String dbPassword) throws Exception {
-
-		if (!Driver.isRegistered())
-			Driver.register();
-
-		Version dbVersion = DbSchemaVersionCheck
-				.getExpectedDbVersion(PostgreSqlPersistenceHandler.SCRIPT_PREFIX_STROLCH, PostgreSqlPersistenceHandler.class);
-		logger.info(MessageFormat.format("Dropping schema for expected version {0}", dbVersion));
-		String sql = DbSchemaVersionCheck
-				.getSql(PostgreSqlPersistenceHandler.SCRIPT_PREFIX_STROLCH, PostgreSqlPersistenceHandler.class, dbVersion,
-						"drop"); //$NON-NLS-1$
-		logger.info(StringHelper.NEW_LINE + sql);
-		try (Connection connection = DriverManager.getConnection(dbUrl, dbUsername, dbPassword)) {
-			connection.prepareStatement(sql).execute();
-		}
-	}
-
 	@AfterClass
 	public static void afterClass() {
 		if (runtimeMock != null)
diff --git a/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedJsonVersioningDaoTest.java b/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedJsonVersioningDaoTest.java
index 23aaeb573..0d0bf9277 100644
--- a/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedJsonVersioningDaoTest.java
+++ b/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedJsonVersioningDaoTest.java
@@ -15,24 +15,20 @@
  */
 package li.strolch.persistence.postgresql.dao.test;
 
+import static li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler.SCRIPT_PREFIX_ARCHIVE;
+import static li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler.SCRIPT_PREFIX_STROLCH;
+import static li.strolch.persistence.postgresql.dao.test.CachedDaoTest.dropSchema;
 import static org.junit.Assert.assertEquals;
 
 import java.io.File;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.text.MessageFormat;
 
-import li.strolch.db.DbSchemaVersionCheck;
 import li.strolch.persistence.api.PersistenceHandler;
 import li.strolch.persistence.postgresql.DataType;
 import li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler;
 import li.strolch.testbase.runtime.AbstractModelTest;
 import li.strolch.testbase.runtime.RuntimeMock;
-import li.strolch.utils.Version;
-import li.strolch.utils.helper.StringHelper;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.postgresql.Driver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -58,7 +54,8 @@ public class CachedJsonVersioningDaoTest extends AbstractModelTest {
 	@BeforeClass
 	public static void beforeClass() throws Exception {
 
-		dropSchema(DB_URL, DB_USERNAME, DB_PASSWORD);
+		dropSchema(SCRIPT_PREFIX_ARCHIVE, DB_URL, DB_USERNAME, DB_PASSWORD);
+		dropSchema(SCRIPT_PREFIX_STROLCH, DB_URL, DB_USERNAME, DB_PASSWORD);
 
 		File rootPath = new File(RUNTIME_PATH);
 		File configSrc = new File(CONFIG_SRC);
@@ -72,23 +69,6 @@ public class CachedJsonVersioningDaoTest extends AbstractModelTest {
 		assertEquals(DataType.json, persistenceHandler.getDataType());
 	}
 
-	public static void dropSchema(String dbUrl, String dbUsername, String dbPassword) throws Exception {
-
-		if (!Driver.isRegistered())
-			Driver.register();
-
-		Version dbVersion = DbSchemaVersionCheck
-				.getExpectedDbVersion(PostgreSqlPersistenceHandler.SCRIPT_PREFIX_STROLCH, PostgreSqlPersistenceHandler.class);
-		logger.info(MessageFormat.format("Dropping schema for expected version {0}", dbVersion));
-		String sql = DbSchemaVersionCheck
-				.getSql(PostgreSqlPersistenceHandler.SCRIPT_PREFIX_STROLCH, PostgreSqlPersistenceHandler.class, dbVersion,
-						"drop"); //$NON-NLS-1$
-		logger.info(StringHelper.NEW_LINE + sql);
-		try (Connection connection = DriverManager.getConnection(dbUrl, dbUsername, dbPassword)) {
-			connection.prepareStatement(sql).execute();
-		}
-	}
-
 	@AfterClass
 	public static void afterClass() {
 		if (runtimeMock != null)
diff --git a/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedVersioningDaoTest.java b/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedVersioningDaoTest.java
index b35e90089..156a4b3fd 100644
--- a/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedVersioningDaoTest.java
+++ b/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedVersioningDaoTest.java
@@ -15,24 +15,20 @@
  */
 package li.strolch.persistence.postgresql.dao.test;
 
+import static li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler.SCRIPT_PREFIX_ARCHIVE;
+import static li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler.SCRIPT_PREFIX_STROLCH;
+import static li.strolch.persistence.postgresql.dao.test.CachedDaoTest.dropSchema;
 import static org.junit.Assert.assertEquals;
 
 import java.io.File;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.text.MessageFormat;
 
-import li.strolch.db.DbSchemaVersionCheck;
 import li.strolch.persistence.api.PersistenceHandler;
 import li.strolch.persistence.postgresql.DataType;
 import li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler;
 import li.strolch.testbase.runtime.AbstractModelTest;
 import li.strolch.testbase.runtime.RuntimeMock;
-import li.strolch.utils.Version;
-import li.strolch.utils.helper.StringHelper;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.postgresql.Driver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -58,7 +54,8 @@ public class CachedVersioningDaoTest extends AbstractModelTest {
 	@BeforeClass
 	public static void beforeClass() throws Exception {
 
-		dropSchema(DB_URL, DB_USERNAME, DB_PASSWORD);
+		dropSchema(SCRIPT_PREFIX_ARCHIVE, DB_URL, DB_USERNAME, DB_PASSWORD);
+		dropSchema(SCRIPT_PREFIX_STROLCH, DB_URL, DB_USERNAME, DB_PASSWORD);
 
 		File rootPath = new File(RUNTIME_PATH);
 		File configSrc = new File(CONFIG_SRC);
@@ -72,23 +69,6 @@ public class CachedVersioningDaoTest extends AbstractModelTest {
 		assertEquals(DataType.xml, persistenceHandler.getDataType());
 	}
 
-	public static void dropSchema(String dbUrl, String dbUsername, String dbPassword) throws Exception {
-
-		if (!Driver.isRegistered())
-			Driver.register();
-
-		Version dbVersion = DbSchemaVersionCheck
-				.getExpectedDbVersion(PostgreSqlPersistenceHandler.SCRIPT_PREFIX_STROLCH, PostgreSqlPersistenceHandler.class);
-		logger.info(MessageFormat.format("Dropping schema for expected version {0}", dbVersion));
-		String sql = DbSchemaVersionCheck
-				.getSql(PostgreSqlPersistenceHandler.SCRIPT_PREFIX_STROLCH, PostgreSqlPersistenceHandler.class, dbVersion,
-						"drop"); //$NON-NLS-1$
-		logger.info(StringHelper.NEW_LINE + sql);
-		try (Connection connection = DriverManager.getConnection(dbUrl, dbUsername, dbPassword)) {
-			connection.prepareStatement(sql).execute();
-		}
-	}
-
 	@AfterClass
 	public static void afterClass() {
 		if (runtimeMock != null)