diff --git a/tests/Geometry/PolygonTest.php b/tests/Geometry/PolygonTest.php
index c394b44c..84bf85fb 100644
--- a/tests/Geometry/PolygonTest.php
+++ b/tests/Geometry/PolygonTest.php
@@ -3,6 +3,7 @@
 namespace Intervention\Image\Tests\Geometry;
 
 use Intervention\Image\Geometry\{Point, Polygon};
+use Intervention\Image\Interfaces\PointInterface;
 use Intervention\Image\Tests\TestCase;
 
 /**
@@ -107,6 +108,12 @@ class PolygonTest extends TestCase
         $this->assertEquals(45, $poly->first()->y());
     }
 
+    public function testFirstEmpty(): void
+    {
+        $poly = new Polygon();
+        $this->assertNull($poly->first());
+    }
+
     public function testLast(): void
     {
         $poly = new Polygon([
@@ -119,10 +126,46 @@ class PolygonTest extends TestCase
         $this->assertEquals(566, $poly->last()->y());
     }
 
-    public function testGetPivotPoint(): void
+    public function testLastEmpty(): void
+    {
+        $poly = new Polygon();
+        $this->assertNull($poly->last());
+    }
+
+    public function testOffsetExists(): void
+    {
+        $poly = new Polygon();
+        $this->assertFalse($poly->offsetExists(0));
+        $this->assertFalse($poly->offsetExists(1));
+        $poly->addPoint(new Point(0, 0));
+        $this->assertTrue($poly->offsetExists(0));
+        $this->assertFalse($poly->offsetExists(1));
+    }
+
+    public function testOffsetSetUnset(): void
+    {
+        $poly = new Polygon();
+        $poly->offsetSet(0, new Point());
+        $poly->offsetSet(2, new Point());
+        $this->assertTrue($poly->offsetExists(0));
+        $this->assertFalse($poly->offsetExists(1));
+        $this->assertTrue($poly->offsetExists(2));
+        $poly->offsetUnset(2);
+        $this->assertTrue($poly->offsetExists(0));
+        $this->assertFalse($poly->offsetExists(1));
+        $this->assertFalse($poly->offsetExists(2));
+    }
+
+    public function testGetSetPivotPoint(): void
     {
         $poly = new Polygon();
         $this->assertInstanceOf(Point::class, $poly->pivot());
+        $this->assertEquals(0, $poly->pivot()->x());
+        $this->assertEquals(0, $poly->pivot()->y());
+        $result = $poly->setPivot(new Point(12, 34));
+        $this->assertInstanceOf(Polygon::class, $result);
+        $this->assertEquals(12, $poly->pivot()->x());
+        $this->assertEquals(34, $poly->pivot()->y());
     }
 
     public function testGetMostLeftPoint(): void
@@ -326,6 +369,48 @@ class PolygonTest extends TestCase
         $this->assertEquals(318, $result[3]->y());
     }
 
+    public function testValignTop(): void
+    {
+        $poly = new Polygon([
+            new Point(-21, -22),
+            new Point(91, -135),
+            new Point(113, -113),
+            new Point(0, 0),
+        ], new Point(250, 250));
+
+        $result = $poly->valign('top');
+
+        $this->assertInstanceOf(Polygon::class, $result);
+        $this->assertEquals(-21, $result[0]->x());
+        $this->assertEquals(363, $result[0]->y());
+        $this->assertEquals(91, $result[1]->x());
+        $this->assertEquals(250, $result[1]->y());
+        $this->assertEquals(113, $result[2]->x());
+        $this->assertEquals(272, $result[2]->y());
+        $this->assertEquals(0, $result[3]->x());
+        $this->assertEquals(385, $result[3]->y());
+    }
+
+    public function testMovePoints(): void
+    {
+        $poly = new Polygon([
+            new Point(10, 20),
+            new Point(30, 40)
+        ]);
+
+        $result = $poly->movePointsX(100);
+        $this->assertEquals(110, $result[0]->x());
+        $this->assertEquals(20, $result[0]->y());
+        $this->assertEquals(130, $result[1]->x());
+        $this->assertEquals(40, $result[1]->y());
+
+        $result = $poly->movePointsY(200);
+        $this->assertEquals(110, $result[0]->x());
+        $this->assertEquals(220, $result[0]->y());
+        $this->assertEquals(130, $result[1]->x());
+        $this->assertEquals(240, $result[1]->y());
+    }
+
     public function testRotate(): void
     {
         $poly = new Polygon([
diff --git a/tests/Geometry/RectangleTest.php b/tests/Geometry/RectangleTest.php
index 3305f790..0118d617 100644
--- a/tests/Geometry/RectangleTest.php
+++ b/tests/Geometry/RectangleTest.php
@@ -4,6 +4,7 @@ namespace Intervention\Image\Tests\Geometry;
 
 use Intervention\Image\Geometry\Point;
 use Intervention\Image\Geometry\Rectangle;
+use Intervention\Image\Interfaces\PointInterface;
 use Intervention\Image\Tests\TestCase;
 
 class RectangleTest extends TestCase
@@ -245,4 +246,79 @@ class RectangleTest extends TestCase
         $this->assertEquals(0, $pos->x());
         $this->assertEquals(50, $pos->y());
     }
+
+    public function testTopLeftPoint(): void
+    {
+        $rectangle = new Rectangle(800, 600);
+        $this->assertInstanceOf(PointInterface::class, $rectangle->topLeftPoint());
+    }
+
+    public function testBottomRightPoint(): void
+    {
+        $rectangle = new Rectangle(800, 600);
+        $this->assertInstanceOf(PointInterface::class, $rectangle->bottomRightPoint());
+    }
+
+    public function testResize(): void
+    {
+        $rectangle = new Rectangle(800, 600);
+        $result = $rectangle->resize(300, 200);
+        $this->assertInstanceOf(Rectangle::class, $result);
+        $this->assertEquals(300, $result->width());
+        $this->assertEquals(200, $result->height());
+    }
+
+    public function testResizeDown(): void
+    {
+        $rectangle = new Rectangle(800, 600);
+        $result = $rectangle->resizeDown(3000, 200);
+        $this->assertInstanceOf(Rectangle::class, $result);
+        $this->assertEquals(800, $result->width());
+        $this->assertEquals(200, $result->height());
+    }
+
+    public function testScale(): void
+    {
+        $rectangle = new Rectangle(800, 600);
+        $result = $rectangle->scale(height: 1200);
+        $this->assertInstanceOf(Rectangle::class, $result);
+        $this->assertEquals(800 * 2, $result->width());
+        $this->assertEquals(600 * 2, $result->height());
+    }
+
+    public function testScaleDown(): void
+    {
+        $rectangle = new Rectangle(800, 600);
+        $result = $rectangle->scaleDown(height: 1200);
+        $this->assertInstanceOf(Rectangle::class, $result);
+        $this->assertEquals(800, $result->width());
+        $this->assertEquals(600, $result->height());
+    }
+
+    public function testCover(): void
+    {
+        $rectangle = new Rectangle(800, 600);
+        $result = $rectangle->cover(400, 100);
+        $this->assertInstanceOf(Rectangle::class, $result);
+        $this->assertEquals(400, $result->width());
+        $this->assertEquals(300, $result->height());
+    }
+
+    public function testContain(): void
+    {
+        $rectangle = new Rectangle(800, 600);
+        $result = $rectangle->contain(1600, 1200);
+        $this->assertInstanceOf(Rectangle::class, $result);
+        $this->assertEquals(1600, $result->width());
+        $this->assertEquals(1200, $result->height());
+    }
+
+    public function testContainMax(): void
+    {
+        $rectangle = new Rectangle(800, 600);
+        $result = $rectangle->containMax(1600, 1200);
+        $this->assertInstanceOf(Rectangle::class, $result);
+        $this->assertEquals(800, $result->width());
+        $this->assertEquals(600, $result->height());
+    }
 }