diff --git a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlDbConnectionBuilder.java b/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlDbConnectionBuilder.java
index 095b6ae84..9d116e05b 100644
--- a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlDbConnectionBuilder.java
+++ b/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlDbConnectionBuilder.java
@@ -53,7 +53,6 @@ public final class PostgreSqlDbConnectionBuilder extends DbConnectionBuilder {
 		ds.validate();
 	}
 
-	@SuppressWarnings("resource")
 	@Override
 	public DataSource build(String realm, String url, String username, String password, Properties props) {
 
@@ -188,7 +187,7 @@ public final class PostgreSqlDbConnectionBuilder extends DbConnectionBuilder {
 		 * @see com.zaxxer.hikari.HikariDataSource#shutdown()
 		 */
 		public void shutdown() {
-			this.ds.shutdown();
+			this.ds.close();
 		}
 
 		/**
diff --git a/li.strolch.service/src/test/java/li/strolch/execution/StartActivityExecutionServiceTest.java b/li.strolch.service/src/test/java/li/strolch/execution/StartActivityExecutionServiceTest.java
index ed24e34b0..5bbd0c492 100644
--- a/li.strolch.service/src/test/java/li/strolch/execution/StartActivityExecutionServiceTest.java
+++ b/li.strolch.service/src/test/java/li/strolch/execution/StartActivityExecutionServiceTest.java
@@ -157,7 +157,7 @@ public class StartActivityExecutionServiceTest extends RuntimeMock {
 		doServiceAssertResult(cert, svc, arg);
 
 		// allow execution handler to do work
-		Thread.sleep(10);
+		Thread.sleep(50);
 
 		try (StrolchTransaction tx = getRealm("execution").openTx(cert, StartActivityExecutionServiceTest.class)) {
 			Action action;
@@ -220,7 +220,7 @@ public class StartActivityExecutionServiceTest extends RuntimeMock {
 			assertEquals(State.EXECUTION, activity.getState());
 		}
 
-		Thread.sleep(150L);
+		Thread.sleep(100L);
 
 		try (StrolchTransaction tx = getRealm("execution").openTx(cert, StartActivityExecutionServiceTest.class)) {
 			Action action;