diff --git a/SoftwareInstallationContracts/SoftwareInstallationContracts.sln b/SoftwareInstallationContracts/SoftwareInstallationContracts.sln
index bd67e14..d62a56b 100644
--- a/SoftwareInstallationContracts/SoftwareInstallationContracts.sln
+++ b/SoftwareInstallationContracts/SoftwareInstallationContracts.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 17.12.35514.174
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SoftwareInstallationContracts", "SoftwareInstallationContracts\SoftwareInstallationContracts.csproj", "{B893E5AA-FB0B-4FFD-B918-87FB0CE540FC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SoftwareInstallationTests", "..\SoftwareInstallationTests\SoftwareInstallationTests\SoftwareInstallationTests.csproj", "{7D2F4C92-7578-46BA-96C3-3B1B7E2B5340}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SoftwareInstallationTests", "..\SoftwareInstallationTests\SoftwareInstallationTests.csproj", "{7D2F4C92-7578-46BA-96C3-3B1B7E2B5340}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/ClientDataModel.cs b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/ClientDataModel.cs
index 74960d7..676ca02 100644
--- a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/ClientDataModel.cs
+++ b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/ClientDataModel.cs
@@ -1,12 +1,7 @@
-using SoftwareInstallationContracts.Exceptions;
+using System.Text.RegularExpressions;
+using SoftwareInstallationContracts.Exceptions;
 using SoftwareInstallationContracts.Extensions;
 using SoftwareInstallationContracts.Infrastucture;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 
 namespace SoftwareInstallationContracts.DataModels;
 
diff --git a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/CompanyDataModel.cs b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/CompanyDataModel.cs
index 135ad43..1de0a15 100644
--- a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/CompanyDataModel.cs
+++ b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/CompanyDataModel.cs
@@ -1,13 +1,6 @@
 using SoftwareInstallationContracts.Exceptions;
 using SoftwareInstallationContracts.Extensions;
 using SoftwareInstallationContracts.Infrastucture;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SoftwareInstallationContracts.DataModels;
 
diff --git a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/InstallationDataModel.cs b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/InstallationDataModel.cs
index 6406171..ec8d353 100644
--- a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/InstallationDataModel.cs
+++ b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/InstallationDataModel.cs
@@ -1,12 +1,6 @@
 using SoftwareInstallationContracts.Exceptions;
 using SoftwareInstallationContracts.Extensions;
 using SoftwareInstallationContracts.Infrastucture;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SoftwareInstallationContracts.DataModels;
 
diff --git a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/InstallationSoftwareDataModel.cs b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/InstallationSoftwareDataModel.cs
index e69e364..da2d979 100644
--- a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/InstallationSoftwareDataModel.cs
+++ b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/InstallationSoftwareDataModel.cs
@@ -1,11 +1,6 @@
 using SoftwareInstallationContracts.Exceptions;
 using SoftwareInstallationContracts.Extensions;
 using SoftwareInstallationContracts.Infrastucture;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SoftwareInstallationContracts.DataModels;
 
diff --git a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/PostDataModel.cs b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/PostDataModel.cs
index 562ad9f..c88641a 100644
--- a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/PostDataModel.cs
+++ b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/PostDataModel.cs
@@ -2,11 +2,6 @@
 using SoftwareInstallationContracts.Exceptions;
 using SoftwareInstallationContracts.Extensions;
 using SoftwareInstallationContracts.Infrastucture;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SoftwareInstallationContracts.DataModels;
 
diff --git a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/SalaryDataModel.cs b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/SalaryDataModel.cs
index 8a8539f..f5523b4 100644
--- a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/SalaryDataModel.cs
+++ b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/SalaryDataModel.cs
@@ -1,11 +1,6 @@
 using SoftwareInstallationContracts.Exceptions;
 using SoftwareInstallationContracts.Extensions;
 using SoftwareInstallationContracts.Infrastucture;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SoftwareInstallationContracts.DataModels;
 
diff --git a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/SoftwareDataModel.cs b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/SoftwareDataModel.cs
index 6d633be..56aa6b5 100644
--- a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/SoftwareDataModel.cs
+++ b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/SoftwareDataModel.cs
@@ -2,16 +2,11 @@
 using SoftwareInstallationContracts.Exceptions;
 using SoftwareInstallationContracts.Extensions;
 using SoftwareInstallationContracts.Infrastucture;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SoftwareInstallationContracts.DataModels;
 
 public class SoftwareDataModel(string id, string softwareName, SoftwareType softwareType,
-    string companyId, double price, bool isDeleted) : IValidation
+    string companyId, double price, bool isDeleted, List<SoftwareWarehouseDataModel> warehouses) : IValidation
 {
     public string Id { get; private set; } = id;
 
@@ -25,6 +20,8 @@ public class SoftwareDataModel(string id, string softwareName, SoftwareType soft
 
     public bool IsDeleted { get; private set; } = isDeleted;
 
+    public List<SoftwareWarehouseDataModel> Warehouses { get; private set; } = warehouses;
+    
     public void Validate()
     {
         if (Id.isEmpty())
@@ -47,5 +44,8 @@ public class SoftwareDataModel(string id, string softwareName, SoftwareType soft
 
         if (Price <= 0)
             throw new ValidationFieldException("Field Price is less than or equal to 0");
+        
+        if ((Warehouses?.Count() ?? 0) == 0)
+            throw new ValidationFieldException("The software must include warehouses");
     }
 }
diff --git a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/SoftwareHistoryDataModel.cs b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/SoftwareHistoryDataModel.cs
index d3a7cfe..5f96b32 100644
--- a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/SoftwareHistoryDataModel.cs
+++ b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/SoftwareHistoryDataModel.cs
@@ -1,12 +1,6 @@
 using SoftwareInstallationContracts.Exceptions;
 using SoftwareInstallationContracts.Extensions;
 using SoftwareInstallationContracts.Infrastucture;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SoftwareInstallationContracts.DataModels;
 
diff --git a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/SoftwareSupplyDataModel.cs b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/SoftwareSupplyDataModel.cs
index 92d67ab..b0a5b69 100644
--- a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/SoftwareSupplyDataModel.cs
+++ b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/SoftwareSupplyDataModel.cs
@@ -1,11 +1,6 @@
 using SoftwareInstallationContracts.Exceptions;
 using SoftwareInstallationContracts.Extensions;
 using SoftwareInstallationContracts.Infrastucture;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SoftwareInstallationContracts.DataModels;
 
diff --git a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/SoftwareWarehouseDataModel.cs b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/SoftwareWarehouseDataModel.cs
index 5de4047..ee8c75a 100644
--- a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/SoftwareWarehouseDataModel.cs
+++ b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/SoftwareWarehouseDataModel.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SoftwareInstallationContracts.Exceptions;
+using SoftwareInstallationContracts.Exceptions;
 using SoftwareInstallationContracts.Extensions;
 using SoftwareInstallationContracts.Infrastucture;
 
diff --git a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/SupplyDataModel.cs b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/SupplyDataModel.cs
index c8ce819..20a1d10 100644
--- a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/SupplyDataModel.cs
+++ b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/SupplyDataModel.cs
@@ -1,12 +1,6 @@
 using SoftwareInstallationContracts.Exceptions;
 using SoftwareInstallationContracts.Extensions;
 using SoftwareInstallationContracts.Infrastucture;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SoftwareInstallationContracts.DataModels;
 
diff --git a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/WarehouseDataModel.cs b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/WarehouseDataModel.cs
index be3331b..ab842b6 100644
--- a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/WarehouseDataModel.cs
+++ b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/WarehouseDataModel.cs
@@ -1,21 +1,14 @@
 using SoftwareInstallationContracts.Exceptions;
 using SoftwareInstallationContracts.Extensions;
 using SoftwareInstallationContracts.Infrastucture;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SoftwareInstallationContracts.DataModels;
 
-public class WarehouseDataModel(string id, int minCount, int currentCount, DateTime date) : IValidation
+public class WarehouseDataModel(string id, int totalCount, DateTime date) : IValidation
 {
     public string Id { get; private set; } = id;
 
-    public int MinCount { get; private set; } = minCount;
-
-    public int CurrentCount { get; private set; } = currentCount;
+    public int TotalCount { get; private set; } = totalCount;
 
     public DateTime ChangeDate { get; private set; } = date;
 
@@ -27,13 +20,7 @@ public class WarehouseDataModel(string id, int minCount, int currentCount, DateT
         if (!Id.isGuid())
             throw new ValidationFieldException("The value in the field Id is not a unique identifier");
 
-        if (MinCount <= 0)
-            throw new ValidationFieldException("Field MinCount is less than or equal to 0");
-
-        if (CurrentCount <= 0)
-            throw new ValidationFieldException("Field CurrentCount is less than or equal to 0");
-
-        if (CurrentCount < MinCount)
-            throw new ValidationFieldException("Field CurrentCount is less than MinCount");
+        if (TotalCount <= 0)
+            throw new ValidationFieldException("Field TotalCount is less than or equal to 0");
     }
 }
diff --git a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/WorkerDataModel.cs b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/WorkerDataModel.cs
index c752cc2..188403a 100644
--- a/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/WorkerDataModel.cs
+++ b/SoftwareInstallationContracts/SoftwareInstallationContracts/DataModels/WorkerDataModel.cs
@@ -1,12 +1,6 @@
 using SoftwareInstallationContracts.Exceptions;
 using SoftwareInstallationContracts.Extensions;
 using SoftwareInstallationContracts.Infrastucture;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 
 namespace SoftwareInstallationContracts.DataModels;
 
diff --git a/SoftwareInstallationContracts/SoftwareInstallationContracts/Enums/PostType.cs b/SoftwareInstallationContracts/SoftwareInstallationContracts/Enums/PostType.cs
index d38e1df..2022698 100644
--- a/SoftwareInstallationContracts/SoftwareInstallationContracts/Enums/PostType.cs
+++ b/SoftwareInstallationContracts/SoftwareInstallationContracts/Enums/PostType.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SoftwareInstallationContracts.Enums;
+namespace SoftwareInstallationContracts.Enums;
 
 public enum PostType
 {
diff --git a/SoftwareInstallationContracts/SoftwareInstallationContracts/Enums/SoftwareType.cs b/SoftwareInstallationContracts/SoftwareInstallationContracts/Enums/SoftwareType.cs
index f678ddb..ab997cb 100644
--- a/SoftwareInstallationContracts/SoftwareInstallationContracts/Enums/SoftwareType.cs
+++ b/SoftwareInstallationContracts/SoftwareInstallationContracts/Enums/SoftwareType.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SoftwareInstallationContracts.Enums;
+namespace SoftwareInstallationContracts.Enums;
 
 public enum SoftwareType
 {
diff --git a/SoftwareInstallationContracts/SoftwareInstallationContracts/Exceptions/ValidationFieldException.cs b/SoftwareInstallationContracts/SoftwareInstallationContracts/Exceptions/ValidationFieldException.cs
index bac07b3..be3a17e 100644
--- a/SoftwareInstallationContracts/SoftwareInstallationContracts/Exceptions/ValidationFieldException.cs
+++ b/SoftwareInstallationContracts/SoftwareInstallationContracts/Exceptions/ValidationFieldException.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SoftwareInstallationContracts.Exceptions;
+namespace SoftwareInstallationContracts.Exceptions;
 
 public class ValidationFieldException(String message) : Exception(message)
 {
diff --git a/SoftwareInstallationContracts/SoftwareInstallationContracts/Extensions/StringExceptions.cs b/SoftwareInstallationContracts/SoftwareInstallationContracts/Extensions/StringExceptions.cs
index 2234183..c059f31 100644
--- a/SoftwareInstallationContracts/SoftwareInstallationContracts/Extensions/StringExceptions.cs
+++ b/SoftwareInstallationContracts/SoftwareInstallationContracts/Extensions/StringExceptions.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SoftwareInstallationContracts.Extensions;
+namespace SoftwareInstallationContracts.Extensions;
 
 public static class StringExceptions
 {
diff --git a/SoftwareInstallationContracts/SoftwareInstallationContracts/Infrastucture/IValidation.cs b/SoftwareInstallationContracts/SoftwareInstallationContracts/Infrastucture/IValidation.cs
index c42f0c6..e0e0cd4 100644
--- a/SoftwareInstallationContracts/SoftwareInstallationContracts/Infrastucture/IValidation.cs
+++ b/SoftwareInstallationContracts/SoftwareInstallationContracts/Infrastucture/IValidation.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SoftwareInstallationContracts.Infrastucture;
+namespace SoftwareInstallationContracts.Infrastucture;
 
 public interface IValidation
 {
diff --git a/SoftwareInstallationTests/DataModelsTests/ClientDataModelTests.cs b/SoftwareInstallationTests/DataModelsTests/ClientDataModelTests.cs
index cd6d011..3e642a3 100644
--- a/SoftwareInstallationTests/DataModelsTests/ClientDataModelTests.cs
+++ b/SoftwareInstallationTests/DataModelsTests/ClientDataModelTests.cs
@@ -1,10 +1,5 @@
 using SoftwareInstallationContracts.DataModels;
 using SoftwareInstallationContracts.Exceptions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SoftwareInstallationTests.DataModelsTests;
 
diff --git a/SoftwareInstallationTests/DataModelsTests/CompanyDataModelTests.cs b/SoftwareInstallationTests/DataModelsTests/CompanyDataModelTests.cs
index 15489c0..9d11a3a 100644
--- a/SoftwareInstallationTests/DataModelsTests/CompanyDataModelTests.cs
+++ b/SoftwareInstallationTests/DataModelsTests/CompanyDataModelTests.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SoftwareInstallationContracts.DataModels;
+using SoftwareInstallationContracts.DataModels;
 using SoftwareInstallationContracts.Exceptions;
 
 namespace SoftwareInstallationTests.DataModelsTests;
diff --git a/SoftwareInstallationTests/DataModelsTests/InstallationDataModelTests.cs b/SoftwareInstallationTests/DataModelsTests/InstallationDataModelTests.cs
index 981e8b1..31707ef 100644
--- a/SoftwareInstallationTests/DataModelsTests/InstallationDataModelTests.cs
+++ b/SoftwareInstallationTests/DataModelsTests/InstallationDataModelTests.cs
@@ -1,10 +1,5 @@
 using SoftwareInstallationContracts.DataModels;
 using SoftwareInstallationContracts.Exceptions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SoftwareInstallationTests.DataModelsTests;
 
diff --git a/SoftwareInstallationTests/DataModelsTests/InstallationSoftwareDataModelTests.cs b/SoftwareInstallationTests/DataModelsTests/InstallationSoftwareDataModelTests.cs
index b81e079..1329297 100644
--- a/SoftwareInstallationTests/DataModelsTests/InstallationSoftwareDataModelTests.cs
+++ b/SoftwareInstallationTests/DataModelsTests/InstallationSoftwareDataModelTests.cs
@@ -1,11 +1,5 @@
 using SoftwareInstallationContracts.DataModels;
 using SoftwareInstallationContracts.Exceptions;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SoftwareInstallationTests.DataModelsTests;
 
diff --git a/SoftwareInstallationTests/DataModelsTests/PostDataModelTests.cs b/SoftwareInstallationTests/DataModelsTests/PostDataModelTests.cs
index a780697..c073206 100644
--- a/SoftwareInstallationTests/DataModelsTests/PostDataModelTests.cs
+++ b/SoftwareInstallationTests/DataModelsTests/PostDataModelTests.cs
@@ -1,11 +1,6 @@
 using SoftwareInstallationContracts.DataModels;
-using SoftwareInstallationContracts.Exceptions;
 using SoftwareInstallationContracts.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using SoftwareInstallationContracts.Exceptions;
 
 namespace SoftwareInstallationTests.DataModelsTests;
 
diff --git a/SoftwareInstallationTests/DataModelsTests/SalaryDataModelTests.cs b/SoftwareInstallationTests/DataModelsTests/SalaryDataModelTests.cs
index 3bf9a13..612b609 100644
--- a/SoftwareInstallationTests/DataModelsTests/SalaryDataModelTests.cs
+++ b/SoftwareInstallationTests/DataModelsTests/SalaryDataModelTests.cs
@@ -1,11 +1,5 @@
 using SoftwareInstallationContracts.DataModels;
 using SoftwareInstallationContracts.Exceptions;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SoftwareInstallationTests.DataModelsTests;
 
diff --git a/SoftwareInstallationTests/DataModelsTests/SoftwareDataModelTests.cs b/SoftwareInstallationTests/DataModelsTests/SoftwareDataModelTests.cs
index e92fe6a..8123b71 100644
--- a/SoftwareInstallationTests/DataModelsTests/SoftwareDataModelTests.cs
+++ b/SoftwareInstallationTests/DataModelsTests/SoftwareDataModelTests.cs
@@ -1,12 +1,6 @@
 using SoftwareInstallationContracts.DataModels;
 using SoftwareInstallationContracts.Enums;
 using SoftwareInstallationContracts.Exceptions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using static NUnit.Framework.Internal.OSPlatform;
 
 namespace SoftwareInstallationTests.DataModelsTests;
 
@@ -83,6 +77,15 @@ internal class SoftwareDataModelTests
         Assert.That(() => software.Validate(), Throws.TypeOf<ValidationFieldException>());
     }
 
+    [Test]
+    public void SoftwaresIsNullOrEmptyTest()
+    {
+        software = CreateDataModel(Guid.NewGuid().ToString(), "name", SoftwareType.ApplicationSoftware, Guid.NewGuid().ToString(), 10, false, null);
+        Assert.That(() => software.Validate(), Throws.TypeOf<ValidationFieldException>());
+        software = CreateDataModel(Guid.NewGuid().ToString(), "name", SoftwareType.ApplicationSoftware, Guid.NewGuid().ToString(), 10, false, []);
+        Assert.That(() => software.Validate(), Throws.TypeOf<ValidationFieldException>());
+    }
+    
     [Test]
     public void AllFieldsIsCorrectTest()
     {
diff --git a/SoftwareInstallationTests/DataModelsTests/SoftwareHistoryDataModelTests.cs b/SoftwareInstallationTests/DataModelsTests/SoftwareHistoryDataModelTests.cs
index c24c97c..8a701de 100644
--- a/SoftwareInstallationTests/DataModelsTests/SoftwareHistoryDataModelTests.cs
+++ b/SoftwareInstallationTests/DataModelsTests/SoftwareHistoryDataModelTests.cs
@@ -1,11 +1,5 @@
 using SoftwareInstallationContracts.DataModels;
 using SoftwareInstallationContracts.Exceptions;
-using SoftwareInstallationContracts.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SoftwareInstallationTests.DataModelsTests;
 
diff --git a/SoftwareInstallationTests/DataModelsTests/SoftwareSupplyDataModelTests.cs b/SoftwareInstallationTests/DataModelsTests/SoftwareSupplyDataModelTests.cs
index f8d9218..9c24fd6 100644
--- a/SoftwareInstallationTests/DataModelsTests/SoftwareSupplyDataModelTests.cs
+++ b/SoftwareInstallationTests/DataModelsTests/SoftwareSupplyDataModelTests.cs
@@ -1,10 +1,5 @@
 using SoftwareInstallationContracts.DataModels;
 using SoftwareInstallationContracts.Exceptions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SoftwareInstallationTests.DataModelsTests;
 
diff --git a/SoftwareInstallationTests/DataModelsTests/SoftwareWarehouseDataModelTests.cs b/SoftwareInstallationTests/DataModelsTests/SoftwareWarehouseDataModelTests.cs
index cff2c1a..7854e13 100644
--- a/SoftwareInstallationTests/DataModelsTests/SoftwareWarehouseDataModelTests.cs
+++ b/SoftwareInstallationTests/DataModelsTests/SoftwareWarehouseDataModelTests.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SoftwareInstallationContracts.DataModels;
+using SoftwareInstallationContracts.DataModels;
 using SoftwareInstallationContracts.Exceptions;
 
 namespace SoftwareInstallationTests.DataModelsTests;
diff --git a/SoftwareInstallationTests/DataModelsTests/SupplyDataModelTests.cs b/SoftwareInstallationTests/DataModelsTests/SupplyDataModelTests.cs
index a0dd21c..5b9fac4 100644
--- a/SoftwareInstallationTests/DataModelsTests/SupplyDataModelTests.cs
+++ b/SoftwareInstallationTests/DataModelsTests/SupplyDataModelTests.cs
@@ -1,10 +1,5 @@
 using SoftwareInstallationContracts.DataModels;
 using SoftwareInstallationContracts.Exceptions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SoftwareInstallationTests.DataModelsTests;
 
diff --git a/SoftwareInstallationTests/DataModelsTests/WarehouseDataModelTests.cs b/SoftwareInstallationTests/DataModelsTests/WarehouseDataModelTests.cs
index 60e5b0c..65583f2 100644
--- a/SoftwareInstallationTests/DataModelsTests/WarehouseDataModelTests.cs
+++ b/SoftwareInstallationTests/DataModelsTests/WarehouseDataModelTests.cs
@@ -1,10 +1,5 @@
 using SoftwareInstallationContracts.DataModels;
 using SoftwareInstallationContracts.Exceptions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SoftwareInstallationTests.DataModelsTests;
 
@@ -43,8 +38,8 @@ internal class WarehouseDataModelTests
     {
         string warehouseId = Guid.NewGuid().ToString();
         int totalCount = 10;
-        DateTime date = DateTime.UtcNow;
-        WarehouseDataModel warehouse = CreateDataModel(warehouseId, totalCount, date);
+        DateTime date = DateTime.UtcNow; 
+        warehouse = CreateDataModel(warehouseId, totalCount, date);
         Assert.That(() => warehouse.Validate(), Throws.Nothing);
         Assert.Multiple(() =>
         {
diff --git a/SoftwareInstallationTests/DataModelsTests/WorkerDataModelTests.cs b/SoftwareInstallationTests/DataModelsTests/WorkerDataModelTests.cs
index 6ddc839..4882eb2 100644
--- a/SoftwareInstallationTests/DataModelsTests/WorkerDataModelTests.cs
+++ b/SoftwareInstallationTests/DataModelsTests/WorkerDataModelTests.cs
@@ -1,11 +1,5 @@
 using SoftwareInstallationContracts.DataModels;
 using SoftwareInstallationContracts.Exceptions;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SoftwareInstallationTests.DataModelsTests;