diff --git a/OData.E2E.sln b/OData.E2E.sln
index 1a2e83fcd8..b160b88a50 100644
--- a/OData.E2E.sln
+++ b/OData.E2E.sln
@@ -17,13 +17,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{5D4916FD-F
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "unitTests", "unitTests", "{F2A816DD-1537-4D00-B3BF-535F4FA8D724}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Client.Tests", "test\FunctionalTests\Microsoft.OData.Client.Tests\Microsoft.OData.Client.Tests.csproj", "{B9F65944-971A-4665-B0F1-5FD413C0DAD8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Client.Tests", "test\UnitTests\Microsoft.OData.Client.Tests\Microsoft.OData.Client.Tests.csproj", "{B9F65944-971A-4665-B0F1-5FD413C0DAD8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Core.Tests", "test\FunctionalTests\Microsoft.OData.Core.Tests\Microsoft.OData.Core.Tests.csproj", "{6FEFB52A-B175-466C-92C3-58A5DF513440}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Core.Tests", "test\UnitTests\Microsoft.OData.Core.Tests\Microsoft.OData.Core.Tests.csproj", "{6FEFB52A-B175-466C-92C3-58A5DF513440}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Edm.Tests", "test\FunctionalTests\Microsoft.OData.Edm.Tests\Microsoft.OData.Edm.Tests.csproj", "{17E925D3-8840-41BD-B0DF-884334FB9812}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Edm.Tests", "test\UnitTests\Microsoft.OData.Edm.Tests\Microsoft.OData.Edm.Tests.csproj", "{17E925D3-8840-41BD-B0DF-884334FB9812}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Spatial.Tests", "test\FunctionalTests\Microsoft.Spatial.Tests\Microsoft.Spatial.Tests.csproj", "{F40112C3-4150-41DB-BDF2-1C34FC9B49D6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Spatial.Tests", "test\UnitTests\Microsoft.Spatial.Tests\Microsoft.Spatial.Tests.csproj", "{F40112C3-4150-41DB-BDF2-1C34FC9B49D6}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "e2eTests", "e2eTests", "{57146ABA-0B08-4B0A-8D27-9A477FA0C2B5}"
 EndProject
diff --git a/build.ps1 b/build.ps1
index 2dfe6d5b69..c82edc25d3 100644
--- a/build.ps1
+++ b/build.ps1
@@ -137,10 +137,10 @@ $NightlyTestDlls = "microsoft.test.data.services.ddbasics.dll",
        "astoriaclientunittests.dll"
 
 # .NET Core tests are different and require the dotnet tool. The tool references the .csproj (VS2017) files instead of dlls
-$NetCoreXUnitTestProjs = "\test\FunctionalTests\Microsoft.Spatial.Tests\Microsoft.Spatial.Tests.csproj",
-    "\test\FunctionalTests\Microsoft.OData.Edm.Tests\Microsoft.OData.Edm.Tests.csproj",
-    "\test\FunctionalTests\Microsoft.OData.Core.Tests\Microsoft.OData.Core.Tests.csproj",
-    "\test\FunctionalTests\Microsoft.OData.Client.Tests\Microsoft.OData.Client.Tests.csproj"
+$NetCoreXUnitTestProjs = "\test\UnitTests\Microsoft.Spatial.Tests\Microsoft.Spatial.Tests.csproj",
+    "\test\UnitTests\Microsoft.OData.Edm.Tests\Microsoft.OData.Edm.Tests.csproj",
+    "\test\UnitTests\Microsoft.OData.Core.Tests\Microsoft.OData.Core.Tests.csproj",
+    "\test\UnitTests\Microsoft.OData.Client.Tests\Microsoft.OData.Client.Tests.csproj"
 	
 $NetCoreE2ETestProjs = "\test\FunctionalTests\Tests\DataServices\ddbasics\Microsoft.Test.Data.Services.DDBasics.csproj",
      "\test\FunctionalTests\Tests\DataServices\UnitTests\TDDUnitTests\Microsoft.OData.Service.TDDUnitTests.csproj",
diff --git a/sln/OData.E2E.sln b/sln/OData.E2E.sln
index b1c7f40272..a616d662d8 100644
--- a/sln/OData.E2E.sln
+++ b/sln/OData.E2E.sln
@@ -17,13 +17,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{5D4916FD-F
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "unitTests", "unitTests", "{F2A816DD-1537-4D00-B3BF-535F4FA8D724}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Client.Tests", "..\test\FunctionalTests\Microsoft.OData.Client.Tests\Microsoft.OData.Client.Tests.csproj", "{B9F65944-971A-4665-B0F1-5FD413C0DAD8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Client.Tests", "..\test\UnitTests\Microsoft.OData.Client.Tests\Microsoft.OData.Client.Tests.csproj", "{B9F65944-971A-4665-B0F1-5FD413C0DAD8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Core.Tests", "..\test\FunctionalTests\Microsoft.OData.Core.Tests\Microsoft.OData.Core.Tests.csproj", "{6FEFB52A-B175-466C-92C3-58A5DF513440}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Core.Tests", "..\test\UnitTests\Microsoft.OData.Core.Tests\Microsoft.OData.Core.Tests.csproj", "{6FEFB52A-B175-466C-92C3-58A5DF513440}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Edm.Tests", "..\test\FunctionalTests\Microsoft.OData.Edm.Tests\Microsoft.OData.Edm.Tests.csproj", "{17E925D3-8840-41BD-B0DF-884334FB9812}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Edm.Tests", "..\test\UnitTests\Microsoft.OData.Edm.Tests\Microsoft.OData.Edm.Tests.csproj", "{17E925D3-8840-41BD-B0DF-884334FB9812}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Spatial.Tests", "..\test\FunctionalTests\Microsoft.Spatial.Tests\Microsoft.Spatial.Tests.csproj", "{F40112C3-4150-41DB-BDF2-1C34FC9B49D6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Spatial.Tests", "..\test\UnitTests\Microsoft.Spatial.Tests\Microsoft.Spatial.Tests.csproj", "{F40112C3-4150-41DB-BDF2-1C34FC9B49D6}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "e2eTests", "e2eTests", "{57146ABA-0B08-4B0A-8D27-9A477FA0C2B5}"
 EndProject
@@ -31,7 +31,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Client.E2E.
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "helper", "helper", "{C2ADD565-E633-42A9-9956-9FF9FAF5E4B5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.TestCommon", "..\test\FunctionalTests\Microsoft.OData.TestCommon\Microsoft.OData.TestCommon.csproj", "{F9BF7E61-402B-4492-A4FE-F9549921741B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.TestCommon", "..\test\Common\Microsoft.OData.TestCommon\Microsoft.OData.TestCommon.csproj", "{F9BF7E61-402B-4492-A4FE-F9549921741B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Test.OData.DependencyInjection", "..\test\Common\Microsoft.Test.OData.DependencyInjection\Microsoft.Test.OData.DependencyInjection.csproj", "{AB1B80D6-EAE2-41C0-A089-7CD492E85FE9}"
 EndProject
diff --git a/sln/OData.Pipeline.sln b/sln/OData.Pipeline.sln
index 0334a0d351..c09e349169 100644
--- a/sln/OData.Pipeline.sln
+++ b/sln/OData.Pipeline.sln
@@ -17,17 +17,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{403A5A8E-A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "unitTests", "unitTests", "{13B04FEF-695B-4DAD-92EE-E1AB841617CD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Client.Tests", "..\test\FunctionalTests\Microsoft.OData.Client.Tests\Microsoft.OData.Client.Tests.csproj", "{D79B6243-EF18-4656-B18E-C577BCFAA7F1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Client.Tests", "..\test\UnitTests\Microsoft.OData.Client.Tests\Microsoft.OData.Client.Tests.csproj", "{D79B6243-EF18-4656-B18E-C577BCFAA7F1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Core.Tests", "..\test\FunctionalTests\Microsoft.OData.Core.Tests\Microsoft.OData.Core.Tests.csproj", "{C43FE103-6CCA-4B0D-865C-7EBA627752C9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Core.Tests", "..\test\UnitTests\Microsoft.OData.Core.Tests\Microsoft.OData.Core.Tests.csproj", "{C43FE103-6CCA-4B0D-865C-7EBA627752C9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Edm.Tests", "..\test\FunctionalTests\Microsoft.OData.Edm.Tests\Microsoft.OData.Edm.Tests.csproj", "{27E133C3-BDA1-45FF-B631-3BD446D1443D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Edm.Tests", "..\test\UnitTests\Microsoft.OData.Edm.Tests\Microsoft.OData.Edm.Tests.csproj", "{27E133C3-BDA1-45FF-B631-3BD446D1443D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Spatial.Tests", "..\test\FunctionalTests\Microsoft.Spatial.Tests\Microsoft.Spatial.Tests.csproj", "{59FC6BEB-B8E9-47E1-A3CA-B36572F2BE9B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Spatial.Tests", "..\test\UnitTests\Microsoft.Spatial.Tests\Microsoft.Spatial.Tests.csproj", "{59FC6BEB-B8E9-47E1-A3CA-B36572F2BE9B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "helper", "helper", "{69A333F6-82AC-4B53-951C-300A8340DE8B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.TestCommon", "..\test\FunctionalTests\Microsoft.OData.TestCommon\Microsoft.OData.TestCommon.csproj", "{A9CC879D-AF23-4505-B263-23BAC2B096C7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.TestCommon", "..\test\Common\Microsoft.OData.TestCommon\Microsoft.OData.TestCommon.csproj", "{A9CC879D-AF23-4505-B263-23BAC2B096C7}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Test.OData.DependencyInjection", "..\test\Common\Microsoft.Test.OData.DependencyInjection\Microsoft.Test.OData.DependencyInjection.csproj", "{91526796-57BB-44C0-B9EB-905F47F902AF}"
 EndProject
diff --git a/sln/OData.sln b/sln/OData.sln
index e4ac891d7d..d792650ed2 100644
--- a/sln/OData.sln
+++ b/sln/OData.sln
@@ -8,23 +8,23 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Spatial", "..\src
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Client", "..\src\Microsoft.OData.Client\Microsoft.OData.Client.csproj", "{D1567C63-4A0D-4E18-A14E-79699B9BFFFF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Client.Tests", "..\test\FunctionalTests\Microsoft.OData.Client.Tests\Microsoft.OData.Client.Tests.csproj", "{9F0AB290-8164-4885-BFCA-A6F87AB81740}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Client.Tests", "..\test\UnitTests\Microsoft.OData.Client.Tests\Microsoft.OData.Client.Tests.csproj", "{9F0AB290-8164-4885-BFCA-A6F87AB81740}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FDC11FD3-7DCD-4B75-8CC8-3BDC88107F01}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6D9CCEF3-6509-4381-B104-1A3FA576297F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Spatial.Tests", "..\test\FunctionalTests\Microsoft.Spatial.Tests\Microsoft.Spatial.Tests.csproj", "{933B0254-BE0B-459E-8B1A-97CC4A6A2CC6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Spatial.Tests", "..\test\UnitTests\Microsoft.Spatial.Tests\Microsoft.Spatial.Tests.csproj", "{933B0254-BE0B-459E-8B1A-97CC4A6A2CC6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Edm.Tests", "..\test\FunctionalTests\Microsoft.OData.Edm.Tests\Microsoft.OData.Edm.Tests.csproj", "{9760E330-020D-498C-ADBE-1FCE38D74125}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Edm.Tests", "..\test\UnitTests\Microsoft.OData.Edm.Tests\Microsoft.OData.Edm.Tests.csproj", "{9760E330-020D-498C-ADBE-1FCE38D74125}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Test.OData.DependencyInjection", "..\test\Common\Microsoft.Test.OData.DependencyInjection\Microsoft.Test.OData.DependencyInjection.csproj", "{9349A28B-90CE-4596-8A5B-333FCE08A51D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.TestCommon", "..\test\FunctionalTests\Microsoft.OData.TestCommon\Microsoft.OData.TestCommon.csproj", "{42A09462-804F-4A05-8585-EA61ADC28B31}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.TestCommon", "..\test\Common\Microsoft.OData.TestCommon\Microsoft.OData.TestCommon.csproj", "{42A09462-804F-4A05-8585-EA61ADC28B31}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Core", "..\src\Microsoft.OData.Core\Microsoft.OData.Core.csproj", "{05F1DE17-BD58-4745-9263-6667809AB9FD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Core.Tests", "..\test\FunctionalTests\Microsoft.OData.Core.Tests\Microsoft.OData.Core.Tests.csproj", "{E67E13D2-92D7-4AA9-AF2C-502AD0C76F1D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Core.Tests", "..\test\UnitTests\Microsoft.OData.Core.Tests\Microsoft.OData.Core.Tests.csproj", "{E67E13D2-92D7-4AA9-AF2C-502AD0C76F1D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/test/Build.Debug.props b/test/Build.Debug.props
index 10dbce237e..05a9c875ee 100644
--- a/test/Build.Debug.props
+++ b/test/Build.Debug.props
@@ -38,19 +38,19 @@
 
   <!--import Microsoft.OData.TestCommon because it contains the definition of the DebugAssertTraceListener that is referenced in the App.config transforms-->
   <ItemGroup>
-    <ProjectReference Include="$(EnlistmentRoot)\test\FunctionalTests\Microsoft.OData.TestCommon\Microsoft.OData.TestCommon.csproj" />
+    <ProjectReference Include="$(EnlistmentRoot)\test\Common\Microsoft.OData.TestCommon\Microsoft.OData.TestCommon.csproj" />
   </ItemGroup>
 
   <!--we need to import a "fake" usage of the Microsoft.OData.TestCommon project so that the test frameworks will automatically copy the binary to the test run folder-->
   <Choose>
     <When Condition="'$(MSBuildProjectExtension)' == '.csproj'">
       <ItemGroup>
-        <Compile Include="$(EnlistmentRoot)\test\FunctionalTests\Microsoft.OData.TestCommon\Fake.cs" Link="App_Config\Fake.cs" />
+        <Compile Include="$(EnlistmentRoot)\test\Common\Microsoft.OData.TestCommon\Fake.cs" Link="App_Config\Fake.cs" />
       </ItemGroup>
     </When>
     <When Condition="'$(MSBuildProjectExtension)' == '.vbproj'">
       <ItemGroup>
-        <Compile Include="$(EnlistmentRoot)\test\FunctionalTests\Microsoft.OData.TestCommon\Fake.vb" Link="App_Config\Fake.vb" />
+        <Compile Include="$(EnlistmentRoot)\test\Common\Microsoft.OData.TestCommon\Fake.vb" Link="App_Config\Fake.vb" />
       </ItemGroup>
     </When>
     <Otherwise>
diff --git a/test/FunctionalTests/Microsoft.OData.TestCommon/DebugAssertTraceListener.cs b/test/Common/Microsoft.OData.TestCommon/DebugAssertTraceListener.cs
similarity index 94%
rename from test/FunctionalTests/Microsoft.OData.TestCommon/DebugAssertTraceListener.cs
rename to test/Common/Microsoft.OData.TestCommon/DebugAssertTraceListener.cs
index 30701c13ac..a6366978a2 100644
--- a/test/FunctionalTests/Microsoft.OData.TestCommon/DebugAssertTraceListener.cs
+++ b/test/Common/Microsoft.OData.TestCommon/DebugAssertTraceListener.cs
@@ -61,6 +61,7 @@ public DebugAssertException(string message, Exception innerException) : base(mes
             {
             }
 
+#if false  // Exception.Exception is obsolete. So, let's templately scope this constrct out and delete it in the next major.
             /// <summary>
             /// Initializes a new instance of the <see cref="DebugAssertException"/> class.
             /// </summary>
@@ -77,6 +78,7 @@ public DebugAssertException(string message, Exception innerException) : base(mes
             public DebugAssertException(SerializationInfo info, StreamingContext context) : base(info, context)
             {
             }
+#endif
         }
     }
 }
diff --git a/test/FunctionalTests/Microsoft.OData.TestCommon/Fake.cs b/test/Common/Microsoft.OData.TestCommon/Fake.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.TestCommon/Fake.cs
rename to test/Common/Microsoft.OData.TestCommon/Fake.cs
diff --git a/test/FunctionalTests/Microsoft.OData.TestCommon/Fake.vb b/test/Common/Microsoft.OData.TestCommon/Fake.vb
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.TestCommon/Fake.vb
rename to test/Common/Microsoft.OData.TestCommon/Fake.vb
diff --git a/test/FunctionalTests/Microsoft.OData.TestCommon/Microsoft.OData.TestCommon.csproj b/test/Common/Microsoft.OData.TestCommon/Microsoft.OData.TestCommon.csproj
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.TestCommon/Microsoft.OData.TestCommon.csproj
rename to test/Common/Microsoft.OData.TestCommon/Microsoft.OData.TestCommon.csproj
diff --git a/test/FunctionalTests/Microsoft.OData.TestCommon/Properties/AssemblyInfo.cs b/test/Common/Microsoft.OData.TestCommon/Properties/AssemblyInfo.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.TestCommon/Properties/AssemblyInfo.cs
rename to test/Common/Microsoft.OData.TestCommon/Properties/AssemblyInfo.cs
diff --git a/test/FunctionalTests/Microsoft.OData.TestCommon/TestHttpClientFactory.cs b/test/Common/Microsoft.OData.TestCommon/TestHttpClientFactory.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.TestCommon/TestHttpClientFactory.cs
rename to test/Common/Microsoft.OData.TestCommon/TestHttpClientFactory.cs
diff --git a/test/Common/Microsoft.Test.OData.DependencyInjection/Microsoft.Test.OData.DependencyInjection.csproj b/test/Common/Microsoft.Test.OData.DependencyInjection/Microsoft.Test.OData.DependencyInjection.csproj
index 7fe1e22d22..ec05f1eba2 100644
--- a/test/Common/Microsoft.Test.OData.DependencyInjection/Microsoft.Test.OData.DependencyInjection.csproj
+++ b/test/Common/Microsoft.Test.OData.DependencyInjection/Microsoft.Test.OData.DependencyInjection.csproj
@@ -19,7 +19,7 @@
   <Choose>
     <When Condition=" '$(TestType)'=='Private' ">
       <ItemGroup>
-        <ProjectReference Include="$(EnlistmentRoot)\src\Microsoft.OData.Core\Microsoft.OData.Core.csproj" />                  
+        <ProjectReference Include="$(EnlistmentRoot)\src\Microsoft.OData.Core\Microsoft.OData.Core.csproj" />
       </ItemGroup>
     </When>
   </Choose>
diff --git a/test/UnitTests/Build.props b/test/UnitTests/Build.props
new file mode 100644
index 0000000000..f55c9b68c4
--- /dev/null
+++ b/test/UnitTests/Build.props
@@ -0,0 +1,14 @@
+<Project >
+
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
+
+  <!-- 
+    This is where you place settings that should apply to all projects under this folder.  See 
+    $(EnlistmentRoot)\Build.props for examples. 
+  -->
+
+  <Import Project="..\Build.props" />
+
+</Project>
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/ALinq/AddNewEndingTokenVisitorTests.cs b/test/UnitTests/Microsoft.OData.Client.Tests/ALinq/AddNewEndingTokenVisitorTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/ALinq/AddNewEndingTokenVisitorTests.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/ALinq/AddNewEndingTokenVisitorTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/ALinq/CountDistinctTests.cs b/test/UnitTests/Microsoft.OData.Client.Tests/ALinq/CountDistinctTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/ALinq/CountDistinctTests.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/ALinq/CountDistinctTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/ALinq/DollarApplyAggregateTests.cs b/test/UnitTests/Microsoft.OData.Client.Tests/ALinq/DollarApplyAggregateTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/ALinq/DollarApplyAggregateTests.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/ALinq/DollarApplyAggregateTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/ALinq/DollarApplyGroupByTests.cs b/test/UnitTests/Microsoft.OData.Client.Tests/ALinq/DollarApplyGroupByTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/ALinq/DollarApplyGroupByTests.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/ALinq/DollarApplyGroupByTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/ALinq/DollarApplyTestsBase.cs b/test/UnitTests/Microsoft.OData.Client.Tests/ALinq/DollarApplyTestsBase.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/ALinq/DollarApplyTestsBase.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/ALinq/DollarApplyTestsBase.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/ALinq/DollarFilterWithCastTests.cs b/test/UnitTests/Microsoft.OData.Client.Tests/ALinq/DollarFilterWithCastTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/ALinq/DollarFilterWithCastTests.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/ALinq/DollarFilterWithCastTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/ALinq/PreserveTypesAndAttributesTests.cs b/test/UnitTests/Microsoft.OData.Client.Tests/ALinq/PreserveTypesAndAttributesTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/ALinq/PreserveTypesAndAttributesTests.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/ALinq/PreserveTypesAndAttributesTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/ALinq/ProjectionTests.cs b/test/UnitTests/Microsoft.OData.Client.Tests/ALinq/ProjectionTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/ALinq/ProjectionTests.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/ALinq/ProjectionTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/ALinq/RemoveWildcardVisitorTests.cs b/test/UnitTests/Microsoft.OData.Client.Tests/ALinq/RemoveWildcardVisitorTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/ALinq/RemoveWildcardVisitorTests.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/ALinq/RemoveWildcardVisitorTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/ALinq/SelectExpandPathBuilderTests.cs b/test/UnitTests/Microsoft.OData.Client.Tests/ALinq/SelectExpandPathBuilderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/ALinq/SelectExpandPathBuilderTests.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/ALinq/SelectExpandPathBuilderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/ALinq/SelectExpandPathToStringVisitorTests.cs b/test/UnitTests/Microsoft.OData.Client.Tests/ALinq/SelectExpandPathToStringVisitorTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/ALinq/SelectExpandPathToStringVisitorTests.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/ALinq/SelectExpandPathToStringVisitorTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/ALinq/SequenceMethodsTests.cs b/test/UnitTests/Microsoft.OData.Client.Tests/ALinq/SequenceMethodsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/ALinq/SequenceMethodsTests.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/ALinq/SequenceMethodsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/ClientEdmModelTests.cs b/test/UnitTests/Microsoft.OData.Client.Tests/ClientEdmModelTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/ClientEdmModelTests.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/ClientEdmModelTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/ComplexNavigations/ComplexNavigationTests.cs b/test/UnitTests/Microsoft.OData.Client.Tests/ComplexNavigations/ComplexNavigationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/ComplexNavigations/ComplexNavigationTests.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/ComplexNavigations/ComplexNavigationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/Data/UntypedCollection/DirectoryInternalSchema_Version27.cs b/test/UnitTests/Microsoft.OData.Client.Tests/Data/UntypedCollection/DirectoryInternalSchema_Version27.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/Data/UntypedCollection/DirectoryInternalSchema_Version27.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/Data/UntypedCollection/DirectoryInternalSchema_Version27.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/Data/UntypedCollection/failedresponse.json b/test/UnitTests/Microsoft.OData.Client.Tests/Data/UntypedCollection/failedresponse.json
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/Data/UntypedCollection/failedresponse.json
rename to test/UnitTests/Microsoft.OData.Client.Tests/Data/UntypedCollection/failedresponse.json
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/Data/UntypedCollection/version27.xml b/test/UnitTests/Microsoft.OData.Client.Tests/Data/UntypedCollection/version27.xml
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/Data/UntypedCollection/version27.xml
rename to test/UnitTests/Microsoft.OData.Client.Tests/Data/UntypedCollection/version27.xml
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/DataServiceContextHttpClientHandlerProviderTests.cs b/test/UnitTests/Microsoft.OData.Client.Tests/DataServiceContextHttpClientHandlerProviderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/DataServiceContextHttpClientHandlerProviderTests.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/DataServiceContextHttpClientHandlerProviderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/DataServiceContextTests.cs b/test/UnitTests/Microsoft.OData.Client.Tests/DataServiceContextTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/DataServiceContextTests.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/DataServiceContextTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/DataServiceQueryProviderTests.cs b/test/UnitTests/Microsoft.OData.Client.Tests/DataServiceQueryProviderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/DataServiceQueryProviderTests.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/DataServiceQueryProviderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/Metadata/ClientTypeUtilTests.cs b/test/UnitTests/Microsoft.OData.Client.Tests/Metadata/ClientTypeUtilTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/Metadata/ClientTypeUtilTests.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/Metadata/ClientTypeUtilTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/Microsoft.OData.Client.Tests.Netcore.csproj b/test/UnitTests/Microsoft.OData.Client.Tests/Microsoft.OData.Client.Tests.Netcore.csproj
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/Microsoft.OData.Client.Tests.Netcore.csproj
rename to test/UnitTests/Microsoft.OData.Client.Tests/Microsoft.OData.Client.Tests.Netcore.csproj
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/Microsoft.OData.Client.Tests.csproj b/test/UnitTests/Microsoft.OData.Client.Tests/Microsoft.OData.Client.Tests.csproj
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/Microsoft.OData.Client.Tests.csproj
rename to test/UnitTests/Microsoft.OData.Client.Tests/Microsoft.OData.Client.Tests.csproj
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/ODataMessageConcreteTypePreferHeaderTests.cs b/test/UnitTests/Microsoft.OData.Client.Tests/ODataMessageConcreteTypePreferHeaderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/ODataMessageConcreteTypePreferHeaderTests.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/ODataMessageConcreteTypePreferHeaderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/ODataPathTests.cs b/test/UnitTests/Microsoft.OData.Client.Tests/ODataPathTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/ODataPathTests.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/ODataPathTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/Properties/AssemblyInfo.cs b/test/UnitTests/Microsoft.OData.Client.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/Properties/AssemblyInfo.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/Properties/AssemblyInfo.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/Serialization/HttpClientRequestMessageTests.cs b/test/UnitTests/Microsoft.OData.Client.Tests/Serialization/HttpClientRequestMessageTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/Serialization/HttpClientRequestMessageTests.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/Serialization/HttpClientRequestMessageTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/Serialization/MockDelayedHttpClientHandler.cs b/test/UnitTests/Microsoft.OData.Client.Tests/Serialization/MockDelayedHttpClientHandler.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/Serialization/MockDelayedHttpClientHandler.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/Serialization/MockDelayedHttpClientHandler.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/Serialization/MockHttpClientFactory.cs b/test/UnitTests/Microsoft.OData.Client.Tests/Serialization/MockHttpClientFactory.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/Serialization/MockHttpClientFactory.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/Serialization/MockHttpClientFactory.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/Serialization/MockHttpClientHandler.cs b/test/UnitTests/Microsoft.OData.Client.Tests/Serialization/MockHttpClientHandler.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/Serialization/MockHttpClientHandler.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/Serialization/MockHttpClientHandler.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/Serialization/MockUnresponsiveHttpClientHandler.cs b/test/UnitTests/Microsoft.OData.Client.Tests/Serialization/MockUnresponsiveHttpClientHandler.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/Serialization/MockUnresponsiveHttpClientHandler.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/Serialization/MockUnresponsiveHttpClientHandler.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/TestHttpWebRequestMessage.cs b/test/UnitTests/Microsoft.OData.Client.Tests/TestHttpWebRequestMessage.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/TestHttpWebRequestMessage.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/TestHttpWebRequestMessage.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/Tracking/ClientEntityTrackerTests.cs b/test/UnitTests/Microsoft.OData.Client.Tests/Tracking/ClientEntityTrackerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/Tracking/ClientEntityTrackerTests.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/Tracking/ClientEntityTrackerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/Tracking/DataServiceContextNoTrackingStreamsTests.cs b/test/UnitTests/Microsoft.OData.Client.Tests/Tracking/DataServiceContextNoTrackingStreamsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/Tracking/DataServiceContextNoTrackingStreamsTests.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/Tracking/DataServiceContextNoTrackingStreamsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Client.Tests/Tracking/DataServiceContextQueryTests.cs b/test/UnitTests/Microsoft.OData.Client.Tests/Tracking/DataServiceContextQueryTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Client.Tests/Tracking/DataServiceContextQueryTests.cs
rename to test/UnitTests/Microsoft.OData.Client.Tests/Tracking/DataServiceContextQueryTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/AnnotationFilterPatternTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/AnnotationFilterPatternTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/AnnotationFilterPatternTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/AnnotationFilterPatternTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/AnnotationFilterTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/AnnotationFilterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/AnnotationFilterTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/AnnotationFilterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ArgumentValidationUtils.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ArgumentValidationUtils.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ArgumentValidationUtils.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ArgumentValidationUtils.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/AssertExtensions.cs b/test/UnitTests/Microsoft.OData.Core.Tests/AssertExtensions.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/AssertExtensions.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/AssertExtensions.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/AsyncStream.cs b/test/UnitTests/Microsoft.OData.Core.Tests/AsyncStream.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/AsyncStream.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/AsyncStream.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/AsyncYieldStream.cs b/test/UnitTests/Microsoft.OData.Core.Tests/AsyncYieldStream.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/AsyncYieldStream.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/AsyncYieldStream.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/BufferUtilsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/BufferUtilsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/BufferUtilsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/BufferUtilsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/DummyRequestMessage.cs b/test/UnitTests/Microsoft.OData.Core.Tests/DummyRequestMessage.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/DummyRequestMessage.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/DummyRequestMessage.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/DuplicatePropertyNamesCheckerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/DuplicatePropertyNamesCheckerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/DuplicatePropertyNamesCheckerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/DuplicatePropertyNamesCheckerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/EdmStructuredValueSimulator.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/EdmStructuredValueSimulator.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/EdmStructuredValueSimulator.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/EdmStructuredValueSimulator.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/NoOpResourceMetadataBuilderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/NoOpResourceMetadataBuilderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/NoOpResourceMetadataBuilderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/NoOpResourceMetadataBuilderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/NullEntityMetadataBuilderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/NullEntityMetadataBuilderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/NullEntityMetadataBuilderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/NullEntityMetadataBuilderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/ODataConventionalEntityMetadataBuilderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/ODataConventionalEntityMetadataBuilderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/ODataConventionalEntityMetadataBuilderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/ODataConventionalEntityMetadataBuilderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/ODataConventionalUriBuilderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/ODataConventionalUriBuilderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/ODataConventionalUriBuilderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/ODataConventionalUriBuilderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/ODataEntityMetadataBuilderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/ODataEntityMetadataBuilderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/ODataEntityMetadataBuilderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/ODataEntityMetadataBuilderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/ODataEntityMetadataBuilderTestsUtils.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/ODataEntityMetadataBuilderTestsUtils.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/ODataEntityMetadataBuilderTestsUtils.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/ODataEntityMetadataBuilderTestsUtils.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/ODataEntryMetadataContextTest.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/ODataEntryMetadataContextTest.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/ODataEntryMetadataContextTest.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/ODataEntryMetadataContextTest.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/ODataMetadataContextTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/ODataMetadataContextTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/ODataMetadataContextTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/ODataMetadataContextTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/ODataMetadataSelectorTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/ODataMetadataSelectorTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/ODataMetadataSelectorTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/ODataMetadataSelectorTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/ODataMissingOperationGeneratorTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/ODataMissingOperationGeneratorTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/ODataMissingOperationGeneratorTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/ODataMissingOperationGeneratorTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/ODataUriBuilderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/ODataUriBuilderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/ODataUriBuilderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/ODataUriBuilderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/ODataUriBuilderTestsBase.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/ODataUriBuilderTestsBase.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/ODataUriBuilderTestsBase.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/ODataUriBuilderTestsBase.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/TestMetadataSelector.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/TestMetadataSelector.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/TestMetadataSelector.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/TestMetadataSelector.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/TestModel.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/TestModel.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Evaluation/TestModel.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Evaluation/TestModel.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/GeographyTypeConverterTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/GeographyTypeConverterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/GeographyTypeConverterTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/GeographyTypeConverterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/HttpHeaderValueElementTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/HttpHeaderValueElementTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/HttpHeaderValueElementTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/HttpHeaderValueElementTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/HttpHeaderValueLexerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/HttpHeaderValueLexerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/HttpHeaderValueLexerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/HttpHeaderValueLexerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/HttpHeaderValueTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/HttpHeaderValueTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/HttpHeaderValueTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/HttpHeaderValueTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/HttpUtilsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/HttpUtilsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/HttpUtilsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/HttpUtilsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/InMemoryMessage.cs b/test/UnitTests/Microsoft.OData.Core.Tests/InMemoryMessage.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/InMemoryMessage.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/InMemoryMessage.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/InstanceAnnotationWriteTrackerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/InstanceAnnotationWriteTrackerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/InstanceAnnotationWriteTrackerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/InstanceAnnotationWriteTrackerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Evaluation/AutoComputeETagInJsonIntegrationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Evaluation/AutoComputeETagInJsonIntegrationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Evaluation/AutoComputeETagInJsonIntegrationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Evaluation/AutoComputeETagInJsonIntegrationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Evaluation/AutoComputePayloadMetadataInJsonIntegrationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Evaluation/AutoComputePayloadMetadataInJsonIntegrationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Evaluation/AutoComputePayloadMetadataInJsonIntegrationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Evaluation/AutoComputePayloadMetadataInJsonIntegrationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Evaluation/KeyAsSegmentTemplateIntegrationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Evaluation/KeyAsSegmentTemplateIntegrationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Evaluation/KeyAsSegmentTemplateIntegrationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Evaluation/KeyAsSegmentTemplateIntegrationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Reader/Json/FeedAnnotationIntegrationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Reader/Json/FeedAnnotationIntegrationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Reader/Json/FeedAnnotationIntegrationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Reader/Json/FeedAnnotationIntegrationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Reader/Json/InstanceAnnotationsReaderIntegrationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Reader/Json/InstanceAnnotationsReaderIntegrationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Reader/Json/InstanceAnnotationsReaderIntegrationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Reader/Json/InstanceAnnotationsReaderIntegrationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Reader/Json/ODataJsonReaderEnumIntegrationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Reader/Json/ODataJsonReaderEnumIntegrationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Reader/Json/ODataJsonReaderEnumIntegrationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Reader/Json/ODataJsonReaderEnumIntegrationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Reader/Json/ODataJsonReaderIntegrationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Reader/Json/ODataJsonReaderIntegrationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Reader/Json/ODataJsonReaderIntegrationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Reader/Json/ODataJsonReaderIntegrationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Reader/Json/PropertyAndValueJsonReaderIntegrationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Reader/Json/PropertyAndValueJsonReaderIntegrationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Reader/Json/PropertyAndValueJsonReaderIntegrationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Reader/Json/PropertyAndValueJsonReaderIntegrationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Reader/Json/UriParameterReaderIntegrationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Reader/Json/UriParameterReaderIntegrationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Reader/Json/UriParameterReaderIntegrationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Reader/Json/UriParameterReaderIntegrationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/DeltaLinkWriterIntegrationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/DeltaLinkWriterIntegrationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/DeltaLinkWriterIntegrationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/DeltaLinkWriterIntegrationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/InstanceAnnotationWriterIntegrationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/InstanceAnnotationWriterIntegrationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/InstanceAnnotationWriterIntegrationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/InstanceAnnotationWriterIntegrationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/DeltaLinkJsonWriterIntegrationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/DeltaLinkJsonWriterIntegrationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/DeltaLinkJsonWriterIntegrationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/DeltaLinkJsonWriterIntegrationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/ODataJsonWriterComplexIntegrationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/ODataJsonWriterComplexIntegrationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/ODataJsonWriterComplexIntegrationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/ODataJsonWriterComplexIntegrationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/ODataJsonWriterEnumIntegrationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/ODataJsonWriterEnumIntegrationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/ODataJsonWriterEnumIntegrationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/ODataJsonWriterEnumIntegrationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/ODataJsonWriterIntegrationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/ODataJsonWriterIntegrationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/ODataJsonWriterIntegrationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/ODataJsonWriterIntegrationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/ODataJsonWriterShortSpanIntegrationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/ODataJsonWriterShortSpanIntegrationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/ODataJsonWriterShortSpanIntegrationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/ODataJsonWriterShortSpanIntegrationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/PropertyAndValueJsonWriterIntegrationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/PropertyAndValueJsonWriterIntegrationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/PropertyAndValueJsonWriterIntegrationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/PropertyAndValueJsonWriterIntegrationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/UriParameterWriterIntegrationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/UriParameterWriterIntegrationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/UriParameterWriterIntegrationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/IntegrationTests/Writer/Json/UriParameterWriterIntegrationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/BitStackTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/BitStackTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/BitStackTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/BitStackTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/BufferingJsonReaderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/BufferingJsonReaderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/BufferingJsonReaderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/BufferingJsonReaderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/GenerateContextUrlFromSlimUriWithDerivedTypeCastAndKeySegment.xml b/test/UnitTests/Microsoft.OData.Core.Tests/Json/GenerateContextUrlFromSlimUriWithDerivedTypeCastAndKeySegment.xml
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/GenerateContextUrlFromSlimUriWithDerivedTypeCastAndKeySegment.xml
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/GenerateContextUrlFromSlimUriWithDerivedTypeCastAndKeySegment.xml
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonFullMetadataLevelTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonFullMetadataLevelTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonFullMetadataLevelTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonFullMetadataLevelTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonFullMetadataTypeNameOracleTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonFullMetadataTypeNameOracleTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonFullMetadataTypeNameOracleTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonFullMetadataTypeNameOracleTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonInstanceAnnotationWriterAsyncTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonInstanceAnnotationWriterAsyncTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonInstanceAnnotationWriterAsyncTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonInstanceAnnotationWriterAsyncTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonInstanceAnnotationWriterTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonInstanceAnnotationWriterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonInstanceAnnotationWriterTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonInstanceAnnotationWriterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonMetadataLevelTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonMetadataLevelTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonMetadataLevelTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonMetadataLevelTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonMinimalMetadataLevelTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonMinimalMetadataLevelTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonMinimalMetadataLevelTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonMinimalMetadataLevelTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonMinimalMetadataTypeNameOracleTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonMinimalMetadataTypeNameOracleTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonMinimalMetadataTypeNameOracleTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonMinimalMetadataTypeNameOracleTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonNoMetadataLevelTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonNoMetadataLevelTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonNoMetadataLevelTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonNoMetadataLevelTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonNoMetadataTypeNameOracleTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonNoMetadataTypeNameOracleTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonNoMetadataTypeNameOracleTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonNoMetadataTypeNameOracleTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonODataAnnotationWriterTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonODataAnnotationWriterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonODataAnnotationWriterTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonODataAnnotationWriterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonReaderAssertions.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonReaderAssertions.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonReaderAssertions.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonReaderAssertions.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonReaderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonReaderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonReaderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonReaderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonReaderUtils.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonReaderUtils.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonReaderUtils.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonReaderUtils.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonUtils.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonUtils.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonUtils.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonUtils.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonValueUtilsAsyncTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonValueUtilsAsyncTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonValueUtilsAsyncTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonValueUtilsAsyncTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonValueUtilsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonValueUtilsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonValueUtilsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonValueUtilsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonWriterAsyncBaseTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonWriterAsyncBaseTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonWriterAsyncBaseTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonWriterAsyncBaseTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonWriterAsyncTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonWriterAsyncTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonWriterAsyncTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonWriterAsyncTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonWriterBaseTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonWriterBaseTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonWriterBaseTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonWriterBaseTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonWriterTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonWriterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/JsonWriterTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/JsonWriterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/MockCharArrayPool.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/MockCharArrayPool.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/MockCharArrayPool.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/MockCharArrayPool.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/MockJsonValueSerializer.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/MockJsonValueSerializer.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/MockJsonValueSerializer.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/MockJsonValueSerializer.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/MockJsonWriter.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/MockJsonWriter.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/MockJsonWriter.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/MockJsonWriter.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/MockJsonWriterFactory.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/MockJsonWriterFactory.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/MockJsonWriterFactory.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/MockJsonWriterFactory.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/MockJsonWriterFactoryWrapper.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/MockJsonWriterFactoryWrapper.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/MockJsonWriterFactoryWrapper.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/MockJsonWriterFactoryWrapper.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/NonIndentedTextWriterAsyncTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/NonIndentedTextWriterAsyncTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/NonIndentedTextWriterAsyncTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/NonIndentedTextWriterAsyncTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/NonIndentedTextWriterTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/NonIndentedTextWriterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/NonIndentedTextWriterTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/NonIndentedTextWriterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataAnnotationNamesTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataAnnotationNamesTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataAnnotationNamesTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataAnnotationNamesTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataBinaryStreamWriterTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataBinaryStreamWriterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataBinaryStreamWriterTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataBinaryStreamWriterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonBatchReaderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonBatchReaderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonBatchReaderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonBatchReaderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonBatchWriterTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonBatchWriterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonBatchWriterTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonBatchWriterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonCollectionDeserializerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonCollectionDeserializerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonCollectionDeserializerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonCollectionDeserializerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonCollectionReaderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonCollectionReaderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonCollectionReaderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonCollectionReaderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonCollectionSerializerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonCollectionSerializerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonCollectionSerializerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonCollectionSerializerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonCollectionWriterTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonCollectionWriterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonCollectionWriterTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonCollectionWriterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonContextUriParserTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonContextUriParserTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonContextUriParserTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonContextUriParserTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonDeltaReaderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonDeltaReaderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonDeltaReaderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonDeltaReaderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonDeltaWriterTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonDeltaWriterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonDeltaWriterTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonDeltaWriterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonDeserializerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonDeserializerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonDeserializerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonDeserializerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonEntityReferenceLinkSerializerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonEntityReferenceLinkSerializerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonEntityReferenceLinkSerializerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonEntityReferenceLinkSerializerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonEntryAndFeedDeserializerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonEntryAndFeedDeserializerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonEntryAndFeedDeserializerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonEntryAndFeedDeserializerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonEntryAndFeedDeserializerUndeclaredAnnotationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonEntryAndFeedDeserializerUndeclaredAnnotationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonEntryAndFeedDeserializerUndeclaredAnnotationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonEntryAndFeedDeserializerUndeclaredAnnotationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonEntryAndFeedDeserializerUndeclaredTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonEntryAndFeedDeserializerUndeclaredTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonEntryAndFeedDeserializerUndeclaredTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonEntryAndFeedDeserializerUndeclaredTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonEntryAndFeedSerializerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonEntryAndFeedSerializerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonEntryAndFeedSerializerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonEntryAndFeedSerializerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonEntryAndFeedSerializerUndecalredTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonEntryAndFeedSerializerUndecalredTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonEntryAndFeedSerializerUndecalredTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonEntryAndFeedSerializerUndecalredTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonErrorDeserializerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonErrorDeserializerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonErrorDeserializerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonErrorDeserializerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonOutputContextApiTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonOutputContextApiTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonOutputContextApiTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonOutputContextApiTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonOutputContextTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonOutputContextTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonOutputContextTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonOutputContextTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonParameterDeserializerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonParameterDeserializerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonParameterDeserializerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonParameterDeserializerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonParameterReaderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonParameterReaderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonParameterReaderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonParameterReaderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonParameterWriterTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonParameterWriterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonParameterWriterTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonParameterWriterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonPayloadKindDetectionDeserializerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonPayloadKindDetectionDeserializerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonPayloadKindDetectionDeserializerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonPayloadKindDetectionDeserializerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonPropertySerializerAsyncTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonPropertySerializerAsyncTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonPropertySerializerAsyncTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonPropertySerializerAsyncTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonPropertySerializerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonPropertySerializerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonPropertySerializerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonPropertySerializerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonReaderCoreUtilsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonReaderCoreUtilsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonReaderCoreUtilsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonReaderCoreUtilsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonReaderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonReaderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonReaderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonReaderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonReaderUtilsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonReaderUtilsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonReaderUtilsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonReaderUtilsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonResourceDeserializerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonResourceDeserializerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonResourceDeserializerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonResourceDeserializerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonResourceSerializerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonResourceSerializerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonResourceSerializerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonResourceSerializerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonSerializerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonSerializerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonSerializerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonSerializerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonServiceDocumentDeserializerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonServiceDocumentDeserializerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonServiceDocumentDeserializerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonServiceDocumentDeserializerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonServiceDocumentSerializerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonServiceDocumentSerializerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonServiceDocumentSerializerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonServiceDocumentSerializerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonTextWriterAsyncTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonTextWriterAsyncTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonTextWriterAsyncTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonTextWriterAsyncTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonUtilsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonUtilsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonUtilsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonUtilsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonValidationUtilsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonValidationUtilsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonValidationUtilsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonValidationUtilsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonValueSerializerAsyncTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonValueSerializerAsyncTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonValueSerializerAsyncTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonValueSerializerAsyncTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonValueSerializerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonValueSerializerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonValueSerializerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonValueSerializerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonWriterCoreUtilsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonWriterCoreUtilsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonWriterCoreUtilsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonWriterCoreUtilsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonWriterTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonWriterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonWriterTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonWriterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonWriterUtilsAsyncTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonWriterUtilsAsyncTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonWriterUtilsAsyncTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonWriterUtilsAsyncTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonWriterUtilsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonWriterUtilsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataJsonWriterUtilsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataJsonWriterUtilsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataUtf8JsonTextWriterTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataUtf8JsonTextWriterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataUtf8JsonTextWriterTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataUtf8JsonTextWriterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataUtf8JsonWriterAsyncTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataUtf8JsonWriterAsyncTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataUtf8JsonWriterAsyncTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataUtf8JsonWriterAsyncTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataUtf8JsonWriterFactoryAsyncTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataUtf8JsonWriterFactoryAsyncTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataUtf8JsonWriterFactoryAsyncTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataUtf8JsonWriterFactoryAsyncTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataUtf8JsonWriterFactoryTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataUtf8JsonWriterFactoryTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataUtf8JsonWriterFactoryTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataUtf8JsonWriterFactoryTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataUtf8JsonWriterStreamTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataUtf8JsonWriterStreamTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataUtf8JsonWriterStreamTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataUtf8JsonWriterStreamTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataUtf8JsonWriterTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataUtf8JsonWriterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ODataUtf8JsonWriterTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ODataUtf8JsonWriterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/PayloadValueConverters.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/PayloadValueConverters.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/PayloadValueConverters.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/PayloadValueConverters.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/PooledByteBufferWriterTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/PooledByteBufferWriterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/PooledByteBufferWriterTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/PooledByteBufferWriterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ReorderingJsonReaderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/ReorderingJsonReaderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/ReorderingJsonReaderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/ReorderingJsonReaderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/TestEntityMetadataBuilder.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/TestEntityMetadataBuilder.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/TestEntityMetadataBuilder.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/TestEntityMetadataBuilder.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/TestODataJsonWriterResourceState.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/TestODataJsonWriterResourceState.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/TestODataJsonWriterResourceState.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/TestODataJsonWriterResourceState.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/TestODataResourceMetadataBuilder.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/TestODataResourceMetadataBuilder.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/TestODataResourceMetadataBuilder.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/TestODataResourceMetadataBuilder.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/TranscodingWriteStreamTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Json/TranscodingWriteStreamTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/TranscodingWriteStreamTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/TranscodingWriteStreamTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Json/WriteContextWithDerivedTypeCastAndKeySegmentAsync.xml b/test/UnitTests/Microsoft.OData.Core.Tests/Json/WriteContextWithDerivedTypeCastAndKeySegmentAsync.xml
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Json/WriteContextWithDerivedTypeCastAndKeySegmentAsync.xml
rename to test/UnitTests/Microsoft.OData.Core.Tests/Json/WriteContextWithDerivedTypeCastAndKeySegmentAsync.xml
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/MediaTypeUtilsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/MediaTypeUtilsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/MediaTypeUtilsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/MediaTypeUtilsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/MessageWriterConcurrencyTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/MessageWriterConcurrencyTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/MessageWriterConcurrencyTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/MessageWriterConcurrencyTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Metadata/EdmLibraryExtensionsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Metadata/EdmLibraryExtensionsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Metadata/EdmLibraryExtensionsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Metadata/EdmLibraryExtensionsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Metadata/MetadataUtilsCommonTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Metadata/MetadataUtilsCommonTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Metadata/MetadataUtilsCommonTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Metadata/MetadataUtilsCommonTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Metadata/MetadataUtilsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Metadata/MetadataUtilsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Metadata/MetadataUtilsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Metadata/MetadataUtilsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Microsoft.OData.Core.Tests.NetCore.csproj b/test/UnitTests/Microsoft.OData.Core.Tests/Microsoft.OData.Core.Tests.NetCore.csproj
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Microsoft.OData.Core.Tests.NetCore.csproj
rename to test/UnitTests/Microsoft.OData.Core.Tests/Microsoft.OData.Core.Tests.NetCore.csproj
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Microsoft.OData.Core.Tests.csproj b/test/UnitTests/Microsoft.OData.Core.Tests/Microsoft.OData.Core.Tests.csproj
similarity index 70%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Microsoft.OData.Core.Tests.csproj
rename to test/UnitTests/Microsoft.OData.Core.Tests/Microsoft.OData.Core.Tests.csproj
index 2a209b5d66..bb04726c3b 100644
--- a/test/FunctionalTests/Microsoft.OData.Core.Tests/Microsoft.OData.Core.Tests.csproj
+++ b/test/UnitTests/Microsoft.OData.Core.Tests/Microsoft.OData.Core.Tests.csproj
@@ -51,13 +51,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\Common\ExceptionUtilities.cs" Link="ExceptionUtilities.cs" />
-    <Compile Include="..\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\Metadata\EdmConstants.cs" Link="EdmConstants.cs" />
-    <Compile Include="..\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\Metadata\EdmToStockModelConverter.cs" Link="EdmToStockModelConverter.cs" />
-    <Compile Include="..\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\Metadata\MetadataExtensionMethods.cs" Link="MetadataExtensionMethods.cs" />
-    <Compile Include="..\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\Metadata\MetadataUtils.cs" Link="MetadataUtils.cs" />
-    <Compile Include="..\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\Metadata\TestModels.cs" Link="TestModels.cs" />
-    <Compile Include="..\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\ODataLibTest\ModelBuilder.cs" Link="ModelBuilder.cs" />
+    <Compile Include="..\..\FunctionalTests\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\Common\ExceptionUtilities.cs" Link="ExceptionUtilities.cs" />
+    <Compile Include="..\..\FunctionalTests\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\Metadata\EdmConstants.cs" Link="EdmConstants.cs" />
+    <Compile Include="..\..\FunctionalTests\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\Metadata\EdmToStockModelConverter.cs" Link="EdmToStockModelConverter.cs" />
+    <Compile Include="..\..\FunctionalTests\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\Metadata\MetadataExtensionMethods.cs" Link="MetadataExtensionMethods.cs" />
+    <Compile Include="..\..\FunctionalTests\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\Metadata\MetadataUtils.cs" Link="MetadataUtils.cs" />
+    <Compile Include="..\..\FunctionalTests\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\Metadata\TestModels.cs" Link="TestModels.cs" />
+    <Compile Include="..\..\FunctionalTests\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\ODataLibTest\ModelBuilder.cs" Link="ModelBuilder.cs" />
   </ItemGroup>
 
   <ItemGroup>
@@ -70,7 +70,7 @@
     <ProjectReference Include="..\..\..\src\Microsoft.OData.Edm\Microsoft.OData.Edm.csproj" />
     <ProjectReference Include="..\..\..\src\Microsoft.Spatial\Microsoft.Spatial.csproj" />
     <ProjectReference Include="..\..\Common\Microsoft.Test.OData.DependencyInjection\Microsoft.Test.OData.DependencyInjection.csproj" />
-    <ProjectReference Include="..\Microsoft.OData.TestCommon\Microsoft.OData.TestCommon.csproj" />
+    <ProjectReference Include="..\..\Common\Microsoft.OData.TestCommon\Microsoft.OData.TestCommon.csproj" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(TargetFramework)' == 'net48'">
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/MultiBindingTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/MultiBindingTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/MultiBindingTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/MultiBindingTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/NavigationPropertyOnComplexTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/NavigationPropertyOnComplexTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/NavigationPropertyOnComplexTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/NavigationPropertyOnComplexTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataAnnotatableTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataAnnotatableTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataAnnotatableTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataAnnotatableTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataAsynchronousReaderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataAsynchronousReaderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataAsynchronousReaderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataAsynchronousReaderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataAsynchronousWriterTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataAsynchronousWriterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataAsynchronousWriterTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataAsynchronousWriterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataBatchReaderStreamTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataBatchReaderStreamTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataBatchReaderStreamTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataBatchReaderStreamTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataBinaryStreamReaderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataBinaryStreamReaderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataBinaryStreamReaderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataBinaryStreamReaderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataCollectionStartSerializationInfoTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataCollectionStartSerializationInfoTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataCollectionStartSerializationInfoTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataCollectionStartSerializationInfoTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataCollectionStartTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataCollectionStartTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataCollectionStartTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataCollectionStartTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataContextUriBuilderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataContextUriBuilderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataContextUriBuilderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataContextUriBuilderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataEntityReferenceLinkTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataEntityReferenceLinkTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataEntityReferenceLinkTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataEntityReferenceLinkTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataEntityReferenceLinksTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataEntityReferenceLinksTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataEntityReferenceLinksTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataEntityReferenceLinksTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataErrorTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataErrorTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataErrorTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataErrorTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataFeedTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataFeedTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataFeedTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataFeedTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataFormatTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataFormatTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataFormatTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataFormatTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataInstanceAnnotationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataInstanceAnnotationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataInstanceAnnotationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataInstanceAnnotationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataMediaTypeResolverTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataMediaTypeResolverTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataMediaTypeResolverTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataMediaTypeResolverTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataMessageExtensionsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataMessageExtensionsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataMessageExtensionsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataMessageExtensionsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataMessageReaderSettingsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataMessageReaderSettingsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataMessageReaderSettingsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataMessageReaderSettingsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataMessageReaderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataMessageReaderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataMessageReaderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataMessageReaderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataMessageWriterSettingsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataMessageWriterSettingsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataMessageWriterSettingsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataMessageWriterSettingsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataMessageWriterTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataMessageWriterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataMessageWriterTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataMessageWriterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataMultipartMixedBatchOutputContextApiTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataMultipartMixedBatchOutputContextApiTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataMultipartMixedBatchOutputContextApiTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataMultipartMixedBatchOutputContextApiTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataMultipartMixedBatchReaderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataMultipartMixedBatchReaderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataMultipartMixedBatchReaderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataMultipartMixedBatchReaderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataMultipartMixedBatchWriterTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataMultipartMixedBatchWriterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataMultipartMixedBatchWriterTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataMultipartMixedBatchWriterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataNavigationLinkTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataNavigationLinkTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataNavigationLinkTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataNavigationLinkTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataNotificationReaderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataNotificationReaderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataNotificationReaderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataNotificationReaderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataNotificationStreamTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataNotificationStreamTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataNotificationStreamTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataNotificationStreamTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataNotificationWriterTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataNotificationWriterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataNotificationWriterTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataNotificationWriterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataNullValueTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataNullValueTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataNullValueTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataNullValueTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataObjectModelExtensionTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataObjectModelExtensionTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataObjectModelExtensionTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataObjectModelExtensionTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataOperationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataOperationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataOperationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataOperationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataPreferenceHeaderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataPreferenceHeaderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataPreferenceHeaderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataPreferenceHeaderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataPrimitiveValueTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataPrimitiveValueTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataPrimitiveValueTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataPrimitiveValueTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataPropertySerializationInfoAnnotationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataPropertySerializationInfoAnnotationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataPropertySerializationInfoAnnotationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataPropertySerializationInfoAnnotationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataPropertyTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataPropertyTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataPropertyTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataPropertyTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataRawInputContextTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataRawInputContextTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataRawInputContextTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataRawInputContextTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataRawOutputContextApiTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataRawOutputContextApiTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataRawOutputContextApiTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataRawOutputContextApiTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataRawOutputContextTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataRawOutputContextTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataRawOutputContextTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataRawOutputContextTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataReaderDerivedTypeConstraintTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataReaderDerivedTypeConstraintTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataReaderDerivedTypeConstraintTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataReaderDerivedTypeConstraintTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataRequestMessageTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataRequestMessageTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataRequestMessageTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataRequestMessageTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataResourceSerializationInfoTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataResourceSerializationInfoTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataResourceSerializationInfoTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataResourceSerializationInfoTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataResourceTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataResourceTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataResourceTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataResourceTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataResourceTypeContextTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataResourceTypeContextTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataResourceTypeContextTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataResourceTypeContextTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataServiceCollectionExtensionTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataServiceCollectionExtensionTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataServiceCollectionExtensionTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataServiceCollectionExtensionTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataStreamReferenceValueTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataStreamReferenceValueTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataStreamReferenceValueTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataStreamReferenceValueTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataTextStreamReaderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataTextStreamReaderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataTextStreamReaderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataTextStreamReaderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataUtilsInternalTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataUtilsInternalTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataUtilsInternalTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataUtilsInternalTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataUtilsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataUtilsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataUtilsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataUtilsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataValueUtilsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataValueUtilsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataValueUtilsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataValueUtilsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataVersionCacheTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataVersionCacheTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataVersionCacheTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataVersionCacheTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataWriteStreamTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataWriteStreamTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataWriteStreamTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataWriteStreamTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataWriterCoreTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataWriterCoreTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataWriterCoreTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataWriterCoreTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataWriterDerivedTypeConstraintTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataWriterDerivedTypeConstraintTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataWriterDerivedTypeConstraintTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataWriterDerivedTypeConstraintTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ODataWriterValidationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ODataWriterValidationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ODataWriterValidationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ODataWriterValidationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Properties/AssemblyInfo.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Properties/AssemblyInfo.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Properties/AssemblyInfo.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/PropertyCacheHandlerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/PropertyCacheHandlerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/PropertyCacheHandlerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/PropertyCacheHandlerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Query/ODataUriConversionUtilsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Query/ODataUriConversionUtilsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Query/ODataUriConversionUtilsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Query/ODataUriConversionUtilsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/Query/ODataUriUtilsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/Query/ODataUriUtilsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/Query/ODataUriUtilsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/Query/ODataUriUtilsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/RawValueWriterTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/RawValueWriterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/RawValueWriterTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/RawValueWriterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ReadOnlyEnumerableTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ReadOnlyEnumerableTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ReadOnlyEnumerableTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ReadOnlyEnumerableTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Evaluation/KeyGenerationPinningTest.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Evaluation/KeyGenerationPinningTest.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Evaluation/KeyGenerationPinningTest.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Evaluation/KeyGenerationPinningTest.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/CustomInstanceAnnotationAcceptanceTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/CustomInstanceAnnotationAcceptanceTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/CustomInstanceAnnotationAcceptanceTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/CustomInstanceAnnotationAcceptanceTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/DisablePrimitiveTypeConversionTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/DisablePrimitiveTypeConversionTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/DisablePrimitiveTypeConversionTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/DisablePrimitiveTypeConversionTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/Json/DateReaderJsonTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/Json/DateReaderJsonTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/Json/DateReaderJsonTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/Json/DateReaderJsonTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/Json/DateTimeReaderJsonTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/Json/DateTimeReaderJsonTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/Json/DateTimeReaderJsonTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/Json/DateTimeReaderJsonTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/Json/ODataJsonSingletonReaderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/Json/ODataJsonSingletonReaderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/Json/ODataJsonSingletonReaderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/Json/ODataJsonSingletonReaderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/Json/TimeOfDayReaderJsonTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/Json/TimeOfDayReaderJsonTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/Json/TimeOfDayReaderJsonTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/Json/TimeOfDayReaderJsonTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/MetadataReaderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/MetadataReaderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/MetadataReaderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Reader/MetadataReaderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/ContextUrlWriterReaderTests.Async.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/ContextUrlWriterReaderTests.Async.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/ContextUrlWriterReaderTests.Async.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/ContextUrlWriterReaderTests.Async.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/ContextUrlWriterReaderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/ContextUrlWriterReaderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/ContextUrlWriterReaderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/ContextUrlWriterReaderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/AsyncBatchRoundtripJsonTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/AsyncBatchRoundtripJsonTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/AsyncBatchRoundtripJsonTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/AsyncBatchRoundtripJsonTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/AsyncRoundtripJsonTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/AsyncRoundtripJsonTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/AsyncRoundtripJsonTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/AsyncRoundtripJsonTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/BinaryValueEncodingTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/BinaryValueEncodingTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/BinaryValueEncodingTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/BinaryValueEncodingTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/CustomInstanceAnnotationRoundtripJsonTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/CustomInstanceAnnotationRoundtripJsonTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/CustomInstanceAnnotationRoundtripJsonTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/CustomInstanceAnnotationRoundtripJsonTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/JsonBatchBodyContentTextualAndBinaryValueTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/JsonBatchBodyContentTextualAndBinaryValueTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/JsonBatchBodyContentTextualAndBinaryValueTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/JsonBatchBodyContentTextualAndBinaryValueTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/JsonBatchRoundTripTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/JsonBatchRoundTripTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/JsonBatchRoundTripTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/JsonBatchRoundTripTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/JsonBigBatchRoundTripTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/JsonBigBatchRoundTripTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/JsonBigBatchRoundTripTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/JsonBigBatchRoundTripTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/MetadataUriRoundTripTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/MetadataUriRoundTripTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/MetadataUriRoundTripTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/MetadataUriRoundTripTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/MultipartMixedBatchDependsOnIdsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/MultipartMixedBatchDependsOnIdsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/MultipartMixedBatchDependsOnIdsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/MultipartMixedBatchDependsOnIdsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/NonPrimitiveTypeRoundtripJsonTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/NonPrimitiveTypeRoundtripJsonTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/NonPrimitiveTypeRoundtripJsonTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/NonPrimitiveTypeRoundtripJsonTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/ODataEntryExtensions.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/ODataEntryExtensions.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/ODataEntryExtensions.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/ODataEntryExtensions.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/ODataJsonBatchAtomicityGroupTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/ODataJsonBatchAtomicityGroupTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/ODataJsonBatchAtomicityGroupTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/ODataJsonBatchAtomicityGroupTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/ODataJsonBatchPayloadTestCase.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/ODataJsonBatchPayloadTestCase.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/ODataJsonBatchPayloadTestCase.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/ODataJsonBatchPayloadTestCase.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/PrimitiveValuesRoundtripJsonTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/PrimitiveValuesRoundtripJsonTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/PrimitiveValuesRoundtripJsonTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/PrimitiveValuesRoundtripJsonTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/SingletonBatchRoundtripJsonTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/SingletonBatchRoundtripJsonTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/SingletonBatchRoundtripJsonTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/SingletonBatchRoundtripJsonTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/Utils.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/Utils.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/Utils.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/Json/Utils.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/JsonReaderWriterInjectionTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/JsonReaderWriterInjectionTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/JsonReaderWriterInjectionTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Roundtrip/JsonReaderWriterInjectionTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Streaming/ODataJsonStreamReadingTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Streaming/ODataJsonStreamReadingTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Streaming/ODataJsonStreamReadingTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Streaming/ODataJsonStreamReadingTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Streaming/ODataJsonStreamWritingTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Streaming/ODataJsonStreamWritingTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Streaming/ODataJsonStreamWritingTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Streaming/ODataJsonStreamWritingTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/ApplyBuilderTest.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/ApplyBuilderTest.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/ApplyBuilderTest.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/ApplyBuilderTest.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/ContextUrlPathStringTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/ContextUrlPathStringTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/ContextUrlPathStringTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/ContextUrlPathStringTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/CountBuilderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/CountBuilderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/CountBuilderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/CountBuilderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/FilterAndOrderByBuilderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/FilterAndOrderByBuilderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/FilterAndOrderByBuilderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/FilterAndOrderByBuilderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/PathBuilderCreationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/PathBuilderCreationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/PathBuilderCreationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/PathBuilderCreationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/PathBuilderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/PathBuilderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/PathBuilderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/PathBuilderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/SearchBuilderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/SearchBuilderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/SearchBuilderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/SearchBuilderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/SelectExpandBuilderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/SelectExpandBuilderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/SelectExpandBuilderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/SelectExpandBuilderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/SpatialHelpers.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/SpatialHelpers.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/SpatialHelpers.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/SpatialHelpers.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/TopAndSkipBuilderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/TopAndSkipBuilderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/TopAndSkipBuilderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/TopAndSkipBuilderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/UriBuilderTestBase.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/UriBuilderTestBase.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/UriBuilderTestBase.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/UriBuilderTestBase.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/UrlBuilderWithParameterAliasTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/UrlBuilderWithParameterAliasTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/UrlBuilderWithParameterAliasTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriBuilder/UrlBuilderWithParameterAliasTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/BuiltInUriFunctionsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/BuiltInUriFunctionsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/BuiltInUriFunctionsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/BuiltInUriFunctionsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/CountFunctionalTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/CountFunctionalTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/CountFunctionalTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/CountFunctionalTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/CustomUriFunctionsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/CustomUriFunctionsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/CustomUriFunctionsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/CustomUriFunctionsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/EntityIdFunctionalTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/EntityIdFunctionalTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/EntityIdFunctionalTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/EntityIdFunctionalTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/EntityReferenceFunctionalTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/EntityReferenceFunctionalTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/EntityReferenceFunctionalTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/EntityReferenceFunctionalTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/EnumFilterFunctionalTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/EnumFilterFunctionalTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/EnumFilterFunctionalTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/EnumFilterFunctionalTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/ExpandAndSelectPathExtractingTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/ExpandAndSelectPathExtractingTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/ExpandAndSelectPathExtractingTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/ExpandAndSelectPathExtractingTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/ExpandOptionFunctionalTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/ExpandOptionFunctionalTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/ExpandOptionFunctionalTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/ExpandOptionFunctionalTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/ExtendedContainerElementsFunctionalTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/ExtendedContainerElementsFunctionalTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/ExtendedContainerElementsFunctionalTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/ExtendedContainerElementsFunctionalTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/FilterAndOrderByFunctionalTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/FilterAndOrderByFunctionalTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/FilterAndOrderByFunctionalTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/FilterAndOrderByFunctionalTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/FullUriFunctionalTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/FullUriFunctionalTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/FullUriFunctionalTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/FullUriFunctionalTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/OpenPropertiesFunctionalTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/OpenPropertiesFunctionalTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/OpenPropertiesFunctionalTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/OpenPropertiesFunctionalTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/ParameterAliasFunctionalTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/ParameterAliasFunctionalTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/ParameterAliasFunctionalTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/ParameterAliasFunctionalTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/ParsePrimitiveValuesTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/ParsePrimitiveValuesTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/ParsePrimitiveValuesTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/ParsePrimitiveValuesTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/PathFunctionalTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/PathFunctionalTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/PathFunctionalTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/PathFunctionalTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/PathFunctionalTestsUtil.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/PathFunctionalTestsUtil.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/PathFunctionalTestsUtil.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/PathFunctionalTestsUtil.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/SearchFunctionalTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/SearchFunctionalTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/SearchFunctionalTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/SearchFunctionalTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/SelectExpandClauseExtensionsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/SelectExpandClauseExtensionsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/SelectExpandClauseExtensionsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/SelectExpandClauseExtensionsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/SelectExpandFunctionalTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/SelectExpandFunctionalTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/SelectExpandFunctionalTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/SelectExpandFunctionalTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/SemanticTreeFunctionalTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/SemanticTreeFunctionalTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/SemanticTreeFunctionalTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/SemanticTreeFunctionalTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/SetBasedOperationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/SetBasedOperationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/SetBasedOperationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/SetBasedOperationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/SpatialFuntionalTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/SpatialFuntionalTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/SpatialFuntionalTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/SpatialFuntionalTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/TopAndSkipFunctionalTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/TopAndSkipFunctionalTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/TopAndSkipFunctionalTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/TopAndSkipFunctionalTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/VerificationHelpers.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/VerificationHelpers.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/VerificationHelpers.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/UriParser/VerificationHelpers.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/CommonWritingValidationScenarioTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/CommonWritingValidationScenarioTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/CommonWritingValidationScenarioTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/CommonWritingValidationScenarioTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/AutoGeneratedUrlsShouldPutKeyValueInDedicatedSegmentTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/AutoGeneratedUrlsShouldPutKeyValueInDedicatedSegmentTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/AutoGeneratedUrlsShouldPutKeyValueInDedicatedSegmentTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/AutoGeneratedUrlsShouldPutKeyValueInDedicatedSegmentTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/FullPayloadValidateTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/FullPayloadValidateTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/FullPayloadValidateTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/FullPayloadValidateTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/ODataJsonInheritComplexCollectionWriterTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/ODataJsonInheritComplexCollectionWriterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/ODataJsonInheritComplexCollectionWriterTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/ODataJsonInheritComplexCollectionWriterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/ODataJsonPropertyTypeSerializerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/ODataJsonPropertyTypeSerializerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/ODataJsonPropertyTypeSerializerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/ODataJsonPropertyTypeSerializerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/ODataJsonSingletonWriterTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/ODataJsonSingletonWriterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/ODataJsonSingletonWriterTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/ODataJsonSingletonWriterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/ODataSpatialTypeUtil.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/ODataSpatialTypeUtil.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/ODataSpatialTypeUtil.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/ODataSpatialTypeUtil.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/WriteFeedWithoutNavigationSourceTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/WriteFeedWithoutNavigationSourceTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/WriteFeedWithoutNavigationSourceTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/WriteFeedWithoutNavigationSourceTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/WriteFeedWithoutNavigationTargetTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/WriteFeedWithoutNavigationTargetTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/WriteFeedWithoutNavigationTargetTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/WriteFeedWithoutNavigationTargetTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/WritingJsonWithoutModelAcceptanceTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/WritingJsonWithoutModelAcceptanceTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/WritingJsonWithoutModelAcceptanceTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/Json/WritingJsonWithoutModelAcceptanceTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/WriterSmokeTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/WriterSmokeTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/WriterSmokeTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/WriterSmokeTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/WriterTypeNameEndToEndTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/WriterTypeNameEndToEndTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/WriterTypeNameEndToEndTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ScenarioTests/Writer/WriterTypeNameEndToEndTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/SelectedPropertiesNodeTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/SelectedPropertiesNodeTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/SelectedPropertiesNodeTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/SelectedPropertiesNodeTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/SimpleLazyTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/SimpleLazyTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/SimpleLazyTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/SimpleLazyTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/SynchronousIOException.cs b/test/UnitTests/Microsoft.OData.Core.Tests/SynchronousIOException.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/SynchronousIOException.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/SynchronousIOException.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/TestCharArrayPool.cs b/test/UnitTests/Microsoft.OData.Core.Tests/TestCharArrayPool.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/TestCharArrayPool.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/TestCharArrayPool.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/TestJsonReaderEntryState.cs b/test/UnitTests/Microsoft.OData.Core.Tests/TestJsonReaderEntryState.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/TestJsonReaderEntryState.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/TestJsonReaderEntryState.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/TestUtils.cs b/test/UnitTests/Microsoft.OData.Core.Tests/TestUtils.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/TestUtils.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/TestUtils.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/TypeUtilsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/TypeUtilsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/TypeUtilsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/TypeUtilsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriComparer.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriComparer.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriComparer.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriComparer.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/BinaryOperatorBinderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/BinaryOperatorBinderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/BinaryOperatorBinderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/BinaryOperatorBinderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/DottedIdentifierBinderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/DottedIdentifierBinderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/DottedIdentifierBinderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/DottedIdentifierBinderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/EndPathBinderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/EndPathBinderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/EndPathBinderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/EndPathBinderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/ExpandBinderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/ExpandBinderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/ExpandBinderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/ExpandBinderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/ExpandTreeNormalizerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/ExpandTreeNormalizerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/ExpandTreeNormalizerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/ExpandTreeNormalizerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/FakeBindMethods.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/FakeBindMethods.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/FakeBindMethods.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/FakeBindMethods.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/FunctionCallBinderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/FunctionCallBinderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/FunctionCallBinderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/FunctionCallBinderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/InnerPathTokenBinderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/InnerPathTokenBinderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/InnerPathTokenBinderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/InnerPathTokenBinderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/KeyBinderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/KeyBinderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/KeyBinderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/KeyBinderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/LambdaBinderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/LambdaBinderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/LambdaBinderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/LambdaBinderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/LiteralBinderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/LiteralBinderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/LiteralBinderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/LiteralBinderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/MetadataBindingTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/MetadataBindingTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/MetadataBindingTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/MetadataBindingTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/MetadataBindingUtilsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/MetadataBindingUtilsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/MetadataBindingUtilsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/MetadataBindingUtilsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/OrderByBinderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/OrderByBinderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/OrderByBinderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/OrderByBinderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectBinderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectBinderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectBinderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectBinderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectExpandBinderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectExpandBinderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectExpandBinderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectExpandBinderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectExpandClauseFinisherTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectExpandClauseFinisherTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectExpandClauseFinisherTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectExpandClauseFinisherTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectExpandPathBinderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectExpandPathBinderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectExpandPathBinderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectExpandPathBinderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectPathSegmentTokenBinderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectPathSegmentTokenBinderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectPathSegmentTokenBinderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectPathSegmentTokenBinderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectTreeNormalizerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectTreeNormalizerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectTreeNormalizerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectTreeNormalizerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectionAssertions.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectionAssertions.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectionAssertions.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/SelectionAssertions.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/UnaryOperatorBinderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/UnaryOperatorBinderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Binders/UnaryOperatorBinderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Binders/UnaryOperatorBinderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/EntitySetNode.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/EntitySetNode.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/EntitySetNode.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/EntitySetNode.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/ExceptionUtilTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/ExceptionUtilTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/ExceptionUtilTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/ExceptionUtilTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/ExpressionLexerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/ExpressionLexerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/ExpressionLexerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/ExpressionLexerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Extensions/Binders/ApplyBinderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Extensions/Binders/ApplyBinderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Extensions/Binders/ApplyBinderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Extensions/Binders/ApplyBinderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Extensions/PathSegmentTokenExtensions.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Extensions/PathSegmentTokenExtensions.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Extensions/PathSegmentTokenExtensions.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Extensions/PathSegmentTokenExtensions.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Extensions/SelectExpandTokenSyntacticTreeVisitor.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Extensions/SelectExpandTokenSyntacticTreeVisitor.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Extensions/SelectExpandTokenSyntacticTreeVisitor.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Extensions/SelectExpandTokenSyntacticTreeVisitor.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Extensions/SyntacticAst/AggregateExpressionTokenTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Extensions/SyntacticAst/AggregateExpressionTokenTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Extensions/SyntacticAst/AggregateExpressionTokenTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Extensions/SyntacticAst/AggregateExpressionTokenTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Extensions/SyntacticAst/AggregateTokenTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Extensions/SyntacticAst/AggregateTokenTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Extensions/SyntacticAst/AggregateTokenTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Extensions/SyntacticAst/AggregateTokenTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Extensions/SyntacticAst/GroupByTokenTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Extensions/SyntacticAst/GroupByTokenTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Extensions/SyntacticAst/GroupByTokenTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Extensions/SyntacticAst/GroupByTokenTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/HardCodedTestModel.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/HardCodedTestModel.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/HardCodedTestModel.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/HardCodedTestModel.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/LiteralUtilsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/LiteralUtilsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/LiteralUtilsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/LiteralUtilsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Metadata/CaseInsensitiveBuiltinIdentifierTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Metadata/CaseInsensitiveBuiltinIdentifierTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Metadata/CaseInsensitiveBuiltinIdentifierTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Metadata/CaseInsensitiveBuiltinIdentifierTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Metadata/CaseInsensitiveResolverTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Metadata/CaseInsensitiveResolverTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Metadata/CaseInsensitiveResolverTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Metadata/CaseInsensitiveResolverTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Metadata/ExtensionTestBase.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Metadata/ExtensionTestBase.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Metadata/ExtensionTestBase.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Metadata/ExtensionTestBase.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Metadata/NormalizedModelElementsCacheTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Metadata/NormalizedModelElementsCacheTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Metadata/NormalizedModelElementsCacheTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Metadata/NormalizedModelElementsCacheTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Metadata/ODataUriResolverTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Metadata/ODataUriResolverTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Metadata/ODataUriResolverTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Metadata/ODataUriResolverTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Metadata/OpenTypeExtensionTestBase.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Metadata/OpenTypeExtensionTestBase.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Metadata/OpenTypeExtensionTestBase.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Metadata/OpenTypeExtensionTestBase.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Metadata/OpenTypeUnqualifiedExtensionTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Metadata/OpenTypeUnqualifiedExtensionTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Metadata/OpenTypeUnqualifiedExtensionTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Metadata/OpenTypeUnqualifiedExtensionTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Metadata/PathParserModelUtilsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Metadata/PathParserModelUtilsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Metadata/PathParserModelUtilsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Metadata/PathParserModelUtilsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Metadata/UnqualifiedODataUriResolverTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Metadata/UnqualifiedODataUriResolverTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Metadata/UnqualifiedODataUriResolverTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Metadata/UnqualifiedODataUriResolverTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/ModelBuildingHelpers.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/ModelBuildingHelpers.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/ModelBuildingHelpers.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/ModelBuildingHelpers.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/NodeAssertions.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/NodeAssertions.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/NodeAssertions.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/NodeAssertions.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/ODataPathInfoTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/ODataPathInfoTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/ODataPathInfoTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/ODataPathInfoTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/ODataQueryOptionParserTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/ODataQueryOptionParserTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/ODataQueryOptionParserTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/ODataQueryOptionParserTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/ODataUriParseSettingsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/ODataUriParseSettingsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/ODataUriParseSettingsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/ODataUriParseSettingsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/ODataUriParserInjectionTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/ODataUriParserInjectionTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/ODataUriParserInjectionTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/ODataUriParserInjectionTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/ODataUriParserTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/ODataUriParserTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/ODataUriParserTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/ODataUriParserTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/ODataUrlKeyDelimiterTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/ODataUrlKeyDelimiterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/ODataUrlKeyDelimiterTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/ODataUrlKeyDelimiterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/ODataValueAssertions.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/ODataValueAssertions.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/ODataValueAssertions.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/ODataValueAssertions.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/CustomUriLiteralParserTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/CustomUriLiteralParserTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/CustomUriLiteralParserTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/CustomUriLiteralParserTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/CustomUriLiteralPrefixesTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/CustomUriLiteralPrefixesTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/CustomUriLiteralPrefixesTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/CustomUriLiteralPrefixesTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/ExpandDepthAndCountValidatorTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/ExpandDepthAndCountValidatorTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/ExpandDepthAndCountValidatorTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/ExpandDepthAndCountValidatorTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/FunctionCallParserTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/FunctionCallParserTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/FunctionCallParserTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/FunctionCallParserTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/FunctionOverloadResolverTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/FunctionOverloadResolverTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/FunctionOverloadResolverTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/FunctionOverloadResolverTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/FunctionParameterParserTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/FunctionParameterParserTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/FunctionParameterParserTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/FunctionParameterParserTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/IdentifierTokenizerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/IdentifierTokenizerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/IdentifierTokenizerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/IdentifierTokenizerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/KeyFinderTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/KeyFinderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/KeyFinderTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/KeyFinderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/LIteralParserTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/LIteralParserTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/LIteralParserTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/LIteralParserTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/NodeFactoryTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/NodeFactoryTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/NodeFactoryTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/NodeFactoryTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/ODataPathParserTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/ODataPathParserTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/ODataPathParserTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/ODataPathParserTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/ODataPathParserTypeCastTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/ODataPathParserTypeCastTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/ODataPathParserTypeCastTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/ODataPathParserTypeCastTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/PathReverserTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/PathReverserTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/PathReverserTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/PathReverserTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/SearchParserTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/SearchParserTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/SearchParserTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/SearchParserTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/SegmentArgumentParserTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/SegmentArgumentParserTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/SegmentArgumentParserTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/SegmentArgumentParserTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/SegmentKeyHandlerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/SegmentKeyHandlerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/SegmentKeyHandlerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/SegmentKeyHandlerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/SelectExpandOptionParserTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/SelectExpandOptionParserTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/SelectExpandOptionParserTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/SelectExpandOptionParserTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/SelectExpandParserTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/SelectExpandParserTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/SelectExpandParserTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/SelectExpandParserTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/SelectExpandTermParserTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/SelectExpandTermParserTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/SelectExpandTermParserTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/SelectExpandTermParserTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/UriPathParserTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/UriPathParserTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/UriPathParserTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/UriPathParserTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/UriPrimitiveTypeParserTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/UriPrimitiveTypeParserTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/UriPrimitiveTypeParserTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/UriPrimitiveTypeParserTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/UriQueryExpressionParserTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/UriQueryExpressionParserTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/UriQueryExpressionParserTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/UriQueryExpressionParserTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/UriTemplateParserTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/UriTemplateParserTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Parsers/UriTemplateParserTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Parsers/UriTemplateParserTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SearchLexerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SearchLexerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SearchLexerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SearchLexerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SegmentAssertions.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SegmentAssertions.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SegmentAssertions.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SegmentAssertions.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/AllNodeTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/AllNodeTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/AllNodeTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/AllNodeTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/AnnotationSegmentTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/AnnotationSegmentTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/AnnotationSegmentTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/AnnotationSegmentTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/AnyNodeTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/AnyNodeTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/AnyNodeTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/AnyNodeTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/BatchReferenceSegmentTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/BatchReferenceSegmentTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/BatchReferenceSegmentTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/BatchReferenceSegmentTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/BatchSegmentTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/BatchSegmentTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/BatchSegmentTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/BatchSegmentTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/BinaryOperatorNodeTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/BinaryOperatorNodeTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/BinaryOperatorNodeTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/BinaryOperatorNodeTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CollectionConstantNodeTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CollectionConstantNodeTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CollectionConstantNodeTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CollectionConstantNodeTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CollectionFunctionCallNodeTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CollectionFunctionCallNodeTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CollectionFunctionCallNodeTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CollectionFunctionCallNodeTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CollectionNavigationNodeTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CollectionNavigationNodeTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CollectionNavigationNodeTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CollectionNavigationNodeTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CollectionPropertyAccessNodeTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CollectionPropertyAccessNodeTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CollectionPropertyAccessNodeTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CollectionPropertyAccessNodeTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CollectionResourceCastNodeTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CollectionResourceCastNodeTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CollectionResourceCastNodeTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CollectionResourceCastNodeTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CollectionResourceFunctionCallNodeTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CollectionResourceFunctionCallNodeTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CollectionResourceFunctionCallNodeTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CollectionResourceFunctionCallNodeTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ConstantNodeTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ConstantNodeTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ConstantNodeTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ConstantNodeTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ConvertNodeTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ConvertNodeTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ConvertNodeTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ConvertNodeTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CountSegmentTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CountSegmentTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CountSegmentTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/CountSegmentTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/DynamicPathSegmentTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/DynamicPathSegmentTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/DynamicPathSegmentTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/DynamicPathSegmentTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/EntitySetNodeTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/EntitySetNodeTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/EntitySetNodeTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/EntitySetNodeTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/EntitySetSegmentTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/EntitySetSegmentTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/EntitySetSegmentTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/EntitySetSegmentTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ExpandedNavigationSelectItemTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ExpandedNavigationSelectItemTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ExpandedNavigationSelectItemTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ExpandedNavigationSelectItemTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/FakeSingleEntityNode.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/FakeSingleEntityNode.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/FakeSingleEntityNode.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/FakeSingleEntityNode.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/FilterSegmentTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/FilterSegmentTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/FilterSegmentTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/FilterSegmentTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/InNodeTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/InNodeTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/InNodeTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/InNodeTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/KeySegmentTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/KeySegmentTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/KeySegmentTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/KeySegmentTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/MetadataSegmentTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/MetadataSegmentTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/MetadataSegmentTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/MetadataSegmentTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/NamespaceQualifiedWildcardSelectionItemTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/NamespaceQualifiedWildcardSelectionItemTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/NamespaceQualifiedWildcardSelectionItemTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/NamespaceQualifiedWildcardSelectionItemTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/NavigationPropertyLinkSegmentTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/NavigationPropertyLinkSegmentTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/NavigationPropertyLinkSegmentTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/NavigationPropertyLinkSegmentTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/NavigationPropertySegmentTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/NavigationPropertySegmentTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/NavigationPropertySegmentTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/NavigationPropertySegmentTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/NonResourceRangeVariableReferenceNodeTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/NonResourceRangeVariableReferenceNodeTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/NonResourceRangeVariableReferenceNodeTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/NonResourceRangeVariableReferenceNodeTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/NonResourceRangeVariableTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/NonResourceRangeVariableTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/NonResourceRangeVariableTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/NonResourceRangeVariableTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ODataExpandPathTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ODataExpandPathTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ODataExpandPathTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ODataExpandPathTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ODataPathExtensionsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ODataPathExtensionsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ODataPathExtensionsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ODataPathExtensionsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ODataPathSegmentTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ODataPathSegmentTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ODataPathSegmentTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ODataPathSegmentTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ODataPathTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ODataPathTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ODataPathTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ODataPathTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ODataSelectPathTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ODataSelectPathTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ODataSelectPathTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ODataSelectPathTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ODataUnresolvedFunctionParameterAliasTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ODataUnresolvedFunctionParameterAliasTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ODataUnresolvedFunctionParameterAliasTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ODataUnresolvedFunctionParameterAliasTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/OperationImportSegmentTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/OperationImportSegmentTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/OperationImportSegmentTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/OperationImportSegmentTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/PathSelectItemTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/PathSelectItemTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/PathSelectItemTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/PathSelectItemTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/PropertySegmentTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/PropertySegmentTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/PropertySegmentTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/PropertySegmentTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ReferenceSegmentTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ReferenceSegmentTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ReferenceSegmentTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ReferenceSegmentTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ResourceRangeVariableReferenceNodeTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ResourceRangeVariableReferenceNodeTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ResourceRangeVariableReferenceNodeTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ResourceRangeVariableReferenceNodeTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ResourceRangeVariableTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ResourceRangeVariableTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ResourceRangeVariableTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ResourceRangeVariableTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SelectExpandClauseTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SelectExpandClauseTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SelectExpandClauseTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SelectExpandClauseTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingleNavigationNodeTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingleNavigationNodeTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingleNavigationNodeTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingleNavigationNodeTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingleResourceCastNodeTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingleResourceCastNodeTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingleResourceCastNodeTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingleResourceCastNodeTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingleResourceFunctionCallNodeTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingleResourceFunctionCallNodeTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingleResourceFunctionCallNodeTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingleResourceFunctionCallNodeTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingleValueFunctionCallNodeTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingleValueFunctionCallNodeTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingleValueFunctionCallNodeTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingleValueFunctionCallNodeTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingleValueOpenPropertyAccessNodeTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingleValueOpenPropertyAccessNodeTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingleValueOpenPropertyAccessNodeTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingleValueOpenPropertyAccessNodeTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingleValuePropertyAccessNodeTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingleValuePropertyAccessNodeTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingleValuePropertyAccessNodeTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingleValuePropertyAccessNodeTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingletonSegmentTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingletonSegmentTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingletonSegmentTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/SingletonSegmentTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/TypeSegmentTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/TypeSegmentTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/TypeSegmentTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/TypeSegmentTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/UnaryOperatorNodeTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/UnaryOperatorNodeTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/UnaryOperatorNodeTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/UnaryOperatorNodeTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ValueSegmentTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ValueSegmentTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ValueSegmentTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/ValueSegmentTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/WildcardSelectionItemTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/WildcardSelectionItemTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/WildcardSelectionItemTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SemanticAst/WildcardSelectionItemTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/EndPathTokenTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/EndPathTokenTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/EndPathTokenTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/EndPathTokenTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/ExpandTermTokenTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/ExpandTermTokenTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/ExpandTermTokenTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/ExpandTermTokenTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/InnerPathTokenTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/InnerPathTokenTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/InnerPathTokenTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/InnerPathTokenTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/NonSystemTokenTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/NonSystemTokenTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/NonSystemTokenTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/NonSystemTokenTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/PathSegmentTokenTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/PathSegmentTokenTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/PathSegmentTokenTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/PathSegmentTokenTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/SelectTermTokenTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/SelectTermTokenTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/SelectTermTokenTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/SelectTermTokenTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/StarTokenTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/StarTokenTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/StarTokenTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/StarTokenTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/SystemTokenTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/SystemTokenTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/SystemTokenTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/SyntacticAst/SystemTokenTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/TokenAssertions.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/TokenAssertions.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/TokenAssertions.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/TokenAssertions.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/TreeNodeKinds/QueryNodeKindTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/TreeNodeKinds/QueryNodeKindTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/TreeNodeKinds/QueryNodeKindTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/TreeNodeKinds/QueryNodeKindTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/TypePromotionUtilsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/TypePromotionUtilsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/TypePromotionUtilsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/TypePromotionUtilsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/UriEdmHelpersTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/UriEdmHelpersTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/UriEdmHelpersTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/UriEdmHelpersTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Visitors/IsCollectionTranslatorTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Visitors/IsCollectionTranslatorTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Visitors/IsCollectionTranslatorTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Visitors/IsCollectionTranslatorTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Visitors/PathSegmentTokenEqualityComparerTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Visitors/PathSegmentTokenEqualityComparerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Visitors/PathSegmentTokenEqualityComparerTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Visitors/PathSegmentTokenEqualityComparerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Visitors/QueryNodeVisitorTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Visitors/QueryNodeVisitorTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Visitors/QueryNodeVisitorTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Visitors/QueryNodeVisitorTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Visitors/SyntacticTreeVisitorTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Visitors/SyntacticTreeVisitorTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/Visitors/SyntacticTreeVisitorTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UriParser/Visitors/SyntacticTreeVisitorTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UrlValidation/DeprecationTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UrlValidation/DeprecationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UrlValidation/DeprecationTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UrlValidation/DeprecationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UrlValidation/ODataUrlValidatorTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UrlValidation/ODataUrlValidatorTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UrlValidation/ODataUrlValidatorTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UrlValidation/ODataUrlValidatorTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UrlValidation/SelectRequiredTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/UrlValidation/SelectRequiredTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/UrlValidation/SelectRequiredTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/UrlValidation/SelectRequiredTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ValidationHelper.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ValidationHelper.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ValidationHelper.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ValidationHelper.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/ValidationUtilsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/ValidationUtilsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/ValidationUtilsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/ValidationUtilsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/WriterUtilsTests.cs b/test/UnitTests/Microsoft.OData.Core.Tests/WriterUtilsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Core.Tests/WriterUtilsTests.cs
rename to test/UnitTests/Microsoft.OData.Core.Tests/WriterUtilsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/CsdlReaderJsonTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/CsdlReaderJsonTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/CsdlReaderJsonTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/CsdlReaderJsonTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/CsdlReaderTests.Async.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/CsdlReaderTests.Async.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/CsdlReaderTests.Async.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/CsdlReaderTests.Async.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/CsdlReaderTests.BigCsdl.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/CsdlReaderTests.BigCsdl.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/CsdlReaderTests.BigCsdl.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/CsdlReaderTests.BigCsdl.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/CsdlReaderTests.TargetPath.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/CsdlReaderTests.TargetPath.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/CsdlReaderTests.TargetPath.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/CsdlReaderTests.TargetPath.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/CsdlReaderTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/CsdlReaderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/CsdlReaderTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/CsdlReaderTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/CsdlWriterTests.Async.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/CsdlWriterTests.Async.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/CsdlWriterTests.Async.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/CsdlWriterTests.Async.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/CsdlWriterTests.TargetPath.Async.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/CsdlWriterTests.TargetPath.Async.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/CsdlWriterTests.TargetPath.Async.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/CsdlWriterTests.TargetPath.Async.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/CsdlWriterTests.TargetPath.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/CsdlWriterTests.TargetPath.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/CsdlWriterTests.TargetPath.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/CsdlWriterTests.TargetPath.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/CsdlWriterTests.VocabularyAnnotation.Async.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/CsdlWriterTests.VocabularyAnnotation.Async.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/CsdlWriterTests.VocabularyAnnotation.Async.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/CsdlWriterTests.VocabularyAnnotation.Async.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/CsdlWriterTests.VocabularyAnnotation.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/CsdlWriterTests.VocabularyAnnotation.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/CsdlWriterTests.VocabularyAnnotation.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/CsdlWriterTests.VocabularyAnnotation.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/CsdlWriterTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/CsdlWriterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/CsdlWriterTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/CsdlWriterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/EdmEnumValueParserTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/EdmEnumValueParserTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/EdmEnumValueParserTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/EdmEnumValueParserTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/EdmValueParserTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/EdmValueParserTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/EdmValueParserTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/EdmValueParserTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/EdmValueWriterTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/EdmValueWriterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/EdmValueWriterTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/EdmValueWriterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Parsing/AnnotationJsonParserTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Parsing/AnnotationJsonParserTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Parsing/AnnotationJsonParserTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Parsing/AnnotationJsonParserTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Parsing/Ast/CsdlTypeDefinitionTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Parsing/Ast/CsdlTypeDefinitionTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Parsing/Ast/CsdlTypeDefinitionTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Parsing/Ast/CsdlTypeDefinitionTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Parsing/CsdlJsonParserTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Parsing/CsdlJsonParserTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Parsing/CsdlJsonParserTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Parsing/CsdlJsonParserTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Parsing/SchemaJsonParserTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Parsing/SchemaJsonParserTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Parsing/SchemaJsonParserTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Parsing/SchemaJsonParserTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsEntityContainerTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsEntityContainerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsEntityContainerTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsEntityContainerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsEntitySetTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsEntitySetTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsEntitySetTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsEntitySetTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsNavigationPropertyTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsNavigationPropertyTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsNavigationPropertyTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsNavigationPropertyTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsOperationImportTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsOperationImportTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsOperationImportTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsOperationImportTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsOperationTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsOperationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsOperationTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsOperationTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsTypeDefinitionDefinitionTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsTypeDefinitionDefinitionTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsTypeDefinitionDefinitionTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Semantics/CsdlSemanticsTypeDefinitionDefinitionTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Serialization/EdmModelCsdlSchemaWriterTests.Async.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Serialization/EdmModelCsdlSchemaWriterTests.Async.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Serialization/EdmModelCsdlSchemaWriterTests.Async.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Serialization/EdmModelCsdlSchemaWriterTests.Async.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Serialization/EdmModelCsdlSchemaWriterTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Serialization/EdmModelCsdlSchemaWriterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Serialization/EdmModelCsdlSchemaWriterTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Serialization/EdmModelCsdlSchemaWriterTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Serialization/EdmModelCsdlSerializationVisitorTests.Async.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Serialization/EdmModelCsdlSerializationVisitorTests.Async.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Serialization/EdmModelCsdlSerializationVisitorTests.Async.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Serialization/EdmModelCsdlSerializationVisitorTests.Async.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Serialization/EdmModelCsdlSerializationVisitorTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Serialization/EdmModelCsdlSerializationVisitorTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/Serialization/EdmModelCsdlSerializationVisitorTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Csdl/Serialization/EdmModelCsdlSerializationVisitorTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/CsdlBuilder.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/CsdlBuilder.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/CsdlBuilder.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/CsdlBuilder.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/EdmUtilTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/EdmUtilTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/EdmUtilTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/EdmUtilTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/ExtensionMethods/EdmElementComparerTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/ExtensionMethods/EdmElementComparerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/ExtensionMethods/EdmElementComparerTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/ExtensionMethods/EdmElementComparerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/ExtensionMethods/ExtensionMethodTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/ExtensionMethods/ExtensionMethodTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/ExtensionMethods/ExtensionMethodTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/ExtensionMethods/ExtensionMethodTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/ExtensionMethods/TargetHelperTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/ExtensionMethods/TargetHelperTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/ExtensionMethods/TargetHelperTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/ExtensionMethods/TargetHelperTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/ImmutableModelTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/ImmutableModelTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/ImmutableModelTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/ImmutableModelTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Microsoft.OData.Edm.Tests.NetCore.csproj b/test/UnitTests/Microsoft.OData.Edm.Tests/Microsoft.OData.Edm.Tests.NetCore.csproj
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Microsoft.OData.Edm.Tests.NetCore.csproj
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Microsoft.OData.Edm.Tests.NetCore.csproj
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Microsoft.OData.Edm.Tests.csproj b/test/UnitTests/Microsoft.OData.Edm.Tests/Microsoft.OData.Edm.Tests.csproj
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Microsoft.OData.Edm.Tests.csproj
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Microsoft.OData.Edm.Tests.csproj
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Properties/AssemblyInfo.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Properties/AssemblyInfo.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Properties/AssemblyInfo.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisActionsFunctionsRelationshipChangesAcceptanceTests.Async.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisActionsFunctionsRelationshipChangesAcceptanceTests.Async.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisActionsFunctionsRelationshipChangesAcceptanceTests.Async.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisActionsFunctionsRelationshipChangesAcceptanceTests.Async.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisActionsFunctionsRelationshipChangesAcceptanceTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisActionsFunctionsRelationshipChangesAcceptanceTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisActionsFunctionsRelationshipChangesAcceptanceTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisActionsFunctionsRelationshipChangesAcceptanceTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisRelationshipChangesAcceptanceTests.Async.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisRelationshipChangesAcceptanceTests.Async.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisRelationshipChangesAcceptanceTests.Async.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisRelationshipChangesAcceptanceTests.Async.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisRelationshipChangesAcceptanceTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisRelationshipChangesAcceptanceTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisRelationshipChangesAcceptanceTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisRelationshipChangesAcceptanceTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/AmbiguousOperationBindingTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Schema/AmbiguousOperationBindingTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/AmbiguousOperationBindingTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Schema/AmbiguousOperationBindingTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/AmbiguousOperationImportBindingTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Schema/AmbiguousOperationImportBindingTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/AmbiguousOperationImportBindingTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Schema/AmbiguousOperationImportBindingTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/DateAndTimeOfDayTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Schema/DateAndTimeOfDayTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/DateAndTimeOfDayTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Schema/DateAndTimeOfDayTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/EdmActionImportTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Schema/EdmActionImportTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/EdmActionImportTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Schema/EdmActionImportTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/EdmActionTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Schema/EdmActionTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/EdmActionTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Schema/EdmActionTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/EdmCoreModelTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Schema/EdmCoreModelTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/EdmCoreModelTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Schema/EdmCoreModelTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/EdmEntityContainerTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Schema/EdmEntityContainerTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/EdmEntityContainerTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Schema/EdmEntityContainerTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/EdmFunctionTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Schema/EdmFunctionTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/EdmFunctionTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Schema/EdmFunctionTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/EdmModelBaseTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Schema/EdmModelBaseTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/EdmModelBaseTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Schema/EdmModelBaseTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/EdmNavigationPropertyInfoTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Schema/EdmNavigationPropertyInfoTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/EdmNavigationPropertyInfoTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Schema/EdmNavigationPropertyInfoTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/EdmReferentialConstraintTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Schema/EdmReferentialConstraintTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/EdmReferentialConstraintTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Schema/EdmReferentialConstraintTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/EdmSingletonTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Schema/EdmSingletonTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/EdmSingletonTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Schema/EdmSingletonTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/EdmTargetPathTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Schema/EdmTargetPathTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/EdmTargetPathTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Schema/EdmTargetPathTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/EdmTypeDefinitionTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Schema/EdmTypeDefinitionTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Schema/EdmTypeDefinitionTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Schema/EdmTypeDefinitionTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/System/Collections/Generic/ReadOnlyListExtensionsTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/System/Collections/Generic/ReadOnlyListExtensionsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/System/Collections/Generic/ReadOnlyListExtensionsTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/System/Collections/Generic/ReadOnlyListExtensionsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Validation/DuplicateOperationValidatorTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Validation/DuplicateOperationValidatorTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Validation/DuplicateOperationValidatorTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Validation/DuplicateOperationValidatorTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Validation/EdmErrorTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Validation/EdmErrorTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Validation/EdmErrorTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Validation/EdmErrorTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Validation/Internal/ValidationHelperTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Validation/Internal/ValidationHelperTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Validation/Internal/ValidationHelperTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Validation/Internal/ValidationHelperTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Validation/ValidationRuleSetTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Validation/ValidationRuleSetTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Validation/ValidationRuleSetTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Validation/ValidationRuleSetTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Validation/ValidationRulesTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Validation/ValidationRulesTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Validation/ValidationRulesTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Validation/ValidationRulesTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/AlternateKeysVocabularyTests.Async.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/AlternateKeysVocabularyTests.Async.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/AlternateKeysVocabularyTests.Async.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/AlternateKeysVocabularyTests.Async.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/AlternateKeysVocabularyTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/AlternateKeysVocabularyTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/AlternateKeysVocabularyTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/AlternateKeysVocabularyTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/AuthorizationVocabularyTests.Async.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/AuthorizationVocabularyTests.Async.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/AuthorizationVocabularyTests.Async.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/AuthorizationVocabularyTests.Async.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/AuthorizationVocabularyTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/AuthorizationVocabularyTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/AuthorizationVocabularyTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/AuthorizationVocabularyTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/CapabilitiesVocabularyTests.Async.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/CapabilitiesVocabularyTests.Async.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/CapabilitiesVocabularyTests.Async.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/CapabilitiesVocabularyTests.Async.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/CapabilitiesVocabularyTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/CapabilitiesVocabularyTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/CapabilitiesVocabularyTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/CapabilitiesVocabularyTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/CommunityVocabularyTests.Async.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/CommunityVocabularyTests.Async.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/CommunityVocabularyTests.Async.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/CommunityVocabularyTests.Async.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/CommunityVocabularyTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/CommunityVocabularyTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/CommunityVocabularyTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/CommunityVocabularyTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/CoreVocabularyTests.Async.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/CoreVocabularyTests.Async.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/CoreVocabularyTests.Async.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/CoreVocabularyTests.Async.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/CoreVocabularyTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/CoreVocabularyTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/CoreVocabularyTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/CoreVocabularyTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/IEdmTermExtensionsTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/IEdmTermExtensionsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/IEdmTermExtensionsTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/IEdmTermExtensionsTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/MeasuresVocabularyTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/MeasuresVocabularyTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/MeasuresVocabularyTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/MeasuresVocabularyTests.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/ValidationVocabularyTests.Async.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/ValidationVocabularyTests.Async.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/ValidationVocabularyTests.Async.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/ValidationVocabularyTests.Async.cs
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/ValidationVocabularyTests.cs b/test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/ValidationVocabularyTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.OData.Edm.Tests/Vocabularies/ValidationVocabularyTests.cs
rename to test/UnitTests/Microsoft.OData.Edm.Tests/Vocabularies/ValidationVocabularyTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/ActionOnDisposeTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/ActionOnDisposeTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/ActionOnDisposeTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/ActionOnDisposeTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/CoordinateSystemTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/CoordinateSystemTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/CoordinateSystemTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/CoordinateSystemTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/DataServicesSpatialImplementationTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/DataServicesSpatialImplementationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/DataServicesSpatialImplementationTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/DataServicesSpatialImplementationTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/ForwardingSegmentTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/ForwardingSegmentTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/ForwardingSegmentTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/ForwardingSegmentTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/GeoJsonObjectReaderTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/GeoJsonObjectReaderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/GeoJsonObjectReaderTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/GeoJsonObjectReaderTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/GeoJsonObjectWriterTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/GeoJsonObjectWriterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/GeoJsonObjectWriterTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/GeoJsonObjectWriterTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/GeographyBuilderImplementationTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/GeographyBuilderImplementationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/GeographyBuilderImplementationTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/GeographyBuilderImplementationTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/GeographyFactoryTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/GeographyFactoryTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/GeographyFactoryTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/GeographyFactoryTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/GeographyPointTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/GeographyPointTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/GeographyPointTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/GeographyPointTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/GeographyPositionTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/GeographyPositionTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/GeographyPositionTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/GeographyPositionTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/GeometryBuilderTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/GeometryBuilderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/GeometryBuilderTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/GeometryBuilderTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/GeometryFactoryTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/GeometryFactoryTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/GeometryFactoryTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/GeometryFactoryTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/GeometryPointTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/GeometryPointTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/GeometryPointTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/GeometryPointTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/GeometryPositionTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/GeometryPositionTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/GeometryPositionTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/GeometryPositionTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/GmlReaderTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/GmlReaderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/GmlReaderTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/GmlReaderTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/GmlWriterTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/GmlWriterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/GmlWriterTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/GmlWriterTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/LoggingPipelines.cs b/test/UnitTests/Microsoft.Spatial.Tests/LoggingPipelines.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/LoggingPipelines.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/LoggingPipelines.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/Microsoft.Spatial.Tests.NetCore.csproj b/test/UnitTests/Microsoft.Spatial.Tests/Microsoft.Spatial.Tests.NetCore.csproj
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/Microsoft.Spatial.Tests.NetCore.csproj
rename to test/UnitTests/Microsoft.Spatial.Tests/Microsoft.Spatial.Tests.NetCore.csproj
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/Microsoft.Spatial.Tests.csproj b/test/UnitTests/Microsoft.Spatial.Tests/Microsoft.Spatial.Tests.csproj
similarity index 93%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/Microsoft.Spatial.Tests.csproj
rename to test/UnitTests/Microsoft.Spatial.Tests/Microsoft.Spatial.Tests.csproj
index f4fa240851..c8b240bd67 100644
--- a/test/FunctionalTests/Microsoft.Spatial.Tests/Microsoft.Spatial.Tests.csproj
+++ b/test/UnitTests/Microsoft.Spatial.Tests/Microsoft.Spatial.Tests.csproj
@@ -46,7 +46,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Microsoft.OData.Edm\Microsoft.OData.Edm.csproj" />
     <ProjectReference Include="..\..\..\src\Microsoft.Spatial\Microsoft.Spatial.csproj" />
-    <ProjectReference Include="..\Microsoft.OData.TestCommon\Microsoft.OData.TestCommon.csproj" />
+    <ProjectReference Include="..\..\Common\Microsoft.OData.TestCommon\Microsoft.OData.TestCommon.csproj" />
   </ItemGroup>
   
   <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(TargetFramework)' == 'net48'">
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/PositionData.cs b/test/UnitTests/Microsoft.Spatial.Tests/PositionData.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/PositionData.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/PositionData.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/Properties/AssemblyInfo.cs b/test/UnitTests/Microsoft.Spatial.Tests/Properties/AssemblyInfo.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/Properties/AssemblyInfo.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/Properties/AssemblyInfo.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/ScenarioTests/SpatialEqualityTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/ScenarioTests/SpatialEqualityTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/ScenarioTests/SpatialEqualityTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/ScenarioTests/SpatialEqualityTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/ScenarioTests/SpatialFormatterRoundTripTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/ScenarioTests/SpatialFormatterRoundTripTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/ScenarioTests/SpatialFormatterRoundTripTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/ScenarioTests/SpatialFormatterRoundTripTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/SpatialImplementationTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/SpatialImplementationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/SpatialImplementationTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/SpatialImplementationTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/SpatialOperationsTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/SpatialOperationsTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/SpatialOperationsTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/SpatialOperationsTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/SpatialPipelineTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/SpatialPipelineTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/SpatialPipelineTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/SpatialPipelineTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/SpatialReaderTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/SpatialReaderTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/SpatialReaderTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/SpatialReaderTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/SpatialTestUtils.cs b/test/UnitTests/Microsoft.Spatial.Tests/SpatialTestUtils.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/SpatialTestUtils.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/SpatialTestUtils.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/SpatialValidatorImplementationTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/SpatialValidatorImplementationTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/SpatialValidatorImplementationTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/SpatialValidatorImplementationTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/SpatialValidatorTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/SpatialValidatorTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/SpatialValidatorTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/SpatialValidatorTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/TestData.cs b/test/UnitTests/Microsoft.Spatial.Tests/TestData.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/TestData.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/TestData.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/TestSpatialFormatter.cs b/test/UnitTests/Microsoft.Spatial.Tests/TestSpatialFormatter.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/TestSpatialFormatter.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/TestSpatialFormatter.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/TextLexerBaseTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/TextLexerBaseTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/TextLexerBaseTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/TextLexerBaseTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/ThrowingTextReader.cs b/test/UnitTests/Microsoft.Spatial.Tests/ThrowingTextReader.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/ThrowingTextReader.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/ThrowingTextReader.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/WellKnownTextSqlFormatterTests.cs b/test/UnitTests/Microsoft.Spatial.Tests/WellKnownTextSqlFormatterTests.cs
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/WellKnownTextSqlFormatterTests.cs
rename to test/UnitTests/Microsoft.Spatial.Tests/WellKnownTextSqlFormatterTests.cs
diff --git a/test/FunctionalTests/Microsoft.Spatial.Tests/testkey.snk b/test/UnitTests/Microsoft.Spatial.Tests/testkey.snk
similarity index 100%
rename from test/FunctionalTests/Microsoft.Spatial.Tests/testkey.snk
rename to test/UnitTests/Microsoft.Spatial.Tests/testkey.snk