diff --git a/tests/Unit/Attributes/GeneralTraitsVO.php b/tests/Unit/Attributes/GeneralTraitsVO.php
index feae6ff..6fa863e 100644
--- a/tests/Unit/Attributes/GeneralTraitsVO.php
+++ b/tests/Unit/Attributes/GeneralTraitsVO.php
@@ -4,7 +4,6 @@
 
 namespace HraDigital\Tests\Datatypes\Unit\Attributes;
 
-use HraDigital\Datatypes\Traits\Entities\CanProcessOnUpdateEventsTrait;
 use HraDigital\Datatypes\Attributes\General\HasActiveTrait;
 use HraDigital\Datatypes\Attributes\General\HasAliasTrait;
 use HraDigital\Datatypes\Attributes\General\HasCreatedAtTrait;
@@ -18,11 +17,12 @@
 use HraDigital\Datatypes\Attributes\General\HasPositiveIntegerIDTrait;
 use HraDigital\Datatypes\Attributes\General\HasPublishedTrait;
 use HraDigital\Datatypes\Attributes\General\HasSeoFieldsTrait;
+use HraDigital\Datatypes\Attributes\General\HasSurnameTrait;
 use HraDigital\Datatypes\Attributes\General\HasTitleTrait;
 use HraDigital\Datatypes\Attributes\General\HasUpdatableUpdatedAtTrait;
 use HraDigital\Datatypes\Attributes\General\HasUuidTrait;
-use HraDigital\Datatypes\Attributes\General\HasSurnameTrait;
 use HraDigital\Datatypes\ValueObjects\AbstractValueObject;
