diff --git a/v3/pom.xml b/v3/pom.xml
index 3ffc3c09..184393a9 100644
--- a/v3/pom.xml
+++ b/v3/pom.xml
@@ -11,7 +11,7 @@
 <!--    </parent>-->
     <groupId>com.skyflow</groupId>
     <artifactId>skyflow-java</artifactId>
-    <version>2.0.0-dev.e96d8dc</version>
+    <version>2.0.0-dev.e0db412</version>
     <packaging>jar</packaging>
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Skyflow V3 SDK for the Java programming language</description>
diff --git a/v3/src/main/java/com/skyflow/utils/Constants.java b/v3/src/main/java/com/skyflow/utils/Constants.java
index 33da8b27..cfc29792 100644
--- a/v3/src/main/java/com/skyflow/utils/Constants.java
+++ b/v3/src/main/java/com/skyflow/utils/Constants.java
@@ -7,11 +7,11 @@ public final class Constants extends BaseConstants {
     public static final String SDK_PREFIX = SDK_NAME + SDK_VERSION;
     public static final Integer INSERT_BATCH_SIZE = 50;
     public static final Integer MAX_INSERT_BATCH_SIZE = 1000;
-    public static final Integer INSERT_CONCURRENCY_LIMIT = 1;
+    public static final Integer INSERT_CONCURRENCY_LIMIT = 10;
     public static final Integer MAX_INSERT_CONCURRENCY_LIMIT = 10;
 
     public static final Integer DETOKENIZE_BATCH_SIZE = 50;
-    public static final Integer DETOKENIZE_CONCURRENCY_LIMIT = 1;
+    public static final Integer DETOKENIZE_CONCURRENCY_LIMIT = 10;
     public static final Integer MAX_DETOKENIZE_BATCH_SIZE = 1000;
     public static final Integer MAX_DETOKENIZE_CONCURRENCY_LIMIT = 10;
 
diff --git a/v3/test/java/com/skyflow/SkyflowTests.java b/v3/src/test/java/com/skyflow/SkyflowTests.java
similarity index 100%
rename from v3/test/java/com/skyflow/SkyflowTests.java
rename to v3/src/test/java/com/skyflow/SkyflowTests.java
diff --git a/v3/test/java/com/skyflow/VaultClientTests.java b/v3/src/test/java/com/skyflow/VaultClientTests.java
similarity index 100%
rename from v3/test/java/com/skyflow/VaultClientTests.java
rename to v3/src/test/java/com/skyflow/VaultClientTests.java
diff --git a/v3/test/java/com/skyflow/utils/UtilsTests.java b/v3/src/test/java/com/skyflow/utils/UtilsTests.java
similarity index 100%
rename from v3/test/java/com/skyflow/utils/UtilsTests.java
rename to v3/src/test/java/com/skyflow/utils/UtilsTests.java
diff --git a/v3/test/java/com/skyflow/vault/controller/VaultControllerTests.java b/v3/src/test/java/com/skyflow/vault/controller/VaultControllerTests.java
similarity index 94%
rename from v3/test/java/com/skyflow/vault/controller/VaultControllerTests.java
rename to v3/src/test/java/com/skyflow/vault/controller/VaultControllerTests.java
index 605d29eb..938799b6 100644
--- a/v3/test/java/com/skyflow/vault/controller/VaultControllerTests.java
+++ b/v3/src/test/java/com/skyflow/vault/controller/VaultControllerTests.java
@@ -19,7 +19,6 @@
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Scanner;
 
 import static org.junit.Assert.*;
 
@@ -61,15 +60,6 @@ private void writeEnv(String content) {
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
-        // Print the contents of the .env file
-        try (Scanner scanner = new Scanner(envFile)) {
-            System.out.println("Current .env contents:");
-            while (scanner.hasNextLine()) {
-                System.out.println(scanner.nextLine());
-            }
-        } catch (IOException e) {
-            System.out.println("Could not read .env file: " + e.getMessage());
-        }
     }
 
     private VaultController createController() throws SkyflowException {
@@ -258,7 +248,7 @@ public void testBatchSizeExceedsMax() throws Exception {
             //  Ignore, Testing concurrency/batch config
         }
 
-        assertEquals(1000, getPrivateInt(controller, "insertBatchSize"));
+        assertEquals(Constants.MAX_INSERT_BATCH_SIZE.intValue(), getPrivateInt(controller, "insertBatchSize"));
     }
 
     @Test
@@ -274,7 +264,7 @@ public void testConcurrencyExceedsMax() throws Exception {
             // Ignore, Testing concurrency/batch config
         }
 
-        assertEquals(1, getPrivateInt(controller, "insertConcurrencyLimit"));
+        assertEquals(Constants.INSERT_CONCURRENCY_LIMIT.intValue(), getPrivateInt(controller, "insertConcurrencyLimit"));
     }
 
     @Test
