diff --git a/CodeCoverage.runsettings b/CodeCoverage.runsettings
new file mode 100644
index 0000000..6c52885
--- /dev/null
+++ b/CodeCoverage.runsettings
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- File name extension must be .runsettings -->
+<RunSettings>
+  <DataCollectionRunSettings>
+    <DataCollectors>
+      <DataCollector friendlyName="Code Coverage" uri="datacollector://Microsoft/CodeCoverage/2.0" assemblyQualifiedName="Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+        <Configuration>
+          <CodeCoverage>
+            <!--
+Additional paths to search for .pdb (symbol) files. Symbols must be found for modules to be instrumented.
+If .pdb files are in the same folder as the .dll or .exe files, they are automatically found. Otherwise, specify them here.
+Note that searching for symbols increases code coverage runtime. So keep this small and local.
+-->
+            <!--
+            <SymbolSearchPaths>
+                   <Path>C:\Users\User\Documents\Visual Studio 2012\Projects\ProjectX\bin\Debug</Path>
+                   <Path>\\mybuildshare\builds\ProjectX</Path>
+            </SymbolSearchPaths>
+-->
+
+            <!--
+About include/exclude lists:
+Empty "Include" clauses imply all; empty "Exclude" clauses imply none.
+Each element in the list is a regular expression (ECMAScript syntax). See https://docs.microsoft.com/visualstudio/ide/using-regular-expressions-in-visual-studio.
+An item must first match at least one entry in the include list to be included.
+Included items must then not match any entries in the exclude list to remain included.
+-->
+
+            <!-- Match assembly file paths: -->
+            <ModulePaths>
+              <Exclude>
+                <ModulePath>.*guardclauses\.dll$</ModulePath>
+                <ModulePath>.*moq\.dll$</ModulePath>
+                <ModulePath>.*unittests\.dll$</ModulePath>
+              </Exclude>
+            </ModulePaths>
+
+            <!-- Match fully qualified names of functions: -->
+            <!-- (Use "\." to delimit namespaces in C# or Visual Basic, "::" in C++.) 
+            <Functions>
+              <Exclude>
+                <Function>^Fabrikam\.UnitTest\..*</Function>
+                <Function>^std::.*</Function>
+                <Function>^ATL::.*</Function>
+                <Function>.*::__GetTestMethodInfo.*</Function>
+                <Function>^Microsoft::VisualStudio::CppCodeCoverageFramework::.*</Function>
+                <Function>^Microsoft::VisualStudio::CppUnitTestFramework::.*</Function>
+              </Exclude>
+            </Functions> -->
+
+            <!-- Match attributes on any code element: -->
+            <Attributes>
+              <Exclude>
+                <!-- Don't forget "Attribute" at the end of the name 
+                <Attribute>^System\.Diagnostics\.DebuggerHiddenAttribute$</Attribute>
+                <Attribute>^System\.Diagnostics\.DebuggerNonUserCodeAttribute$</Attribute>
+                <Attribute>^System\.Runtime\.CompilerServices.CompilerGeneratedAttribute$</Attribute>
+                <Attribute>^System\.CodeDom\.Compiler.GeneratedCodeAttribute$</Attribute>
+                <Attribute>^System\.Diagnostics\.CodeAnalysis.ExcludeFromCodeCoverageAttribute$</Attribute>-->
+              </Exclude>
+            </Attributes>
+
+            <!-- Match the path of the source files in which each method is defined:
+            <Sources>
+              <Exclude>
+                <Source>.*\\atlmfc\\.*</Source>
+                <Source>.*\\vctools\\.*</Source>
+                <Source>.*\\public\\sdk\\.*</Source>
+                <Source>.*\\microsoft sdks\\.*</Source>
+                <Source>.*\\vc\\include\\.*</Source>
+              </Exclude>
+            </Sources> -->
+
+            <!-- Match the company name property in the assembly: -->
+            <CompanyNames>
+              <Exclude>
+                <CompanyName>.*microsoft.*</CompanyName>
+              </Exclude>
+            </CompanyNames>
+
+            <!-- Match the public key token of a signed assembly: -->
+            <PublicKeyTokens>
+              <!-- Exclude Visual Studio extensions: 
+              <Exclude>
+                <PublicKeyToken>^B77A5C561934E089$</PublicKeyToken>
+                <PublicKeyToken>^B03F5F7F11D50A3A$</PublicKeyToken>
+                <PublicKeyToken>^31BF3856AD364E35$</PublicKeyToken>
+                <PublicKeyToken>^89845DCD8080CC91$</PublicKeyToken>
+                <PublicKeyToken>^71E9BCE111E9429C$</PublicKeyToken>
+                <PublicKeyToken>^8F50407C4E9E73B6$</PublicKeyToken>
+                <PublicKeyToken>^E361AF139669C375$</PublicKeyToken>
+              </Exclude>-->
+            </PublicKeyTokens>
+
+            <!-- We recommend you do not change the following values: -->
+            <UseVerifiableInstrumentation>True</UseVerifiableInstrumentation>
+            <AllowLowIntegrityProcesses>True</AllowLowIntegrityProcesses>
+            <CollectFromChildProcesses>True</CollectFromChildProcesses>
+            <CollectAspDotNet>False</CollectAspDotNet>
+
+          </CodeCoverage>
+        </Configuration>
+      </DataCollector>
+    </DataCollectors>
+  </DataCollectionRunSettings>
+</RunSettings>
\ No newline at end of file
diff --git a/eShopOnWeb.sln b/eShopOnWeb.sln
index 609ebbc..71ac5fd 100644
--- a/eShopOnWeb.sln
+++ b/eShopOnWeb.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26730.16
@@ -10,6 +10,9 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationCore", "src\ApplicationCore\ApplicationCore.csproj", "{7FED7440-2311-4D1E-958B-3E887C585CD2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{15EA4737-125B-4E6E-A806-E13B7EBCDCCF}"
+	ProjectSection(SolutionItems) = preProject
+		CodeCoverage.runsettings = CodeCoverage.runsettings
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "tests\UnitTests\UnitTests.csproj", "{EF6877E6-59CB-43A7-8C2C-E70DD70CC5B6}"
 EndProject
diff --git a/tests/UnitTests/ApplicationCore/Entities/BasketTests/AddItem.cs b/tests/UnitTests/ApplicationCore/Entities/BasketTests/BasketAddItem.cs
similarity index 98%
rename from tests/UnitTests/ApplicationCore/Entities/BasketTests/AddItem.cs
rename to tests/UnitTests/ApplicationCore/Entities/BasketTests/BasketAddItem.cs
index 3849ec1..6df2254 100644
--- a/tests/UnitTests/ApplicationCore/Entities/BasketTests/AddItem.cs
+++ b/tests/UnitTests/ApplicationCore/Entities/BasketTests/BasketAddItem.cs
@@ -4,7 +4,7 @@ using Xunit;
 
 namespace Microsoft.eShopWeb.UnitTests.ApplicationCore.Entities.BasketTests
 {
-    public class Total
+    public class BasketAddItem
     {
         private int _testCatalogItemId = 123;
         private decimal _testUnitPrice = 1.23m;
diff --git a/tests/UnitTests/ApplicationCore/Entities/OrderTests/Total.cs b/tests/UnitTests/ApplicationCore/Entities/OrderTests/OrderTotal.cs
similarity index 97%
rename from tests/UnitTests/ApplicationCore/Entities/OrderTests/Total.cs
rename to tests/UnitTests/ApplicationCore/Entities/OrderTests/OrderTotal.cs
index 2997c68..8a6547d 100644
--- a/tests/UnitTests/ApplicationCore/Entities/OrderTests/Total.cs
+++ b/tests/UnitTests/ApplicationCore/Entities/OrderTests/OrderTotal.cs
@@ -5,7 +5,7 @@ using Xunit;
 
 namespace Microsoft.eShopWeb.UnitTests.ApplicationCore.Entities.OrderTests
 {
-    public class Total
+    public class OrderTotal
     {
         private decimal _testUnitPrice = 42m;
 
diff --git a/tests/XUnitTestProject1/UnitTest1.cs b/tests/XUnitTestProject1/UnitTest1.cs
deleted file mode 100644
index ded6b0c..0000000
--- a/tests/XUnitTestProject1/UnitTest1.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using Xunit;
-
-namespace XUnitTestProject1
-{
-    public class UnitTest1
-    {
-        [Fact]
-        public void Test1()
-        {
-
-        }
-    }
-}
diff --git a/tests/XUnitTestProject1/XUnitTestProject1.csproj b/tests/XUnitTestProject1/XUnitTestProject1.csproj
deleted file mode 100644
index 3e02510..0000000
--- a/tests/XUnitTestProject1/XUnitTestProject1.csproj
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
-  </ItemGroup>
-
-</Project>