diff --git a/.gitignore b/.gitignore
index 44d5f50ae..1f092d2c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,7 @@ local.settings.json
application/CohortManager/SampleData/
*.csv
*.parquet
+!tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/*.parquet
# csv to sql statement scripts
bs_select_gp_practice_lpk.txt
diff --git a/application/CohortManager/src/Functions/Functions.sln b/application/CohortManager/src/Functions/Functions.sln
index 9e3daf6d8..45c12352e 100644
--- a/application/CohortManager/src/Functions/Functions.sln
+++ b/application/CohortManager/src/Functions/Functions.sln
@@ -28,7 +28,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Shared\Common\Com
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Model", "Shared\Model\Model.csproj", "{682DDE9F-2868-4477-B159-9EB7D255D565}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "receiveCaasFileTest", "..\..\..\..\tests\CaasIntegrationTests\receiveCaasFileTest\receiveCaasFileTest.csproj", "{8DF1A047-4800-4668-877F-8AC8708AB238}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "receiveCaasFileTest", "..\..\..\..\tests\UnitTests\CaasIntegrationTests\receiveCaasFileTest\receiveCaasFileTest.csproj", "{8DF1A047-4800-4668-877F-8AC8708AB238}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data", "Shared\Data\Data.csproj", "{ABA8CD5A-BEF7-4962-9C23-AE69F430CC1B}"
EndProject
@@ -106,7 +106,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UpdateParticipantTests", ".
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RetrieveMeshFile", "CaasIntegration\RetrieveMeshFile\RetrieveMeshFile.csproj", "{A5CC3CCE-2816-434A-AC32-FCF4251BDCAC}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "retrieveMeshFileTest", "..\..\..\..\tests\CaasIntegrationTests\retrieveMeshFileTest\retrieveMeshFileTest.csproj", "{31A651CD-25D0-4131-B773-0A34495164D5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "retrieveMeshFileTest", "..\..\..\..\tests\UnitTests\CaasIntegrationTests\retrieveMeshFileTest\retrieveMeshFileTest.csproj", "{31A651CD-25D0-4131-B773-0A34495164D5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ValidateCohortDistributionRecord", "CohortDistributionServices\ValidateCohortDistributionRecord\ValidateCohortDistributionRecord.csproj", "{BD5E5333-2C20-4009-BF58-BFB930AD6B6C}"
EndProject
@@ -154,8 +154,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanguageCodesDataService",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CurrentPosting", "screeningDataServices\CurrentPostingDataService\CurrentPosting.csproj", "{9974CB33-DDF0-4CBD-95F8-6CA94F2F04E8}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataServiceTests", "..\..\..\..\tests\DataServiceTests\DataServiceTests.csproj", "{824D0893-14F9-47D9-B381-3BB899B4CBDA}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExcludedSMULookupDataServices", "screeningDataServices\ExcludedSMULookupDataService\ExcludedSMULookupDataServices.csproj", "{9B9E8E86-601F-4C10-B6EF-348AF9A168AA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ParticipantDemographicDataService", "screeningDataServices\ParticipantDemographicDataService\ParticipantDemographicDataService.csproj", "{D8990183-52BA-4A1F-B333-5B32AAF14348}"
@@ -166,13 +164,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TransformReasonForRemovalTe
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TransformDataServiceTests", "..\..\..\..\tests\UnitTests\TransformDataServiceTests\TransformDataServiceTests\TransformDataServiceTests.csproj", "{DCBF3583-DC87-46BE-93DC-C345E779D95C}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProcessCaasFileTests", "..\..\..\..\tests\CaasIntegrationTests\processCaasFileTest\ProcessCaasFileTests.csproj", "{FE9773EF-DFB8-4308-869B-EABD0776C828}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProcessCaasFileTests", "..\..\..\..\tests\UnitTests\CaasIntegrationTests\processCaasFileTest\ProcessCaasFileTests.csproj", "{FE9773EF-DFB8-4308-869B-EABD0776C828}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddBatchToQueueTest", "..\..\..\..\tests\UnitTests\CaasIntegrationTests\AddBatchToQueueTest\AddBatchToQueueTest.csproj", "{2AC4643E-35A5-4BC1-BDF9-2377E9748316}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddBatchToQueueTest", "..\..\..\..\tests\CaasIntegrationTests\AddBatchToQueueTest\AddBatchToQueueTest.csproj", "{2AC4643E-35A5-4BC1-BDF9-2377E9748316}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RecordsProcessedTrackerTests", "..\..\..\..\tests\UnitTests\CaasIntegrationTests\RecordsProcessedTrackerTests\RecordsProcessedTrackerTests.csproj", "{AA6F6E1A-7511-4A65-ADCB-B86DF46223D6}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RecordsProcessedTrackerTests", "..\..\..\..\tests\CaasIntegrationTests\RecordsProcessedTrackerTests\RecordsProcessedTrackerTests.csproj", "{AA6F6E1A-7511-4A65-ADCB-B86DF46223D6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ValidateDatesTests", "..\..\..\..\tests\UnitTests\CaasIntegrationTests\ValidateDates\ValidateDatesTests.csproj", "{9005A919-F64D-4723-87A7-595BB4E64563}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ValidateDatesTests", "..\..\..\..\tests\CaasIntegrationTests\ValidateDates\ValidateDatesTests.csproj", "{FBF592EF-DB88-4ED9-A65D-0F6C4C310C87}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataServiceTests", "..\..\..\..\tests\UnitTests\DataServiceTests\DataServiceTests.csproj", "{E26B2D73-BD60-4AD8-B403-939ACEDE9429}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -432,6 +432,14 @@ Global
{FBF592EF-DB88-4ED9-A65D-0F6C4C310C87}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FBF592EF-DB88-4ED9-A65D-0F6C4C310C87}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FBF592EF-DB88-4ED9-A65D-0F6C4C310C87}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9005A919-F64D-4723-87A7-595BB4E64563}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9005A919-F64D-4723-87A7-595BB4E64563}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9005A919-F64D-4723-87A7-595BB4E64563}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9005A919-F64D-4723-87A7-595BB4E64563}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E26B2D73-BD60-4AD8-B403-939ACEDE9429}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E26B2D73-BD60-4AD8-B403-939ACEDE9429}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E26B2D73-BD60-4AD8-B403-939ACEDE9429}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E26B2D73-BD60-4AD8-B403-939ACEDE9429}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/tests/CaasIntegrationTests/AddBatchToQueueTest/AddBatchToQueueTest.cs b/tests/UnitTests/CaasIntegrationTests/AddBatchToQueueTest/AddBatchToQueueTest.cs
similarity index 100%
rename from tests/CaasIntegrationTests/AddBatchToQueueTest/AddBatchToQueueTest.cs
rename to tests/UnitTests/CaasIntegrationTests/AddBatchToQueueTest/AddBatchToQueueTest.cs
diff --git a/tests/CaasIntegrationTests/AddBatchToQueueTest/AddBatchToQueueTest.csproj b/tests/UnitTests/CaasIntegrationTests/AddBatchToQueueTest/AddBatchToQueueTest.csproj
similarity index 77%
rename from tests/CaasIntegrationTests/AddBatchToQueueTest/AddBatchToQueueTest.csproj
rename to tests/UnitTests/CaasIntegrationTests/AddBatchToQueueTest/AddBatchToQueueTest.csproj
index 934974c63..e9105b0c3 100644
--- a/tests/CaasIntegrationTests/AddBatchToQueueTest/AddBatchToQueueTest.csproj
+++ b/tests/UnitTests/CaasIntegrationTests/AddBatchToQueueTest/AddBatchToQueueTest.csproj
@@ -23,6 +23,7 @@
-
+
+
diff --git a/tests/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.cs b/tests/UnitTests/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.cs
similarity index 91%
rename from tests/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.cs
rename to tests/UnitTests/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.cs
index db8abfa73..b2c766cb0 100644
--- a/tests/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.cs
+++ b/tests/UnitTests/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.cs
@@ -1,11 +1,6 @@
namespace NHS.CohortManager.Tests.CaasIntegrationTests;
-using Azure.Storage.Queues;
-using Microsoft.Extensions.Logging;
-using Model;
-using Moq;
using NHS.Screening.ReceiveCaasFile;
-using receiveCaasFile;
[TestClass]
public class RecordsProcessedTrackerTests
diff --git a/tests/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.csproj b/tests/UnitTests/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.csproj
similarity index 76%
rename from tests/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.csproj
rename to tests/UnitTests/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.csproj
index 534b73ccf..98fe3a5cb 100644
--- a/tests/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.csproj
+++ b/tests/UnitTests/CaasIntegrationTests/RecordsProcessedTrackerTests/RecordsProcessedTrackerTests.csproj
@@ -22,8 +22,8 @@
-
+
+
diff --git a/tests/CaasIntegrationTests/ValidateDates/ValidateDatesTests.cs b/tests/UnitTests/CaasIntegrationTests/ValidateDates/ValidateDatesTests.cs
similarity index 93%
rename from tests/CaasIntegrationTests/ValidateDates/ValidateDatesTests.cs
rename to tests/UnitTests/CaasIntegrationTests/ValidateDates/ValidateDatesTests.cs
index 6bb64be9a..9227cdac7 100644
--- a/tests/CaasIntegrationTests/ValidateDates/ValidateDatesTests.cs
+++ b/tests/UnitTests/CaasIntegrationTests/ValidateDates/ValidateDatesTests.cs
@@ -1,16 +1,10 @@
namespace NHS.CohortManager.Tests.CaasIntegrationTests;
-using System.Diagnostics;
using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Text.Json;
-using Common;
-using Common.Interfaces;
using Microsoft.Extensions.Logging;
using Model;
using Moq;
using NHS.Screening.ReceiveCaasFile;
-using receiveCaasFile;
[TestClass]
public class ValidateDatesTests
@@ -39,7 +33,7 @@ public void ValidateDates_ShouldReturnFalse_WhenCurrentPostingEffectiveFromDateI
PrimaryCareProviderEffectiveFromDate = "20230101"
};
- var res = _validateDates.ValidateAlleDates(participant);
+ var res = _validateDates.ValidateAllDates(participant);
// Assert
Assert.IsFalse(res);
@@ -60,7 +54,7 @@ public void ValidateDates_ShouldReturnTrue_WhenAllDatesAreValid()
PrimaryCareProviderEffectiveFromDate = "20230101"
};
- var res = _validateDates.ValidateAlleDates(participant);
+ var res = _validateDates.ValidateAllDates(participant);
// Assert
Assert.IsTrue(res);
@@ -89,7 +83,7 @@ public void ValidateDates_ShouldReturnFalse_WhenEmailAddressEffectiveFromDateIsI
PrimaryCareProviderEffectiveFromDate = "20230101"
};
- var res = _validateDates.ValidateAlleDates(participant);
+ var res = _validateDates.ValidateAllDates(participant);
// Assert
Assert.IsFalse(res);
@@ -117,7 +111,7 @@ public void ValidateDates_ShouldReturnFalse_WhenMobileNumberEffectiveFromDateIsI
PrimaryCareProviderEffectiveFromDate = "20230101"
};
- var res = _validateDates.ValidateAlleDates(participant);
+ var res = _validateDates.ValidateAllDates(participant);
// Assert
Assert.IsFalse(res);
_loggerMock.Verify(x => x.Log(It.Is(l => l == LogLevel.Error),
@@ -143,7 +137,7 @@ public void ValidateDates_ShouldReturnFalse_WhenUsualAddressEffectiveFromDateIsI
PrimaryCareProviderEffectiveFromDate = "20230101"
};
- var res = _validateDates.ValidateAlleDates(participant);
+ var res = _validateDates.ValidateAllDates(participant);
// Assert
Assert.IsFalse(res);
diff --git a/tests/CaasIntegrationTests/ValidateDates/ValidateDatesTests.csproj b/tests/UnitTests/CaasIntegrationTests/ValidateDates/ValidateDatesTests.csproj
similarity index 76%
rename from tests/CaasIntegrationTests/ValidateDates/ValidateDatesTests.csproj
rename to tests/UnitTests/CaasIntegrationTests/ValidateDates/ValidateDatesTests.csproj
index 388fb79c6..f1d946d9d 100644
--- a/tests/CaasIntegrationTests/ValidateDates/ValidateDatesTests.csproj
+++ b/tests/UnitTests/CaasIntegrationTests/ValidateDates/ValidateDatesTests.csproj
@@ -22,9 +22,8 @@
-
-
+
+
diff --git a/tests/CaasIntegrationTests/processCaasFileTest/ProcessCaasFileTests.csproj b/tests/UnitTests/CaasIntegrationTests/processCaasFileTest/ProcessCaasFileTests.csproj
similarity index 84%
rename from tests/CaasIntegrationTests/processCaasFileTest/ProcessCaasFileTests.csproj
rename to tests/UnitTests/CaasIntegrationTests/processCaasFileTest/ProcessCaasFileTests.csproj
index 388fb79c6..7ceb191f3 100644
--- a/tests/CaasIntegrationTests/processCaasFileTest/ProcessCaasFileTests.csproj
+++ b/tests/UnitTests/CaasIntegrationTests/processCaasFileTest/ProcessCaasFileTests.csproj
@@ -23,7 +23,7 @@
+ Include="..\..\..\..\application\CohortManager\src\Functions\CaasIntegration\receiveCaasFile\receiveCaasFile.csproj" />
diff --git a/tests/CaasIntegrationTests/processCaasFileTest/processCaasFileTests.cs b/tests/UnitTests/CaasIntegrationTests/processCaasFileTest/processCaasFileTests.cs
similarity index 99%
rename from tests/CaasIntegrationTests/processCaasFileTest/processCaasFileTests.cs
rename to tests/UnitTests/CaasIntegrationTests/processCaasFileTest/processCaasFileTests.cs
index 7af70308f..30ac57d4c 100644
--- a/tests/CaasIntegrationTests/processCaasFileTest/processCaasFileTests.cs
+++ b/tests/UnitTests/CaasIntegrationTests/processCaasFileTest/processCaasFileTests.cs
@@ -10,7 +10,6 @@ namespace NHS.CohortManager.Tests.CaasIntegrationTests;
using Model;
using Moq;
using NHS.Screening.ReceiveCaasFile;
-using receiveCaasFile;
[TestClass]
public class ProcessCaasFileTests
diff --git a/tests/CaasIntegrationTests/receiveCaasFileTest/BSS_20240718150245_n4.parquet b/tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/BSS_20240718150245_n4.parquet
similarity index 100%
rename from tests/CaasIntegrationTests/receiveCaasFileTest/BSS_20240718150245_n4.parquet
rename to tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/BSS_20240718150245_n4.parquet
diff --git a/tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/F9B292BSS_20241201121212_n1.parquet b/tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/F9B292BSS_20241201121212_n1.parquet
new file mode 100644
index 000000000..980d8cb92
Binary files /dev/null and b/tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/F9B292BSS_20241201121212_n1.parquet differ
diff --git a/tests/CaasIntegrationTests/receiveCaasFileTest/ReceiveCaasFileTests.cs b/tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/ReceiveCaasFileTests.cs
similarity index 100%
rename from tests/CaasIntegrationTests/receiveCaasFileTest/ReceiveCaasFileTests.cs
rename to tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/ReceiveCaasFileTests.cs
diff --git a/tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/add_1_-_CAAS_BREAST_SCREENING_COHORT.parquet b/tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/add_1_-_CAAS_BREAST_SCREENING_COHORT.parquet
new file mode 100644
index 000000000..e029fa09e
Binary files /dev/null and b/tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/add_1_-_CAAS_BREAST_SCREENING_COHORT.parquet differ
diff --git a/tests/CaasIntegrationTests/receiveCaasFileTest/receiveCaasFileTest.csproj b/tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/receiveCaasFileTest.csproj
similarity index 84%
rename from tests/CaasIntegrationTests/receiveCaasFileTest/receiveCaasFileTest.csproj
rename to tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/receiveCaasFileTest.csproj
index 65d6d8e3b..2de1f2f0a 100644
--- a/tests/CaasIntegrationTests/receiveCaasFileTest/receiveCaasFileTest.csproj
+++ b/tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/receiveCaasFileTest.csproj
@@ -32,8 +32,8 @@
-
+ Include="..\..\..\..\application\CohortManager\src\Functions\CaasIntegration\receiveCaasFile\receiveCaasFile.csproj" />
+
diff --git a/tests/CaasIntegrationTests/retrieveMeshFileTest/MeshResponseTestHelper.cs b/tests/UnitTests/CaasIntegrationTests/retrieveMeshFileTest/MeshResponseTestHelper.cs
similarity index 100%
rename from tests/CaasIntegrationTests/retrieveMeshFileTest/MeshResponseTestHelper.cs
rename to tests/UnitTests/CaasIntegrationTests/retrieveMeshFileTest/MeshResponseTestHelper.cs
diff --git a/tests/CaasIntegrationTests/retrieveMeshFileTest/RetrieveMeshFileTest.cs b/tests/UnitTests/CaasIntegrationTests/retrieveMeshFileTest/RetrieveMeshFileTest.cs
similarity index 100%
rename from tests/CaasIntegrationTests/retrieveMeshFileTest/RetrieveMeshFileTest.cs
rename to tests/UnitTests/CaasIntegrationTests/retrieveMeshFileTest/RetrieveMeshFileTest.cs
diff --git a/tests/CaasIntegrationTests/retrieveMeshFileTest/retrieveMeshFileTest.csproj b/tests/UnitTests/CaasIntegrationTests/retrieveMeshFileTest/retrieveMeshFileTest.csproj
similarity index 84%
rename from tests/CaasIntegrationTests/retrieveMeshFileTest/retrieveMeshFileTest.csproj
rename to tests/UnitTests/CaasIntegrationTests/retrieveMeshFileTest/retrieveMeshFileTest.csproj
index 085031531..6610e0169 100644
--- a/tests/CaasIntegrationTests/retrieveMeshFileTest/retrieveMeshFileTest.csproj
+++ b/tests/UnitTests/CaasIntegrationTests/retrieveMeshFileTest/retrieveMeshFileTest.csproj
@@ -22,7 +22,7 @@
-
+
diff --git a/tests/DataServiceTests/BsSelectGpPracticeDataServiceTests.cs b/tests/UnitTests/DataServiceTests/BsSelectGpPracticeDataServiceTests.cs
similarity index 100%
rename from tests/DataServiceTests/BsSelectGpPracticeDataServiceTests.cs
rename to tests/UnitTests/DataServiceTests/BsSelectGpPracticeDataServiceTests.cs
diff --git a/tests/DataServiceTests/BsSelectOutCodeDataServiceTests.cs b/tests/UnitTests/DataServiceTests/BsSelectOutCodeDataServiceTests.cs
similarity index 100%
rename from tests/DataServiceTests/BsSelectOutCodeDataServiceTests.cs
rename to tests/UnitTests/DataServiceTests/BsSelectOutCodeDataServiceTests.cs
diff --git a/tests/DataServiceTests/CurrentPostingDataServiceTests.cs b/tests/UnitTests/DataServiceTests/CurrentPostingDataServiceTests.cs
similarity index 100%
rename from tests/DataServiceTests/CurrentPostingDataServiceTests.cs
rename to tests/UnitTests/DataServiceTests/CurrentPostingDataServiceTests.cs
diff --git a/tests/DataServiceTests/DataServiceClientTests.cs b/tests/UnitTests/DataServiceTests/DataServiceClientTests.cs
similarity index 100%
rename from tests/DataServiceTests/DataServiceClientTests.cs
rename to tests/UnitTests/DataServiceTests/DataServiceClientTests.cs
diff --git a/tests/DataServiceTests/DataServiceTestHelper.cs b/tests/UnitTests/DataServiceTests/DataServiceTestHelper.cs
similarity index 100%
rename from tests/DataServiceTests/DataServiceTestHelper.cs
rename to tests/UnitTests/DataServiceTests/DataServiceTestHelper.cs
diff --git a/tests/DataServiceTests/DataServiceTests.csproj b/tests/UnitTests/DataServiceTests/DataServiceTests.csproj
similarity index 60%
rename from tests/DataServiceTests/DataServiceTests.csproj
rename to tests/UnitTests/DataServiceTests/DataServiceTests.csproj
index 0a9e861d6..a3ce44213 100644
--- a/tests/DataServiceTests/DataServiceTests.csproj
+++ b/tests/UnitTests/DataServiceTests/DataServiceTests.csproj
@@ -22,11 +22,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/tests/DataServiceTests/MockDataServiceAccessor.cs b/tests/UnitTests/DataServiceTests/MockDataServiceAccessor.cs
similarity index 100%
rename from tests/DataServiceTests/MockDataServiceAccessor.cs
rename to tests/UnitTests/DataServiceTests/MockDataServiceAccessor.cs