@@ -289,7 +279,7 @@ public void testBatchSizeZeroOrNegative() throws Exception {
             // Ignore, Testing concurrency/batch config
         }
 
-        assertEquals(50, getPrivateInt(controller, "insertBatchSize"));
+        assertEquals(Constants.INSERT_BATCH_SIZE.intValue(), getPrivateInt(controller, "insertBatchSize"));
 
         writeEnv("INSERT_BATCH_SIZE=-5");
 
@@ -299,7 +289,7 @@ public void testBatchSizeZeroOrNegative() throws Exception {
             // Ignore, Testing concurrency/batch config
         }
 
-        assertEquals(50, getPrivateInt(controller, "insertBatchSize"));
+        assertEquals(Constants.INSERT_BATCH_SIZE.intValue(), getPrivateInt(controller, "insertBatchSize"));
     }
 
     @Test
@@ -378,7 +368,7 @@ public void testHighConcurrencyForLowRecords() throws Exception {
 
         // Only 10 batches needed, so concurrency should be clamped to 10
         assertEquals(1000, getPrivateInt(controller, "insertBatchSize"));
-        assertEquals(10, getPrivateInt(controller, "insertConcurrencyLimit"));
+        assertEquals(Constants.MAX_INSERT_CONCURRENCY_LIMIT.intValue(), getPrivateInt(controller, "insertConcurrencyLimit"));
     }
 
 
