diff --git a/pom.xml b/pom.xml
index 11b47dea..b59ca4a4 100755
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
 	<groupId>com.esri.geometry</groupId>
 	<artifactId>esri-geometry-api</artifactId>
-	<version>2.2.4</version>
+	<version>2.2.5-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>Esri Geometry API for Java</name>
@@ -132,6 +132,12 @@
 			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>3.12.4</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.openjdk.jol</groupId>
 			<artifactId>jol-core</artifactId>
@@ -179,6 +185,7 @@
 						<configuration>
 							<bnd>
 						<![CDATA[
+					  Automatic-Module-Name: com.esri.geometry.api
 					  Bundle-Copyright: Copyright (c) (${now;YYYY}) Esri
 					  Bundle-Description: ${project.description}
 					  Bundle-SymbolicName: ${project.groupId}.${project.artifactId}
diff --git a/src/main/java/com/esri/core/geometry/OperatorBuffer.java b/src/main/java/com/esri/core/geometry/OperatorBuffer.java
index 93c71b02..4150a9f9 100644
--- a/src/main/java/com/esri/core/geometry/OperatorBuffer.java
+++ b/src/main/java/com/esri/core/geometry/OperatorBuffer.java
@@ -81,7 +81,7 @@ public abstract Geometry execute(Geometry inputGeometry,
     *Note that max_deviation can be exceeded because geometry is generalized with 0.25 * real_deviation, also input segments closer than 0.25 * real_deviation are 
     *snapped to a point.
     */
-    abstract GeometryCursor execute(GeometryCursor input_geometries, SpatialReference sr, double[] distances, double max_deviation, int max_vertices_in_full_circle, boolean b_union, ProgressTracker progress_tracker);
+    public abstract GeometryCursor execute(GeometryCursor input_geometries, SpatialReference sr, double[] distances, double max_deviation, int max_vertices_in_full_circle, boolean b_union, ProgressTracker progress_tracker);
 	
 	public static OperatorBuffer local() {
 		return (OperatorBuffer) OperatorFactoryLocal.getInstance().getOperator(
diff --git a/src/main/java/com/esri/core/geometry/ogc/OGCGeometry.java b/src/main/java/com/esri/core/geometry/ogc/OGCGeometry.java
index 17ef2f8f..a6fdeaa9 100644
--- a/src/main/java/com/esri/core/geometry/ogc/OGCGeometry.java
+++ b/src/main/java/com/esri/core/geometry/ogc/OGCGeometry.java
@@ -466,6 +466,21 @@ public OGCGeometry buffer(double distance) {
 		return OGCGeometry.createFromEsriGeometry(cursor.next(), esriSR);
 	}
 
+	public OGCGeometry buffer(double distance, int max_vertices_in_full_circle, double max_deviation) {
+		OperatorBuffer op = (OperatorBuffer) OperatorFactoryLocal.getInstance()
+				.getOperator(Operator.Type.Buffer);
+		if (distance == 0) {// when distance is 0, return self (maybe we should
+			// create a copy instead).
+			return this;
+		}
+
+		double d[] = { distance };
+		com.esri.core.geometry.GeometryCursor cursor = op.execute(
+				getEsriGeometryCursor(), getEsriSpatialReference(), d, max_deviation, max_vertices_in_full_circle, true,
+				null);
+		return OGCGeometry.createFromEsriGeometry(cursor.next(), esriSR);
+	}
+
 	public OGCGeometry centroid() {
 		OperatorCentroid2D op = (OperatorCentroid2D) OperatorFactoryLocal.getInstance()
 				.getOperator(Operator.Type.Centroid2D);
diff --git a/src/test/java/com/esri/core/geometry/TestEnvelope1D.java b/src/test/java/com/esri/core/geometry/TestEnvelope1D.java
new file mode 100644
index 00000000..4ecd8cbc
--- /dev/null
+++ b/src/test/java/com/esri/core/geometry/TestEnvelope1D.java
@@ -0,0 +1,22 @@
+package com.esri.core.geometry;
+
+import junit.framework.TestCase;
+import org.junit.Test;
+public class TestEnvelope1D extends TestCase{
+    @Test
+    public void testCalculateToleranceFromEnvelopeEmpty() {
+        Envelope1D envelope = new Envelope1D();
+        envelope.setEmpty();
+        double tolerance = envelope._calculateToleranceFromEnvelope();
+        assertEquals(100.0 * NumberUtils.doubleEps(), tolerance, 0.0001);
+    }
+
+    @Test
+    public void testCalculateToleranceFromEnvelopeNonEmpty() {
+        Envelope1D envelope = new Envelope1D(2.0, 4.0);
+        double tolerance = envelope._calculateToleranceFromEnvelope();
+        assertEquals(2.220446049250313e-14, tolerance, 1e-10);
+    }
+
+
+}
diff --git a/src/test/java/com/esri/core/geometry/TestIndexHashTable.java b/src/test/java/com/esri/core/geometry/TestIndexHashTable.java
new file mode 100644
index 00000000..36ec75ac
--- /dev/null
+++ b/src/test/java/com/esri/core/geometry/TestIndexHashTable.java
@@ -0,0 +1,72 @@
+package com.esri.core.geometry;
+import org.junit.Test;
+import junit.framework.TestCase;
+public class TestIndexHashTable extends TestCase{
+    @Test
+    public void testAddElement() {
+        IndexHashTable.HashFunction hashFunction = new IndexHashTable.HashFunction() {
+            @Override
+            public int getHash(int element) {
+                return element % 10; // A simple hash function for testing
+            }
+
+            @Override
+            public boolean equal(int element1, int element2) {
+                return element1 == element2;
+            }
+
+            @Override
+            public int getHash(Object elementDescriptor) {
+                return ((Integer) elementDescriptor) % 10;
+            }
+
+            @Override
+            public boolean equal(Object elementDescriptor, int element) {
+                return ((Integer) elementDescriptor) == element;
+            }
+        };
+
+        IndexHashTable hashTable = new IndexHashTable(10, hashFunction);
+
+        int element1 = 5;
+
+        int node1 = hashTable.addElement(element1);
+
+        assertEquals(node1, hashTable.findNode(element1));
+    }
+
+    @Test
+    public void testDeleteElement() {
+        IndexHashTable.HashFunction hashFunction = new IndexHashTable.HashFunction() {
+            @Override
+            public int getHash(int element) {
+                return element % 10; // A simple hash function for testing
+            }
+
+            @Override
+            public boolean equal(int element1, int element2) {
+                return element1 == element2;
+            }
+
+            @Override
+            public int getHash(Object elementDescriptor) {
+                return ((Integer) elementDescriptor) % 10;
+            }
+
+            @Override
+            public boolean equal(Object elementDescriptor, int element) {
+                return ((Integer) elementDescriptor) == element;
+            }
+        };
+
+        IndexHashTable hashTable = new IndexHashTable(10, hashFunction);
+
+        int element1 = 5;
+
+        int node1 = hashTable.addElement(element1);
+
+        hashTable.deleteElement(element1);
+        assertEquals(IndexHashTable.nullNode(), hashTable.findNode(element1));
+    }
+
+}
diff --git a/src/test/java/com/esri/core/geometry/TestJSONUtils.java b/src/test/java/com/esri/core/geometry/TestJSONUtils.java
new file mode 100644
index 00000000..86a29aff
--- /dev/null
+++ b/src/test/java/com/esri/core/geometry/TestJSONUtils.java
@@ -0,0 +1,47 @@
+package com.esri.core.geometry;
+
+import org.junit.Test;
+import junit.framework.TestCase;
+import org.mockito.Mockito;
+public class TestJSONUtils extends TestCase{
+
+    @Test
+    public void testReadDoubleWithFloatValue() {
+        JsonReader parser = Mockito.mock(JsonReader.class);
+        Mockito.when(parser.currentToken()).thenReturn(JsonReader.Token.VALUE_NUMBER_FLOAT);
+        Mockito.when(parser.currentDoubleValue()).thenReturn(3.14);
+
+        double result = JSONUtils.readDouble(parser);
+        assertEquals(3.14, result, 0.0001);
+    }
+
+    @Test
+    public void testReadDoubleWithIntValue() {
+        JsonReader parser = Mockito.mock(JsonReader.class);
+        Mockito.when(parser.currentToken()).thenReturn(JsonReader.Token.VALUE_NUMBER_INT);
+        Mockito.when(parser.currentIntValue()).thenReturn(42);
+
+        double result = JSONUtils.readDouble(parser);
+        assertEquals(42.0, result, 0.0001);
+    }
+
+    @Test
+    public void testReadDoubleWithNullValue() {
+        JsonReader parser = Mockito.mock(JsonReader.class);
+        Mockito.when(parser.currentToken()).thenReturn(JsonReader.Token.VALUE_NULL);
+
+        double result = JSONUtils.readDouble(parser);
+        assertTrue(Double.isNaN(result));
+    }
+
+    @Test
+    public void testReadDoubleWithNaNString() {
+        JsonReader parser = Mockito.mock(JsonReader.class);
+        Mockito.when(parser.currentToken()).thenReturn(JsonReader.Token.VALUE_STRING);
+        Mockito.when(parser.currentString()).thenReturn("NaN");
+
+        double result = JSONUtils.readDouble(parser);
+        assertTrue(Double.isNaN(result));
+    }
+
+}