diff --git a/pom.xml b/pom.xml
index 60672dfe8..37ae600e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,14 +47,6 @@
         <junit.jupiter.version>5.10.0</junit.jupiter.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
-        <testcontainers.version>1.18.3</testcontainers.version>
->>>>>>> 473240e (add smoke test)
-=======
->>>>>>> cbcfba4 (remove smoketests in favor of e2e tests)
     </properties>
 
     <dependencies>
@@ -183,18 +175,6 @@
             <version>7.13.0</version>
             <scope>test</scope>
           </dependency>
-            <dependency>
-                <groupId>org.testcontainers</groupId>
-                <artifactId>testcontainers</artifactId>
-                <version>${testcontainers.version}</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.testcontainers</groupId>
-                <artifactId>junit-jupiter</artifactId>
-                <version>${testcontainers.version}</version>
-                <scope>test</scope>
-            </dependency>
         <!-- end test -->
     </dependencies>
 
diff --git a/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/grpc/Convert.java b/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/grpc/Convert.java
new file mode 100644
index 000000000..6b2865c91
--- /dev/null
+++ b/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/grpc/Convert.java
@@ -0,0 +1,9 @@
+package dev.openfeature.contrib.providers.flagd.grpc;
+
+/**
+ * A converter lambda.
+ */
+@FunctionalInterface
+public interface Convert<OutT extends Object, InT extends Object> {
+    OutT convert(InT value);
+}
\ No newline at end of file
diff --git a/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/grpc/FlagResolution.java b/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/grpc/FlagResolution.java
index 4484951f5..3809ec9c6 100644
--- a/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/grpc/FlagResolution.java
+++ b/providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/grpc/FlagResolution.java
@@ -231,12 +231,4 @@ private static <T> T getField(Message message, String name) {
     private static Descriptors.FieldDescriptor getFieldDescriptor(Message message, String name) {
         return message.getDescriptorForType().findFieldByName(name);
     }
-
-    /**
-     * A converter lambda.
-     */
-    @FunctionalInterface
-    public interface Convert<OutT extends Object, InT extends Object> {
-        OutT convert(InT value);
-    }
 }
diff --git a/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/StepDefinitions.java b/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/StepDefinitions.java
index fcc5f15cd..fee2d6bc0 100644
--- a/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/StepDefinitions.java
+++ b/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/StepDefinitions.java
@@ -1,5 +1,6 @@
 package dev.openfeature.contrib.providers.flagd.e2e;
 
+import dev.openfeature.contrib.providers.flagd.FlagdOptions;
 import dev.openfeature.contrib.providers.flagd.FlagdProvider;
 import dev.openfeature.sdk.Client;
 import dev.openfeature.sdk.EvaluationContext;
@@ -50,9 +51,10 @@ public class StepDefinitions {
     @BeforeAll()
     @Given("a provider is registered with cache disabled")
     public static void setup() {
+        // set a generous deadline, to prevent timeouts in actions
+        FlagdOptions conf = FlagdOptions.builder().deadline(3000).build();
         // TODO: when the FlagdProvider is updated to support caching, we might need to disable it here for this test to work as expected.
-        FlagdProvider provider = new FlagdProvider();
-        provider.setDeadline(3000); // set a generous deadline, to prevent timeouts in actions
+        FlagdProvider provider = new FlagdProvider(conf);
         OpenFeatureAPI.getInstance().setProvider(provider);
         client = OpenFeatureAPI.getInstance().getClient();
     }