diff --git a/v3/src/test/java/com/skyflow/vault/data/DetokenizeRequestTests.java b/v3/src/test/java/com/skyflow/vault/data/DetokenizeRequestTests.java
new file mode 100644
index 00000000..fc729a08
--- /dev/null
+++ b/v3/src/test/java/com/skyflow/vault/data/DetokenizeRequestTests.java
@@ -0,0 +1,179 @@
+package com.skyflow.vault.data;
+
+import com.skyflow.errors.ErrorCode;
+import com.skyflow.errors.ErrorMessage;
+import com.skyflow.errors.SkyflowException;
+import com.skyflow.utils.validations.Validations;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public class DetokenizeRequestTests {
+    @Test
+    public void testDetokenizeRequestBuilderAndGetters() {
+        List<String> tokens = Arrays.asList("token1", "token2");
+        TokenGroupRedactions group = TokenGroupRedactions.builder()
+                .tokenGroupName("group1")
+                .redaction("PLAIN_TEXT")
+                .build();
+        List<TokenGroupRedactions> groupRedactions = Collections.singletonList(group);
+
+        DetokenizeRequest request = DetokenizeRequest.builder()
+                .tokens(tokens)
+                .tokenGroupRedactions(groupRedactions)
+                .build();
+
+        Assert.assertEquals(tokens, request.getTokens());
+        Assert.assertEquals(groupRedactions, request.getTokenGroupRedactions());
+    }
+
+    @Test
+    public void testTokenGroupRedactionsBuilderAndGetters() {
+        TokenGroupRedactions group = TokenGroupRedactions.builder()
+                .tokenGroupName("groupA")
+                .redaction("MASKED")
+                .build();
+        Assert.assertEquals("groupA", group.getTokenGroupName());
+        Assert.assertEquals("MASKED", group.getRedaction());
+    }
+
+    @Test
+    public void testValidateDetokenizeRequestValid() {
+        try {
+            List<String> tokens = Arrays.asList("token1", "token2");
+            TokenGroupRedactions group = TokenGroupRedactions.builder()
+                    .tokenGroupName("group1")
+                    .redaction("PLAIN_TEXT")
+                    .build();
+            List<TokenGroupRedactions> groupRedactions = Collections.singletonList(group);
+            DetokenizeRequest request = DetokenizeRequest.builder()
+                    .tokens(tokens)
+                    .tokenGroupRedactions(groupRedactions)
+                    .build();
+            Validations.validateDetokenizeRequest(request);
+        } catch (SkyflowException e) {
+            Assert.fail("Should not have thrown exception for valid request");
+        }
+    }
+
+    @Test
+    public void testValidateDetokenizeRequestNull() {
+        try {
+            Validations.validateDetokenizeRequest(null);
+            Assert.fail("Should have thrown exception for null request");
+        } catch (SkyflowException e) {
+            Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
+            Assert.assertEquals(ErrorMessage.DetokenizeRequestNull.getMessage(), e.getMessage());
+        }
+    }
+
+    @Test
+    public void testValidateDetokenizeRequestEmptyTokens() {
+        try {
+            DetokenizeRequest request = DetokenizeRequest.builder()
+                    .tokens(new ArrayList<>())
+                    .build();
+            Validations.validateDetokenizeRequest(request);
+            Assert.fail("Should have thrown exception for empty tokens");
+        } catch (SkyflowException e) {
+            Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
+            Assert.assertEquals(ErrorMessage.EmptyDetokenizeData.getMessage(), e.getMessage());
+        }
+    }
+
+    @Test
+    public void testValidateDetokenizeRequestNullOrEmptyToken() {
+        try {
+            List<String> tokens = Arrays.asList("token1", null, "");
+            DetokenizeRequest request = DetokenizeRequest.builder()
+                    .tokens(tokens)
+                    .build();
+            Validations.validateDetokenizeRequest(request);
+            Assert.fail("Should have thrown exception for null/empty token");
+        } catch (SkyflowException e) {
+            Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
+            Assert.assertEquals(ErrorMessage.EmptyTokenInDetokenizeData.getMessage(), e.getMessage());
+        }
+    }
+
+    @Test
+    public void testValidateDetokenizeRequestTokensSizeExceed() {
+        try {
+            List<String> tokens = new ArrayList<>();
+            for (int i = 0; i < 10001; i++) {
+                tokens.add("token" + i);
+            }
+            DetokenizeRequest request = DetokenizeRequest.builder()
+                    .tokens(tokens)
+                    .build();
+            Validations.validateDetokenizeRequest(request);
+            Assert.fail("Should have thrown exception for tokens size exceed");
+        } catch (SkyflowException e) {
+            Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
+            Assert.assertEquals(ErrorMessage.TokensSizeExceedError.getMessage(), e.getMessage());
+        }
+    }
+
+    @Test
+    public void testValidateDetokenizeRequestNullGroupRedaction() {
+        try {
+            List<String> tokens = Arrays.asList("token1");
+            List<TokenGroupRedactions> groupRedactions = Arrays.asList((TokenGroupRedactions) null);
+            DetokenizeRequest request = DetokenizeRequest.builder()
+                    .tokens(tokens)
+                    .tokenGroupRedactions(groupRedactions)
+                    .build();
+            Validations.validateDetokenizeRequest(request);
+            Assert.fail("Should have thrown exception for null group redaction");
+        } catch (SkyflowException e) {
+            Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
+            Assert.assertEquals(ErrorMessage.NullTokenGroupRedactions.getMessage(), e.getMessage());
+        }
+    }
+
+    @Test
+    public void testValidateDetokenizeRequestEmptyGroupName() {
+        try {
+            List<String> tokens = Arrays.asList("token1");
+            TokenGroupRedactions group = TokenGroupRedactions.builder()
+                    .tokenGroupName("")
+                    .redaction("PLAIN_TEXT")
+                    .build();
+            List<TokenGroupRedactions> groupRedactions = Collections.singletonList(group);
+            DetokenizeRequest request = DetokenizeRequest.builder()
+                    .tokens(tokens)
+                    .tokenGroupRedactions(groupRedactions)
+                    .build();
+            Validations.validateDetokenizeRequest(request);
+            Assert.fail("Should have thrown exception for empty group name");
+        } catch (SkyflowException e) {
+            Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
+            Assert.assertEquals(ErrorMessage.NullTokenGroupNameInTokenGroup.getMessage(), e.getMessage());
+        }
+    }
+
+    @Test
+    public void testValidateDetokenizeRequestEmptyRedaction() {
+        try {
+            List<String> tokens = Arrays.asList("token1");
+            TokenGroupRedactions group = TokenGroupRedactions.builder()
+                    .tokenGroupName("group1")
+                    .redaction("")
+                    .build();
+            List<TokenGroupRedactions> groupRedactions = Collections.singletonList(group);
+            DetokenizeRequest request = DetokenizeRequest.builder()
+                    .tokens(tokens)
+                    .tokenGroupRedactions(groupRedactions)
+                    .build();
+            Validations.validateDetokenizeRequest(request);
+            Assert.fail("Should have thrown exception for empty redaction");
+        } catch (SkyflowException e) {
+            Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), e.getHttpCode());
+            Assert.assertEquals(ErrorMessage.NullRedactionInTokenGroup.getMessage(), e.getMessage());
+        }
+    }
+}
diff --git a/v3/test/java/com/skyflow/vault/data/InsertTests.java b/v3/src/test/java/com/skyflow/vault/data/InsertTests.java
similarity index 100%
rename from v3/test/java/com/skyflow/vault/data/InsertTests.java
rename to v3/src/test/java/com/skyflow/vault/data/InsertTests.java