diff --git a/Models/AttributeValue.php b/Models/AttributeValue.php
index 4402119..e7311a3 100755
--- a/Models/AttributeValue.php
+++ b/Models/AttributeValue.php
@@ -167,7 +167,9 @@ class AttributeValue implements \JsonSerializable
         } elseif ($datatype === AttributeValueType::_FLOAT) {
             $this->valueDec = (float) $value;
         } elseif ($datatype === AttributeValueType::_DATETIME) {
-            $this->valueDat = new \DateTime((string) $value);
+            $this->valueDat = $value instanceof \DateTime
+                ? $value
+                : new \DateTime((string) $value);
         }
     }
 
diff --git a/tests/Models/AttributeHolderTraitTest.php b/tests/Models/AttributeHolderTraitTest.php
index 9e474e7..d1179f4 100644
--- a/tests/Models/AttributeHolderTraitTest.php
+++ b/tests/Models/AttributeHolderTraitTest.php
@@ -36,8 +36,6 @@ final class AttributeHolderTraitTestTest extends \PHPUnit\Framework\TestCase
     protected function setUp() : void
     {
         $this->holder = new class() {
-            public $attributes = [];
-
             use AttributeHolderTrait;
         };
 
diff --git a/tests/Models/AttributeTypeTest.php b/tests/Models/AttributeTypeTest.php
index 288624b..fe6d456 100644
--- a/tests/Models/AttributeTypeTest.php
+++ b/tests/Models/AttributeTypeTest.php
@@ -99,6 +99,8 @@ final class AttributeTypeTest extends \PHPUnit\Framework\TestCase
                 'validationPattern' => '',
                 'custom'            => false,
                 'isRequired'        => false,
+                'isInternal'        => false,
+                'repeatable'        => false,
             ],
             $type->toArray()
         );
@@ -115,6 +117,8 @@ final class AttributeTypeTest extends \PHPUnit\Framework\TestCase
                 'validationPattern' => '',
                 'custom'            => false,
                 'isRequired'        => false,
+                'isInternal'        => false,
+                'repeatable'        => false,
             ],
             $type->jsonSerialize()
         );
diff --git a/tests/Models/AttributeValueTest.php b/tests/Models/AttributeValueTest.php
index 02965aa..dc7fe1b 100644
--- a/tests/Models/AttributeValueTest.php
+++ b/tests/Models/AttributeValueTest.php
@@ -78,10 +78,11 @@ final class AttributeValueTest extends \PHPUnit\Framework\TestCase
         self::assertEquals(
             [
                 'id'                => 0,
-                'name'              => '',
-                'validationPattern' => '',
-                'custom'            => false,
-                'isRequired'        => false,
+                'valueInt' => null,
+                'valueStr' => null,
+                'valueDec' => null,
+                'valueDat' => null,
+                'isDefault' => false,
             ],
             $value->toArray()
         );
@@ -93,10 +94,11 @@ final class AttributeValueTest extends \PHPUnit\Framework\TestCase
         self::assertEquals(
             [
                 'id'                => 0,
-                'name'              => '',
-                'validationPattern' => '',
-                'custom'            => false,
-                'isRequired'        => false,
+                'valueInt' => null,
+                'valueStr' => null,
+                'valueDec' => null,
+                'valueDat' => null,
+                'isDefault' => false,
             ],
             $value->jsonSerialize()
         );