diff --git a/core/pom.xml b/core/pom.xml
index f1f7344..cb02064 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -17,7 +18,7 @@
         <dependency>
             <groupId>org.agrona</groupId>
             <artifactId>agrona</artifactId>
-            <version>1.12.0</version>
+            <version>1.22.0</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
@@ -34,77 +35,9 @@
         </dependency>
 
         <!-- Test dependencies -->
-        <dependency>
-            <groupId>pl.tkowalcz.tjahzi</groupId>
-            <artifactId>loki-protobuf</artifactId>
-            <version>0.9.33-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.rest-assured</groupId>
-            <artifactId>rest-assured</artifactId>
-            <version>4.3.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <version>4.0.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>3.15.0</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
-            <version>2.27.2</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.13.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.googlecode.catch-exception</groupId>
-            <artifactId>catch-exception</artifactId>
-            <version>1.2.0</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Testcontainers -->
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-params</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.xerial.snappy</groupId>
-            <artifactId>snappy-java</artifactId>
-            <version>1.1.8.4</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/core/src/test/java/pl/tkowalcz/tjahzi/LogBufferAgentTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/LogBufferAgentTest.java
index f1f9df2..004b339 100644
--- a/core/src/test/java/pl/tkowalcz/tjahzi/LogBufferAgentTest.java
+++ b/core/src/test/java/pl/tkowalcz/tjahzi/LogBufferAgentTest.java
@@ -16,7 +16,10 @@ import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 class LogBufferAgentTest {
 
@@ -28,9 +31,7 @@ class LogBufferAgentTest {
     void setUp() {
         logBuffer = new ManyToOneRingBuffer(
                 new UnsafeBuffer(
-                        ByteBuffer.wrap(
-                                new byte[1024 * 1024 + RingBufferDescriptor.TRAILER_LENGTH]
-                        )
+                        ByteBuffer.allocateDirect(1024 * 1024 + RingBufferDescriptor.TRAILER_LENGTH)
                 )
         );
 
@@ -72,14 +73,14 @@ class LogBufferAgentTest {
                     LabelSerializerCreator.from(Map.of()),
                     ByteBuffer.wrap((
                             "Cupcake ipsum dolor sit amet cake wafer. " +
-                                    "Soufflé jelly beans biscuit topping. " +
-                                    "Danish bonbon gummies powder caramels. " +
-                                    "Danish jelly beans sweet roll topping jelly beans oat cake toffee. " +
-                                    "Chocolate cake sesame snaps brownie biscuit cheesecake. " +
-                                    "Ice cream dessert sweet donut marshmallow. " +
-                                    "Muffin bear claw cookie jelly-o sugar plum jelly beans apple pie fruitcake cookie. " +
-                                    "Tootsie roll carrot cake pastry jujubes jelly beans chupa chups. " +
-                                    "Soufflé cake muffin liquorice tart soufflé pie sesame snaps."
+                            "Soufflé jelly beans biscuit topping. " +
+                            "Danish bonbon gummies powder caramels. " +
+                            "Danish jelly beans sweet roll topping jelly beans oat cake toffee. " +
+                            "Chocolate cake sesame snaps brownie biscuit cheesecake. " +
+                            "Ice cream dessert sweet donut marshmallow. " +
+                            "Muffin bear claw cookie jelly-o sugar plum jelly beans apple pie fruitcake cookie. " +
+                            "Tootsie roll carrot cake pastry jujubes jelly beans chupa chups. " +
+                            "Soufflé cake muffin liquorice tart soufflé pie sesame snaps."
                     ).getBytes())
             );
         }
@@ -176,9 +177,7 @@ class LogBufferAgentTest {
 
         ManyToOneRingBuffer logBuffer = new ManyToOneRingBuffer(
                 new UnsafeBuffer(
-                        ByteBuffer.wrap(
-                                new byte[1024 + RingBufferDescriptor.TRAILER_LENGTH]
-                        )
+                        ByteBuffer.allocateDirect(1024 + RingBufferDescriptor.TRAILER_LENGTH)
                 )
         );
 
@@ -234,9 +233,7 @@ class LogBufferAgentTest {
         // Given
         ManyToOneRingBuffer logBuffer = new ManyToOneRingBuffer(
                 new UnsafeBuffer(
-                        ByteBuffer.wrap(
-                                new byte[64 * 1024 + RingBufferDescriptor.TRAILER_LENGTH]
-                        )
+                        ByteBuffer.allocateDirect(64 * 1024 + RingBufferDescriptor.TRAILER_LENGTH)
                 )
         );
 
diff --git a/core/src/test/java/pl/tkowalcz/tjahzi/LogBufferSerializerDeserializerTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/LogBufferSerializerDeserializerTest.java
index 9c70431..b428e64 100644
--- a/core/src/test/java/pl/tkowalcz/tjahzi/LogBufferSerializerDeserializerTest.java
+++ b/core/src/test/java/pl/tkowalcz/tjahzi/LogBufferSerializerDeserializerTest.java
@@ -1,6 +1,5 @@
 package pl.tkowalcz.tjahzi;
 
-import com.google.common.collect.Streams;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.Timestamp;
 import io.netty.buffer.ByteBuf;
@@ -34,12 +33,12 @@ class LogBufferSerializerDeserializerTest {
                         "WARN",
                         "[Mando] You have something I want.",
                         38 // log line
-                                + 21 // log level
-                                + 45 // labels string sizes
-                                + 6 * 4 // labels string length indicators
-                                + 8 // timestamp millis
-                                + 8 // timestamp nanos
-                                + 4 // labels count
+                        + 21 // log level
+                        + 45 // labels string sizes
+                        + 6 * 4 // labels string length indicators
+                        + 8 // timestamp millis
+                        + 8 // timestamp nanos
+                        + 4 // labels count
                 ),
                 Arguments.of(
                         "Message with empty labels",
@@ -48,10 +47,10 @@ class LogBufferSerializerDeserializerTest {
                         "WARN",
                         "[Mando] You have something I want.",
                         38 // log line
-                                + 21 // log level
-                                + 8 // timestamp millis
-                                + 8 // timestamp nanos
-                                + 4 // labels count
+                        + 21 // log level
+                        + 8 // timestamp millis
+                        + 8 // timestamp nanos
+                        + 4 // labels count
                 ),
                 Arguments.of(
                         "Message with null log level",
@@ -63,11 +62,11 @@ class LogBufferSerializerDeserializerTest {
                         null,
                         "[Mando] You have something I want.",
                         38 // log line
-                                + 45 // labels string sizes
-                                + 6 * 4 // labels string length indicators
-                                + 8 // timestamp millis
-                                + 8 // timestamp nanos
-                                + 4 // labels count
+                        + 45 // labels string sizes
+                        + 6 * 4 // labels string length indicators
+                        + 8 // timestamp millis
+                        + 8 // timestamp nanos
+                        + 4 // labels count
                 )
         );
     }
@@ -133,10 +132,7 @@ class LogBufferSerializerDeserializerTest {
         Stream<String> incomingLabelsStream = toPropertyStream(labels);
 
         assertThat(stream.getLabels()).isEqualToIgnoringWhitespace(
-                Streams.concat(
-                                incomingLabelsStream,
-                                logLevelStream
-                        )
+                Stream.concat(incomingLabelsStream, logLevelStream)
                         .collect(joining(",", "{", "}"))
         );
     }
diff --git a/core/src/test/java/pl/tkowalcz/tjahzi/LogBufferTranscoderTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/LogBufferTranscoderTest.java
index ff19f90..1925c9c 100644
--- a/core/src/test/java/pl/tkowalcz/tjahzi/LogBufferTranscoderTest.java
+++ b/core/src/test/java/pl/tkowalcz/tjahzi/LogBufferTranscoderTest.java
@@ -1,6 +1,5 @@
 package pl.tkowalcz.tjahzi;
 
-import com.google.common.collect.Streams;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.Timestamp;
 import io.netty.buffer.ByteBuf;
@@ -16,6 +15,7 @@ import org.junit.jupiter.params.provider.MethodSource;
 import java.nio.ByteBuffer;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Stream;
 
 import static java.util.stream.Collectors.joining;
@@ -91,11 +91,12 @@ class LogBufferTranscoderTest {
         Stream<String> staticLabelsStream = toPropertyStream(staticLabels);
 
         assertThat(stream.getLabels()).isEqualToIgnoringWhitespace(
-                Streams.concat(
-                        incomingLabelsStream,
-                        logLevelStream,
-                        staticLabelsStream
-                )
+                Stream.of(
+                                incomingLabelsStream,
+                                logLevelStream,
+                                staticLabelsStream
+                        )
+                        .flatMap(Function.identity())
                         .collect(joining(",", "{", "}"))
         );
     }
diff --git a/log4j2-appender/pom.xml b/log4j2-appender/pom.xml
index 9921996..f526ed9 100644
--- a/log4j2-appender/pom.xml
+++ b/log4j2-appender/pom.xml
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>pl.tkowalcz.tjahzi</groupId>
             <artifactId>core</artifactId>
-            <version>0.9.33-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
@@ -37,70 +37,6 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.17.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>3.9.0</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.code.java-allocation-instrumenter</groupId>
-            <artifactId>java-allocation-instrumenter</artifactId>
-            <version>3.3.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.rest-assured</groupId>
-            <artifactId>rest-assured</artifactId>
-            <version>4.3.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <version>4.0.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>3.15.0</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Testcontainers -->
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-params</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>nginx</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>dns-cache-manipulator</artifactId>
-            <version>1.8.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/logback-appender-nodep/pom.xml b/logback-appender-nodep/pom.xml
index 14f87ab..24f62eb 100644
--- a/logback-appender-nodep/pom.xml
+++ b/logback-appender-nodep/pom.xml
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>pl.tkowalcz.tjahzi</groupId>
             <artifactId>logback-appender</artifactId>
-            <version>0.9.33-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/logback-appender/pom.xml b/logback-appender/pom.xml
index 37f7aaa..0cbacb1 100644
--- a/logback-appender/pom.xml
+++ b/logback-appender/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -12,13 +13,12 @@
     <name>logback-appender</name>
     <artifactId>logback-appender</artifactId>
     <packaging>jar</packaging>
-    <version>0.9.33-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
             <groupId>pl.tkowalcz.tjahzi</groupId>
             <artifactId>core</artifactId>
-            <version>0.9.33-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
@@ -41,7 +41,6 @@
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
@@ -49,62 +48,6 @@
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>com.google.code.java-allocation-instrumenter</groupId>
-            <artifactId>java-allocation-instrumenter</artifactId>
-            <version>3.3.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.rest-assured</groupId>
-            <artifactId>rest-assured</artifactId>
-            <version>4.3.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <version>4.0.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>3.15.0</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Testcontainers -->
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>nginx</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-params</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-        </dependency>
     </dependencies>
 
     <profiles>
@@ -123,8 +66,12 @@
                         </configuration>
                         <dependencies>
                             <dependency>
-                                <groupId>com.google.code.java-allocation-instrumenter</groupId>
-                                <artifactId>java-allocation-instrumenter</artifactId>
+                                <groupId>
+                                    com.google.code.java-allocation-instrumenter
+                                </groupId>
+                                <artifactId>
+                                    java-allocation-instrumenter
+                                </artifactId>
                                 <version>3.3.0</version>
                             </dependency>
                         </dependencies>
diff --git a/pom.xml b/pom.xml
index be78ee8..d88fcde 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -9,12 +10,13 @@
     <version>0.9.33-SNAPSHOT</version>
 
     <name>Tjahzi</name>
-    <description>Tjahzi is a low overhead logging client for Loki</description>
+    <description>Tjahzi is a low overhead logging client for Loki
+    </description>
     <url>https://github.com/tkowalcz/tjahzi</url>
 
     <modules>
         <module>core</module>
-        <module>loki-protobuf</module>
+        <!--        <module>loki-protobuf</module>-->
 
         <module>log4j2-appender</module>
         <module>log4j2-appender-nodep</module>
@@ -24,7 +26,9 @@
     </modules>
 
     <scm>
-        <developerConnection>scm:git:git@github.com:tkowalcz/tjahzi.git</developerConnection>
+        <developerConnection>
+            scm:git:git@github.com:tkowalcz/tjahzi.git
+        </developerConnection>
         <url>https://github.com/tkowalcz/tjahzi</url>
         <tag>tjahzi-0.7</tag>
     </scm>
@@ -32,18 +36,24 @@
     <distributionManagement>
         <snapshotRepository>
             <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <url>
+                https://oss.sonatype.org/content/repositories/snapshots
+            </url>
         </snapshotRepository>
         <repository>
             <id>ossrh</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+            <url>
+                https://oss.sonatype.org/service/local/staging/deploy/maven2/
+            </url>
         </repository>
     </distributionManagement>
 
     <licenses>
         <license>
             <name>MIT License</name>
-            <url>https://github.com/tkowalcz/tjahzi/blob/master/LICENSE</url>
+            <url>
+                https://github.com/tkowalcz/tjahzi/blob/master/LICENSE
+            </url>
             <distribution>repo</distribution>
             <comments>A short and simple permissive license</comments>
         </license>
@@ -57,7 +67,8 @@
     </developers>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.build.sourceEncoding>UTF-8
+        </project.build.sourceEncoding>
 
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
@@ -72,50 +83,141 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-api</artifactId>
-                <version>5.11.4</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-params</artifactId>
-                <version>5.11.4</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-engine</artifactId>
-                <version>5.11.4</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.junit.vintage</groupId>
-                <artifactId>junit-vintage-engine</artifactId>
-                <version>5.11.4</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.testcontainers</groupId>
-                <artifactId>testcontainers</artifactId>
-                <version>1.20.4</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.testcontainers</groupId>
-                <artifactId>nginx</artifactId>
-                <version>1.20.4</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.testcontainers</groupId>
-                <artifactId>junit-jupiter</artifactId>
-                <version>1.20.4</version>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-slf4j-impl</artifactId>
+                <version>2.13.3</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
 
+    <!-- Only tests -->
+    <dependencies>
+        <dependency>
+            <groupId>pl.tkowalcz.tjahzi</groupId>
+            <artifactId>loki-protobuf</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <version>5.5.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>4.2.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.27.3</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock</artifactId>
+            <version>3.11.0</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.googlecode.catch-exception</groupId>
+            <artifactId>catch-exception</artifactId>
+            <version>1.2.0</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.xerial.snappy</groupId>
+            <artifactId>snappy-java</artifactId>
+            <version>1.1.10.7</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.11.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>5.11.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.11.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>5.11.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <version>1.20.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>nginx</artifactId>
+            <version>1.20.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>1.20.4</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>3.9.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.java-allocation-instrumenter
+            </groupId>
+            <artifactId>java-allocation-instrumenter</artifactId>
+            <version>3.3.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>dns-cache-manipulator</artifactId>
+            <version>1.8.3</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>1.3.15</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.3.15</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
     <build>
         <pluginManagement>
             <plugins>
@@ -127,7 +229,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.2</version>
+                    <version>3.5.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -157,15 +259,12 @@
         </pluginManagement>
 
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-            </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <release>${maven.compiler.target}</release>
-                    <testRelease>${maven.compiler.testTarget}</testRelease>
+                    <testRelease>${maven.compiler.testTarget}
+                    </testRelease>
                 </configuration>
             </plugin>
             <plugin>
@@ -187,8 +286,10 @@
                 </executions>
                 <configuration>
                     <failOnError>false</failOnError>
-                    <excludePackageNames>com.google.protobuf.*</excludePackageNames>
-                    <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
+                    <excludePackageNames>com.google.protobuf.*
+                    </excludePackageNames>
+                    <javadocExecutable>${java.home}/bin/javadoc
+                    </javadocExecutable>
                 </configuration>
             </plugin>
             <plugin>
@@ -240,5 +341,30 @@
                 <gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
             </properties>
         </profile>
+
+        <profile>
+            <id>java16+</id>
+            <activation>
+                <jdk>[16,)</jdk>
+            </activation>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-surefire-plugin
+                            </artifactId>
+                            <version>3.5.2</version>
+                            <configuration>
+                                <argLine>
+                                    --add-opens java.base/java.net=ALL-UNNAMED
+                                    --add-opens java.base/sun.net=ALL-UNNAMED
+                                </argLine>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
     </profiles>
 </project>