diff --git a/ch.eitchnet.utils b/ch.eitchnet.utils
index 3f6f9950f..07b574dba 160000
--- a/ch.eitchnet.utils
+++ b/ch.eitchnet.utils
@@ -1 +1 @@
-Subproject commit 3f6f9950f856dd995ca1d3581aabe30ba3db910e
+Subproject commit 07b574dba13ae7ca1000737dc799f6fd3885bd35
diff --git a/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedDaoTest.java b/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedDaoTest.java
index aa46c0f91..7e1057abe 100644
--- a/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedDaoTest.java
+++ b/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/CachedDaoTest.java
@@ -30,6 +30,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import ch.eitchnet.db.DbSchemaVersionCheck;
+import ch.eitchnet.utils.Version;
 import ch.eitchnet.utils.helper.StringHelper;
 
 public class CachedDaoTest extends AbstractModelTest {
@@ -65,7 +66,7 @@ public class CachedDaoTest extends AbstractModelTest {
 	}
 
 	public static void dropSchema(String dbUrl, String dbUsername, String dbPassword) throws Exception {
-		String dbVersion = DbSchemaVersionCheck.getExpectedDbVersion(PostgreSqlPersistenceHandler.SCRIPT_PREFIX,
+		Version dbVersion = DbSchemaVersionCheck.getExpectedDbVersion(PostgreSqlPersistenceHandler.SCRIPT_PREFIX,
 				PostgreSqlPersistenceHandler.class);
 		logger.info(MessageFormat.format("Dropping schema for expected version {0}", dbVersion));
 		String sql = DbSchemaVersionCheck.getSql(PostgreSqlPersistenceHandler.SCRIPT_PREFIX,
diff --git a/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/DbMigrationTest.java b/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/DbMigrationTest.java
index 4c5c8f79b..3ad34b7fa 100644
--- a/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/DbMigrationTest.java
+++ b/li.strolch.persistence.postgresql/src/test/java/li/strolch/persistence/postgresql/dao/test/DbMigrationTest.java
@@ -23,7 +23,6 @@ import static li.strolch.persistence.postgresql.dao.test.CachedDaoTest.dropSchem
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
-import java.sql.Statement;
 import java.text.MessageFormat;
 
 import li.strolch.persistence.postgresql.PostgreSqlPersistenceHandler;
@@ -34,6 +33,7 @@ import org.junit.Test;
 
 import ch.eitchnet.db.DbException;
 import ch.eitchnet.db.DbSchemaVersionCheck;
+import ch.eitchnet.utils.Version;
 
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
@@ -56,17 +56,16 @@ public class DbMigrationTest {
 		DbSchemaVersionCheck dbCheck = new DbSchemaVersionCheck(scriptPrefix, ctxClass, allowSchemaCreation,
 				allowSchemaMigration, allowSchemaDrop);
 
-		try (Connection con = DriverManager.getConnection(DB_URL, DB_USERNAME, DB_PASSWORD);
-				Statement st = con.createStatement();) {
+		try (Connection con = DriverManager.getConnection(DB_URL, DB_USERNAME, DB_PASSWORD)) {
 
 			// DROP 0.2.1
-			dbCheck.dropSchema(StrolchConstants.DEFAULT_REALM, "0.2.1", st);
+			dbCheck.dropSchema(con, StrolchConstants.DEFAULT_REALM, Version.valueOf("0.2.1"));
 
 			// CREATE 0.2.0
-			dbCheck.createSchema(StrolchConstants.DEFAULT_REALM, "0.2.0", st);
+			dbCheck.createSchema(con, StrolchConstants.DEFAULT_REALM, Version.valueOf("0.2.0"));
 
 			// MIGRATE 0.2.1
-			dbCheck.migrateSchema(StrolchConstants.DEFAULT_REALM, "0.2.1", st);
+			dbCheck.migrateSchema(con, StrolchConstants.DEFAULT_REALM, Version.valueOf("0.2.1"));
 
 		} catch (SQLException e) {
 			String msg = "Failed to open DB connection to URL {0} due to: {1}"; //$NON-NLS-1$
diff --git a/li.strolch.service/src/test/java/li/strolch/service/test/AbstractRealmServiceTest.java b/li.strolch.service/src/test/java/li/strolch/service/test/AbstractRealmServiceTest.java
index 5fb328ada..5a574206c 100644
--- a/li.strolch.service/src/test/java/li/strolch/service/test/AbstractRealmServiceTest.java
+++ b/li.strolch.service/src/test/java/li/strolch/service/test/AbstractRealmServiceTest.java
@@ -38,6 +38,7 @@ import org.junit.Before;
 
 import ch.eitchnet.db.DbSchemaVersionCheck;
 import ch.eitchnet.privilege.model.Certificate;
+import ch.eitchnet.utils.Version;
 
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
@@ -77,7 +78,7 @@ public abstract class AbstractRealmServiceTest {
 	}
 
 	public static void dropSchema(String dbUrl, String dbUsername, String dbPassword) throws Exception {
-		String dbVersion = DbSchemaVersionCheck.getExpectedDbVersion(PostgreSqlPersistenceHandler.SCRIPT_PREFIX,
+		Version dbVersion = DbSchemaVersionCheck.getExpectedDbVersion(PostgreSqlPersistenceHandler.SCRIPT_PREFIX,
 				PostgreSqlPersistenceHandler.class);
 		String sql = DbSchemaVersionCheck.getSql(PostgreSqlPersistenceHandler.SCRIPT_PREFIX,
 				PostgreSqlPersistenceHandler.class, dbVersion, "drop"); //$NON-NLS-1$