+use HraDigital\Datatypes\ValueObjects\Traits\CanProcessOnUpdateEventsTrait;
 
 /**
  * Testing Value Object for General Entity Traits.
diff --git a/tests/Unit/Attributes/LocationTraitsVO.php b/tests/Unit/Attributes/LocationTraitsVO.php
index 2bc9ec8..1ce96eb 100644
--- a/tests/Unit/Attributes/LocationTraitsVO.php
+++ b/tests/Unit/Attributes/LocationTraitsVO.php
@@ -4,7 +4,6 @@
 
 namespace HraDigital\Tests\Datatypes\Unit\Attributes;
 
-use HraDigital\Datatypes\Traits\Entities\CanProcessOnUpdateEventsTrait;
 use HraDigital\Datatypes\Attributes\Location\HasAddressTrait;
 use HraDigital\Datatypes\Attributes\Location\HasCityTrait;
 use HraDigital\Datatypes\Attributes\Location\HasCountryCodeTrait;
@@ -18,6 +17,7 @@
 use HraDigital\Datatypes\Attributes\Location\HasStreetNumberTrait;
 use HraDigital\Datatypes\Attributes\Location\HasStreetTrait;
 use HraDigital\Datatypes\ValueObjects\AbstractValueObject;
+use HraDigital\Datatypes\ValueObjects\Traits\CanProcessOnUpdateEventsTrait;
 
 /**
  * Testing Value Object for Location Entity Traits.
diff --git a/tests/Unit/Attributes/PersonalTraitsVO.php b/tests/Unit/Attributes/PersonalTraitsVO.php
index b798c4c..e3595f3 100644
--- a/tests/Unit/Attributes/PersonalTraitsVO.php
+++ b/tests/Unit/Attributes/PersonalTraitsVO.php
@@ -4,13 +4,13 @@
 
 namespace HraDigital\Tests\Datatypes\Unit\Attributes;
 
-use HraDigital\Datatypes\Traits\Entities\CanProcessOnUpdateEventsTrait;
 use HraDigital\Datatypes\Attributes\Personal\HasCountryOfBirthTrait;
 use HraDigital\Datatypes\Attributes\Personal\HasDateOfBirthTrait;
 use HraDigital\Datatypes\Attributes\Personal\HasGenderTrait;
 use HraDigital\Datatypes\Attributes\Personal\HasNationalityTrait;
 use HraDigital\Datatypes\Attributes\Personal\HasPhotoTrait;
 use HraDigital\Datatypes\ValueObjects\AbstractValueObject;
+use HraDigital\Datatypes\ValueObjects\Traits\CanProcessOnUpdateEventsTrait;
 
 /**
  * Testing Value Object for Personal Entity Traits.
diff --git a/tests/Unit/ValueObjects/AbstractValueObjectTest.php b/tests/Unit/ValueObjects/AbstractValueObjectTest.php
index 34a1514..429fcfd 100644
--- a/tests/Unit/ValueObjects/AbstractValueObjectTest.php
+++ b/tests/Unit/ValueObjects/AbstractValueObjectTest.php
@@ -5,9 +5,7 @@
 namespace HraDigital\Tests\Datatypes\Unit\ValueObjects;
 
 use HraDigital\Datatypes\Exceptions\Entities\RequiredEntityValueMissingException;
-use HraDigital\Datatypes\Exceptions\Entities\UnexpectedEntityValueException;
 use HraDigital\Datatypes\Exceptions\Datatypes\ParameterOutOfRangeException;
-use HraDigital\Datatypes\Datetime\Datetime;
 use HraDigital\Datatypes\Scalar\Str;
 use HraDigital\Tests\Datatypes\AbstractBaseTestCase;
 
diff --git a/tests/Unit/ValueObjects/TestingAggregate.php b/tests/Unit/ValueObjects/TestingAggregate.php
index 469c2ff..d7b09cc 100644
--- a/tests/Unit/ValueObjects/TestingAggregate.php
+++ b/tests/Unit/ValueObjects/TestingAggregate.php
@@ -6,7 +6,7 @@
 
 use HraDigital\Datatypes\Datetime\Datetime;
 use HraDigital\Datatypes\Scalar\Str;
-use HraDigital\Datatypes\Traits\ValueObjects\CanSerializeAllToJsonTrait;
+use HraDigital\Datatypes\ValueObjects\Traits\CanSerializeAllToJsonTrait;
 
 /**
  * Test for JSON Serializable Object.
diff --git a/tests/Unit/ValueObjects/TestingNestedValueObject.php b/tests/Unit/ValueObjects/TestingNestedValueObject.php
index e2b4d7a..7c497a0 100644
--- a/tests/Unit/ValueObjects/TestingNestedValueObject.php
+++ b/tests/Unit/ValueObjects/TestingNestedValueObject.php
@@ -6,9 +6,9 @@
 
 use HraDigital\Datatypes\Datetime\Datetime;
 use HraDigital\Datatypes\Scalar\Str;
-use HraDigital\Datatypes\Traits\Entities\CanMassAssignStateTrait;
-use HraDigital\Datatypes\Traits\Entities\CanProcessEntityStateTrait;
-use HraDigital\Datatypes\Traits\Entities\CanProcessOnUpdateEventsTrait;
+use HraDigital\Datatypes\ValueObjects\Traits\CanMassAssignStateTrait;
+use HraDigital\Datatypes\ValueObjects\Traits\CanProcessEntityStateTrait;
+use HraDigital\Datatypes\ValueObjects\Traits\CanProcessOnUpdateEventsTrait;
 use HraDigital\Datatypes\Attributes\General\HasActiveTrait;
 use HraDigital\Datatypes\Attributes\General\HasTitleTrait;
 use HraDigital\Datatypes\Attributes\General\HasUpdatableUpdatedAtTrait;
diff --git a/tests/Unit/ValueObjects/TestingValueObject.php b/tests/Unit/ValueObjects/TestingValueObject.php
index 8b9eedb..8d62a64 100644
--- a/tests/Unit/ValueObjects/TestingValueObject.php
+++ b/tests/Unit/ValueObjects/TestingValueObject.php
@@ -6,9 +6,9 @@
 
 use HraDigital\Datatypes\Datetime\Datetime;
 use HraDigital\Datatypes\Scalar\Str;
-use HraDigital\Datatypes\Traits\Entities\CanMassAssignStateTrait;
-use HraDigital\Datatypes\Traits\Entities\CanProcessEntityStateTrait;
-use HraDigital\Datatypes\Traits\Entities\CanProcessOnUpdateEventsTrait;
+use HraDigital\Datatypes\ValueObjects\Traits\CanMassAssignStateTrait;
+use HraDigital\Datatypes\ValueObjects\Traits\CanProcessEntityStateTrait;
+use HraDigital\Datatypes\ValueObjects\Traits\CanProcessOnUpdateEventsTrait;
 use HraDigital\Datatypes\Attributes\General\HasActiveTrait;
 use HraDigital\Datatypes\Attributes\General\HasEmailTrait;
 use HraDigital\Datatypes\Attributes\General\HasPositiveIntegerIDTrait;