diff --git a/src/test/java/com/teragrep/pth_06/planner/bloomfilter/CategoryTableImplTest.java b/src/test/java/com/teragrep/pth_06/planner/bloomfilter/CategoryTableImplTest.java
index 79eea2ee..03cd7add 100644
--- a/src/test/java/com/teragrep/pth_06/planner/bloomfilter/CategoryTableImplTest.java
+++ b/src/test/java/com/teragrep/pth_06/planner/bloomfilter/CategoryTableImplTest.java
@@ -125,10 +125,7 @@ public void createTargetTable() {
 
     @AfterAll
     public void tearDown() {
-        Assertions.assertDoesNotThrow(() -> {
-            conn.prepareStatement("DROP ALL OBJECTS").execute(); //h2 clear database
-            conn.close();
-        });
+        Assertions.assertDoesNotThrow(conn::close);
     }
 
     @Test
diff --git a/src/test/java/com/teragrep/pth_06/planner/bloomfilter/ConditionMatchBloomDBTablesTest.java b/src/test/java/com/teragrep/pth_06/planner/bloomfilter/ConditionMatchBloomDBTablesTest.java
index c1c34d0b..37dd0b69 100644
--- a/src/test/java/com/teragrep/pth_06/planner/bloomfilter/ConditionMatchBloomDBTablesTest.java
+++ b/src/test/java/com/teragrep/pth_06/planner/bloomfilter/ConditionMatchBloomDBTablesTest.java
@@ -129,10 +129,7 @@ public void setup() {
 
     @AfterAll
     public void tearDown() {
-        Assertions.assertDoesNotThrow(() -> {
-            conn.prepareStatement("DROP ALL OBJECTS").execute(); //h2 clear database
-            conn.close();
-        });
+        Assertions.assertDoesNotThrow(conn::close);
     }
 
     @Test
diff --git a/src/test/java/com/teragrep/pth_06/planner/bloomfilter/TableFilterTypesFromMetadataResultTest.java b/src/test/java/com/teragrep/pth_06/planner/bloomfilter/TableFilterTypesFromMetadataResultTest.java
index 576f300d..37e27841 100644
--- a/src/test/java/com/teragrep/pth_06/planner/bloomfilter/TableFilterTypesFromMetadataResultTest.java
+++ b/src/test/java/com/teragrep/pth_06/planner/bloomfilter/TableFilterTypesFromMetadataResultTest.java
@@ -120,10 +120,7 @@ public void createTargetTable() {
 
     @AfterAll
     public void tearDown() {
-        Assertions.assertDoesNotThrow(() -> {
-            conn.prepareStatement("DROP ALL OBJECTS").execute(); //h2 clear database
-            conn.close();
-        });
+        Assertions.assertDoesNotThrow(conn::close);
     }
 
     @Test
diff --git a/src/test/java/com/teragrep/pth_06/planner/bloomfilter/TableFiltersTest.java b/src/test/java/com/teragrep/pth_06/planner/bloomfilter/TableFiltersTest.java
index af34107b..f4d1729b 100644
--- a/src/test/java/com/teragrep/pth_06/planner/bloomfilter/TableFiltersTest.java
+++ b/src/test/java/com/teragrep/pth_06/planner/bloomfilter/TableFiltersTest.java
@@ -123,10 +123,7 @@ public void createTargetTable() {
 
     @AfterAll
     public void tearDown() {
-        Assertions.assertDoesNotThrow(() -> {
-            conn.prepareStatement("DROP ALL OBJECTS").execute(); //h2 clear database
-            conn.close();
-        });
+        Assertions.assertDoesNotThrow(conn::close);
     }
 
     @Test
diff --git a/src/test/java/com/teragrep/pth_06/walker/ConditionWalkerTest.java b/src/test/java/com/teragrep/pth_06/walker/ConditionWalkerTest.java
index 24e756fc..a4b84dcb 100644
--- a/src/test/java/com/teragrep/pth_06/walker/ConditionWalkerTest.java
+++ b/src/test/java/com/teragrep/pth_06/walker/ConditionWalkerTest.java
@@ -124,10 +124,7 @@ void setup() {
 
     @AfterAll
     void tearDown() {
-        Assertions.assertDoesNotThrow(() -> {
-            conn.prepareStatement("DROP ALL OBJECTS").execute(); //h2 clear database
-            conn.close();
-        });
+        Assertions.assertDoesNotThrow(conn::close);
     }
 
     @Test