diff --git a/eShopOnContainers-ServicesAndWebApps.sln b/eShopOnContainers-ServicesAndWebApps.sln
index ba5bfd6c65..d3b8a8db8f 100644
--- a/eShopOnContainers-ServicesAndWebApps.sln
+++ b/eShopOnContainers-ServicesAndWebApps.sln
@@ -132,10 +132,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ordering.FunctionalTests",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Marketing.FunctionalTests", "src\Services\Marketing\Marketing.FunctionalTests\Marketing.FunctionalTests.csproj", "{94176D9B-9CAA-4762-8D12-1621E240EE34}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests", "test\ServicesTests\FunctionalTests\FunctionalTests.csproj", "{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoadTest", "test\ServicesTests\LoadTest\LoadTest.csproj", "{969E793C-C413-490E-9C9D-B2B46DA5AF32}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Application.FunctionalTests", "test\ServicesTests\Application.FunctionalTests\Application.FunctionalTests.csproj", "{639BB197-D112-47A7-A44A-471DDB0FA1AE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2751AC5C-D148-4D7A-AE8F-149B47C9A82D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5FB21302-3973-4992-962A-6F87F5EC99FD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{C3F6ED48-E26D-4D57-970F-B82E69467BA1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{32EE4736-7534-47EC-BAAD-C00AF3130F80}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{120CABB3-0FEA-4B40-B4B5-2D3041798C80}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -1686,54 +1696,6 @@ Global
 		{94176D9B-9CAA-4762-8D12-1621E240EE34}.Release|x64.Build.0 = Release|Any CPU
 		{94176D9B-9CAA-4762-8D12-1621E240EE34}.Release|x86.ActiveCfg = Release|Any CPU
 		{94176D9B-9CAA-4762-8D12-1621E240EE34}.Release|x86.Build.0 = Release|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.AppStore|ARM.ActiveCfg = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.AppStore|ARM.Build.0 = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.AppStore|x64.ActiveCfg = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.AppStore|x64.Build.0 = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.AppStore|x86.ActiveCfg = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.AppStore|x86.Build.0 = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Debug|ARM.Build.0 = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Debug|x64.Build.0 = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Debug|x86.Build.0 = Debug|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Release|ARM.ActiveCfg = Release|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Release|ARM.Build.0 = Release|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Release|iPhone.Build.0 = Release|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Release|x64.ActiveCfg = Release|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Release|x64.Build.0 = Release|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Release|x86.ActiveCfg = Release|Any CPU
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2}.Release|x86.Build.0 = Release|Any CPU
 		{969E793C-C413-490E-9C9D-B2B46DA5AF32}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
 		{969E793C-C413-490E-9C9D-B2B46DA5AF32}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
 		{969E793C-C413-490E-9C9D-B2B46DA5AF32}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
@@ -1782,6 +1744,54 @@ Global
 		{969E793C-C413-490E-9C9D-B2B46DA5AF32}.Release|x64.Build.0 = Release|Any CPU
 		{969E793C-C413-490E-9C9D-B2B46DA5AF32}.Release|x86.ActiveCfg = Release|Any CPU
 		{969E793C-C413-490E-9C9D-B2B46DA5AF32}.Release|x86.Build.0 = Release|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.AppStore|x64.Build.0 = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.AppStore|x86.Build.0 = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Debug|ARM.Build.0 = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Debug|x64.Build.0 = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Debug|x86.Build.0 = Debug|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Release|ARM.ActiveCfg = Release|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Release|ARM.Build.0 = Release|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Release|iPhone.Build.0 = Release|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Release|x64.ActiveCfg = Release|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Release|x64.Build.0 = Release|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Release|x86.ActiveCfg = Release|Any CPU
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1831,16 +1841,21 @@ Global
 		{AF0828DB-8BDD-411A-AEEF-B780FBB8D8C1} = {28C0F5C8-4849-4035-80AB-45639424E73F}
 		{7D63ED4A-3EDA-4BBA-8BBA-F46BD6430931} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
 		{E1D2B260-4E7F-4A88-BC13-9910F7C44623} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
-		{9D9CE4E4-1DD0-4961-861F-219731DE06CE} = {BF3EF4F3-E4F5-41DA-9D2D-57223687D1A8}
-		{791961C7-3F3E-434E-B2BA-B4D6B5E222B0} = {326A7FB3-5295-468C-A4FE-67DCB823E1E5}
-		{3F6202D0-2842-4C2F-98E1-9462709EAFBE} = {BF3EF4F3-E4F5-41DA-9D2D-57223687D1A8}
-		{B1182FD9-C245-4018-8412-C66F290C7F4C} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
-		{38107691-A437-461D-A85C-ACD3AC7ACFAB} = {326A7FB3-5295-468C-A4FE-67DCB823E1E5}
-		{16F463AA-9CF6-44DC-B18C-7310CCF663FF} = {41139F64-4046-4F16-96B7-D941D96FA9C6}
-		{DA7D3E03-D0B6-4591-8143-779D3E9F3F30} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
-		{94176D9B-9CAA-4762-8D12-1621E240EE34} = {A5260DE0-1FDD-467E-9CC1-A028AB081CEE}
-		{C2B987D5-DB2E-4363-9CA4-7DE8739494F2} = {EF0337F2-ED00-4643-89FD-EE10863F1870}
+		{9D9CE4E4-1DD0-4961-861F-219731DE06CE} = {2751AC5C-D148-4D7A-AE8F-149B47C9A82D}
+		{791961C7-3F3E-434E-B2BA-B4D6B5E222B0} = {5FB21302-3973-4992-962A-6F87F5EC99FD}
+		{3F6202D0-2842-4C2F-98E1-9462709EAFBE} = {2751AC5C-D148-4D7A-AE8F-149B47C9A82D}
+		{B1182FD9-C245-4018-8412-C66F290C7F4C} = {120CABB3-0FEA-4B40-B4B5-2D3041798C80}
+		{38107691-A437-461D-A85C-ACD3AC7ACFAB} = {5FB21302-3973-4992-962A-6F87F5EC99FD}
+		{16F463AA-9CF6-44DC-B18C-7310CCF663FF} = {C3F6ED48-E26D-4D57-970F-B82E69467BA1}
+		{DA7D3E03-D0B6-4591-8143-779D3E9F3F30} = {120CABB3-0FEA-4B40-B4B5-2D3041798C80}
+		{94176D9B-9CAA-4762-8D12-1621E240EE34} = {32EE4736-7534-47EC-BAAD-C00AF3130F80}
 		{969E793C-C413-490E-9C9D-B2B46DA5AF32} = {EF0337F2-ED00-4643-89FD-EE10863F1870}
+		{639BB197-D112-47A7-A44A-471DDB0FA1AE} = {EF0337F2-ED00-4643-89FD-EE10863F1870}
+		{2751AC5C-D148-4D7A-AE8F-149B47C9A82D} = {BF3EF4F3-E4F5-41DA-9D2D-57223687D1A8}
+		{5FB21302-3973-4992-962A-6F87F5EC99FD} = {326A7FB3-5295-468C-A4FE-67DCB823E1E5}
+		{C3F6ED48-E26D-4D57-970F-B82E69467BA1} = {41139F64-4046-4F16-96B7-D941D96FA9C6}
+		{32EE4736-7534-47EC-BAAD-C00AF3130F80} = {A5260DE0-1FDD-467E-9CC1-A028AB081CEE}
+		{120CABB3-0FEA-4B40-B4B5-2D3041798C80} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {25728519-5F0F-4973-8A64-0A81EB4EA8D9}
diff --git a/eShopOnContainers.sln b/eShopOnContainers.sln
index 19807a5c7d..9992035574 100644
--- a/eShopOnContainers.sln
+++ b/eShopOnContainers.sln
@@ -127,10 +127,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ordering.FunctionalTests",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ordering.UnitTests", "src\Services\Ordering\Ordering.UnitTests\Ordering.UnitTests.csproj", "{0A9643F2-FF99-4DA0-BC2B-D62D5D3C317A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests", "test\ServicesTests\FunctionalTests\FunctionalTests.csproj", "{F6CB895D-5C9B-4081-B13D-12C56C20A717}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoadTest", "test\ServicesTests\LoadTest\LoadTest.csproj", "{969E793C-C413-490E-9C9D-B2B46DA5AF32}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Application.FunctionalTests", "test\ServicesTests\Application.FunctionalTests\Application.FunctionalTests.csproj", "{3572B4E2-4399-4797-B5C2-3720D870E0C3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{7BA332A2-189D-4D03-9935-FDFF81C42496}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2F0DEF71-84AC-4212-86D4-E36E8896BDBF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2B26A7AA-6D61-42FA-8AB7-C0F05AAE7F1C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DA1786E4-30AB-434E-A827-92896390B79D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{30308DE0-8128-4613-BCAD-B0BEFFB20E38}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -1961,54 +1971,6 @@ Global
 		{0A9643F2-FF99-4DA0-BC2B-D62D5D3C317A}.Release|x64.Build.0 = Release|Any CPU
 		{0A9643F2-FF99-4DA0-BC2B-D62D5D3C317A}.Release|x86.ActiveCfg = Release|Any CPU
 		{0A9643F2-FF99-4DA0-BC2B-D62D5D3C317A}.Release|x86.Build.0 = Release|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.AppStore|ARM.ActiveCfg = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.AppStore|ARM.Build.0 = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.AppStore|x64.ActiveCfg = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.AppStore|x64.Build.0 = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.AppStore|x86.ActiveCfg = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.AppStore|x86.Build.0 = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Debug|ARM.Build.0 = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Debug|x64.Build.0 = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Debug|x86.Build.0 = Debug|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Release|ARM.ActiveCfg = Release|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Release|ARM.Build.0 = Release|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Release|iPhone.Build.0 = Release|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Release|x64.ActiveCfg = Release|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Release|x64.Build.0 = Release|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Release|x86.ActiveCfg = Release|Any CPU
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717}.Release|x86.Build.0 = Release|Any CPU
 		{969E793C-C413-490E-9C9D-B2B46DA5AF32}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
 		{969E793C-C413-490E-9C9D-B2B46DA5AF32}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
 		{969E793C-C413-490E-9C9D-B2B46DA5AF32}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
@@ -2057,6 +2019,54 @@ Global
 		{969E793C-C413-490E-9C9D-B2B46DA5AF32}.Release|x64.Build.0 = Release|Any CPU
 		{969E793C-C413-490E-9C9D-B2B46DA5AF32}.Release|x86.ActiveCfg = Release|Any CPU
 		{969E793C-C413-490E-9C9D-B2B46DA5AF32}.Release|x86.Build.0 = Release|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.AppStore|x64.Build.0 = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.AppStore|x86.Build.0 = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Debug|ARM.Build.0 = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Debug|x64.Build.0 = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Debug|x86.Build.0 = Debug|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Release|ARM.ActiveCfg = Release|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Release|ARM.Build.0 = Release|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Release|iPhone.Build.0 = Release|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Release|x64.ActiveCfg = Release|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Release|x64.Build.0 = Release|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Release|x86.ActiveCfg = Release|Any CPU
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2110,16 +2120,21 @@ Global
 		{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3} = {0AAED9FF-3260-43BB-B586-9AAF1E010A90}
 		{A7337243-33B8-463A-87AD-944B75EFD820} = {0AAED9FF-3260-43BB-B586-9AAF1E010A90}
 		{16CDE5D2-2DDE-4AF2-B902-AD9CC42DE480} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
-		{9F00E62F-E180-4A9C-8794-98A72AFAC2DB} = {BF3EF4F3-E4F5-41DA-9D2D-57223687D1A8}
-		{63417272-1E6A-406A-AD11-C738558D89C0} = {BF3EF4F3-E4F5-41DA-9D2D-57223687D1A8}
-		{56E0E455-731E-41CB-AF46-C1A70F8A140B} = {326A7FB3-5295-468C-A4FE-67DCB823E1E5}
-		{1EB6680D-4AC8-47EF-A026-E4EEEE93CAD5} = {326A7FB3-5295-468C-A4FE-67DCB823E1E5}
-		{4F0E5CB2-5795-4040-8637-1D395914C944} = {41139F64-4046-4F16-96B7-D941D96FA9C6}
-		{22F59DDE-D0BC-4D58-BCDE-240C7EEBECB8} = {A5260DE0-1FDD-467E-9CC1-A028AB081CEE}
-		{5A155B15-D8E7-47FE-8D17-8E641726158C} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
-		{0A9643F2-FF99-4DA0-BC2B-D62D5D3C317A} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
-		{F6CB895D-5C9B-4081-B13D-12C56C20A717} = {EF0337F2-ED00-4643-89FD-EE10863F1870}
+		{9F00E62F-E180-4A9C-8794-98A72AFAC2DB} = {7BA332A2-189D-4D03-9935-FDFF81C42496}
+		{63417272-1E6A-406A-AD11-C738558D89C0} = {7BA332A2-189D-4D03-9935-FDFF81C42496}
+		{56E0E455-731E-41CB-AF46-C1A70F8A140B} = {2F0DEF71-84AC-4212-86D4-E36E8896BDBF}
+		{1EB6680D-4AC8-47EF-A026-E4EEEE93CAD5} = {2F0DEF71-84AC-4212-86D4-E36E8896BDBF}
+		{4F0E5CB2-5795-4040-8637-1D395914C944} = {2B26A7AA-6D61-42FA-8AB7-C0F05AAE7F1C}
+		{22F59DDE-D0BC-4D58-BCDE-240C7EEBECB8} = {DA1786E4-30AB-434E-A827-92896390B79D}
+		{5A155B15-D8E7-47FE-8D17-8E641726158C} = {30308DE0-8128-4613-BCAD-B0BEFFB20E38}
+		{0A9643F2-FF99-4DA0-BC2B-D62D5D3C317A} = {30308DE0-8128-4613-BCAD-B0BEFFB20E38}
 		{969E793C-C413-490E-9C9D-B2B46DA5AF32} = {EF0337F2-ED00-4643-89FD-EE10863F1870}
+		{3572B4E2-4399-4797-B5C2-3720D870E0C3} = {EF0337F2-ED00-4643-89FD-EE10863F1870}
+		{7BA332A2-189D-4D03-9935-FDFF81C42496} = {BF3EF4F3-E4F5-41DA-9D2D-57223687D1A8}
+		{2F0DEF71-84AC-4212-86D4-E36E8896BDBF} = {326A7FB3-5295-468C-A4FE-67DCB823E1E5}
+		{2B26A7AA-6D61-42FA-8AB7-C0F05AAE7F1C} = {41139F64-4046-4F16-96B7-D941D96FA9C6}
+		{DA1786E4-30AB-434E-A827-92896390B79D} = {A5260DE0-1FDD-467E-9CC1-A028AB081CEE}
+		{30308DE0-8128-4613-BCAD-B0BEFFB20E38} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {25728519-5F0F-4973-8A64-0A81EB4EA8D9}
diff --git a/src/Services/Basket/Basket.UnitTests/Application/BasketWebApiTest.cs b/src/Services/Basket/Basket.UnitTests/Application/BasketWebApiTest.cs
index 636375ef70..88dda058d5 100644
--- a/src/Services/Basket/Basket.UnitTests/Application/BasketWebApiTest.cs
+++ b/src/Services/Basket/Basket.UnitTests/Application/BasketWebApiTest.cs
@@ -1,5 +1,6 @@
 using Basket.API.IntegrationEvents.Events;
 using Basket.API.Model;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
 using Microsoft.eShopOnContainers.Services.Basket.API.Controllers;
@@ -7,6 +8,7 @@
 using Moq;
 using System;
 using System.Collections.Generic;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Xunit;
 using IBasketIdentityService = Microsoft.eShopOnContainers.Services.Basket.API.Services.IIdentityService;
@@ -93,15 +95,29 @@ public async Task Doing_Checkout_Wit_Basket_Should_Publish_UserCheckoutAccepted_
         {
             var fakeCustomerId = "1";
             var fakeCustomerBasket = GetCustomerBasketFake(fakeCustomerId);
+
             _basketRepositoryMock.Setup(x => x.GetBasketAsync(It.IsAny<string>()))
                  .Returns(Task.FromResult(fakeCustomerBasket));
+
             _identityServiceMock.Setup(x => x.GetUserIdentity()).Returns(fakeCustomerId);
-            //Act
+
             var basketController = new BasketController(
                 _basketRepositoryMock.Object, _identityServiceMock.Object, _serviceBusMock.Object);
 
+            basketController.ControllerContext = new ControllerContext()
+            {
+                HttpContext = new DefaultHttpContext()
+                {
+                    User = new ClaimsPrincipal(
+                        new ClaimsIdentity(new Claim[] { new Claim("unique_name", "testuser") }))
+                }
+            };
+
+            //Act
             var result = await basketController.Checkout(new BasketCheckout(), Guid.NewGuid().ToString()) as AcceptedResult;
+
             _serviceBusMock.Verify(mock => mock.Publish(It.IsAny<UserCheckoutAcceptedIntegrationEvent>()), Times.Once);
+
             Assert.NotNull(result);
         }
 
diff --git a/src/Services/Ordering/Ordering.UnitTests/Application/OrdersWebApiTest.cs b/src/Services/Ordering/Ordering.UnitTests/Application/OrdersWebApiTest.cs
index 516f9ba540..aadd6c62a2 100644
--- a/src/Services/Ordering/Ordering.UnitTests/Application/OrdersWebApiTest.cs
+++ b/src/Services/Ordering/Ordering.UnitTests/Application/OrdersWebApiTest.cs
@@ -94,6 +94,10 @@ public async Task Get_orders_success()
         {
             //Arrange
             var fakeDynamicResult = Enumerable.Empty<OrderSummary>();
+
+            _identityServiceMock.Setup(x => x.GetUserIdentity())
+                .Returns(Guid.NewGuid().ToString());
+
             _orderQueriesMock.Setup(x => x.GetOrdersFromUserAsync(Guid.NewGuid()))
                 .Returns(Task.FromResult(fakeDynamicResult));
 
diff --git a/test/ServicesTests/FunctionalTests/FunctionalTests.csproj b/test/ServicesTests/Application.FunctionalTests/Application.FunctionalTests.csproj
similarity index 100%
rename from test/ServicesTests/FunctionalTests/FunctionalTests.csproj
rename to test/ServicesTests/Application.FunctionalTests/Application.FunctionalTests.csproj
diff --git a/test/ServicesTests/FunctionalTests/Extensions/HttpClientExtensions.cs b/test/ServicesTests/Application.FunctionalTests/Extensions/HttpClientExtensions.cs
similarity index 100%
rename from test/ServicesTests/FunctionalTests/Extensions/HttpClientExtensions.cs
rename to test/ServicesTests/Application.FunctionalTests/Extensions/HttpClientExtensions.cs
diff --git a/test/ServicesTests/FunctionalTests/Middleware/AutoAuthorizeMiddleware.cs b/test/ServicesTests/Application.FunctionalTests/Middleware/AutoAuthorizeMiddleware.cs
similarity index 100%
rename from test/ServicesTests/FunctionalTests/Middleware/AutoAuthorizeMiddleware.cs
rename to test/ServicesTests/Application.FunctionalTests/Middleware/AutoAuthorizeMiddleware.cs
diff --git a/test/ServicesTests/FunctionalTests/Services/Basket/BasketScenariosBase.cs b/test/ServicesTests/Application.FunctionalTests/Services/Basket/BasketScenariosBase.cs
similarity index 100%
rename from test/ServicesTests/FunctionalTests/Services/Basket/BasketScenariosBase.cs
rename to test/ServicesTests/Application.FunctionalTests/Services/Basket/BasketScenariosBase.cs
diff --git a/test/ServicesTests/FunctionalTests/Services/Basket/BasketTestsStartup.cs b/test/ServicesTests/Application.FunctionalTests/Services/Basket/BasketTestsStartup.cs
similarity index 100%
rename from test/ServicesTests/FunctionalTests/Services/Basket/BasketTestsStartup.cs
rename to test/ServicesTests/Application.FunctionalTests/Services/Basket/BasketTestsStartup.cs
diff --git a/test/ServicesTests/FunctionalTests/Services/Basket/appsettings.json b/test/ServicesTests/Application.FunctionalTests/Services/Basket/appsettings.json
similarity index 100%
rename from test/ServicesTests/FunctionalTests/Services/Basket/appsettings.json
rename to test/ServicesTests/Application.FunctionalTests/Services/Basket/appsettings.json
diff --git a/test/ServicesTests/FunctionalTests/Services/Catalog/CatalogScenariosBase.cs b/test/ServicesTests/Application.FunctionalTests/Services/Catalog/CatalogScenariosBase.cs
similarity index 100%
rename from test/ServicesTests/FunctionalTests/Services/Catalog/CatalogScenariosBase.cs
rename to test/ServicesTests/Application.FunctionalTests/Services/Catalog/CatalogScenariosBase.cs
diff --git a/test/ServicesTests/FunctionalTests/Services/Catalog/appsettings.json b/test/ServicesTests/Application.FunctionalTests/Services/Catalog/appsettings.json
similarity index 100%
rename from test/ServicesTests/FunctionalTests/Services/Catalog/appsettings.json
rename to test/ServicesTests/Application.FunctionalTests/Services/Catalog/appsettings.json
diff --git a/test/ServicesTests/FunctionalTests/Services/IntegrationEventsScenarios.cs b/test/ServicesTests/Application.FunctionalTests/Services/IntegrationEventsScenarios.cs
similarity index 100%
rename from test/ServicesTests/FunctionalTests/Services/IntegrationEventsScenarios.cs
rename to test/ServicesTests/Application.FunctionalTests/Services/IntegrationEventsScenarios.cs
diff --git a/test/ServicesTests/FunctionalTests/Services/Location/LocationsScenariosBase.cs b/test/ServicesTests/Application.FunctionalTests/Services/Location/LocationsScenariosBase.cs
similarity index 100%
rename from test/ServicesTests/FunctionalTests/Services/Location/LocationsScenariosBase.cs
rename to test/ServicesTests/Application.FunctionalTests/Services/Location/LocationsScenariosBase.cs
diff --git a/test/ServicesTests/FunctionalTests/Services/Location/LocationsTestsStartup.cs b/test/ServicesTests/Application.FunctionalTests/Services/Location/LocationsTestsStartup.cs
similarity index 100%
rename from test/ServicesTests/FunctionalTests/Services/Location/LocationsTestsStartup.cs
rename to test/ServicesTests/Application.FunctionalTests/Services/Location/LocationsTestsStartup.cs
diff --git a/test/ServicesTests/FunctionalTests/Services/Location/appsettings.json b/test/ServicesTests/Application.FunctionalTests/Services/Location/appsettings.json
similarity index 100%
rename from test/ServicesTests/FunctionalTests/Services/Location/appsettings.json
rename to test/ServicesTests/Application.FunctionalTests/Services/Location/appsettings.json
diff --git a/test/ServicesTests/FunctionalTests/Services/Marketing/CampaignScenariosBase.cs b/test/ServicesTests/Application.FunctionalTests/Services/Marketing/CampaignScenariosBase.cs
similarity index 100%
rename from test/ServicesTests/FunctionalTests/Services/Marketing/CampaignScenariosBase.cs
rename to test/ServicesTests/Application.FunctionalTests/Services/Marketing/CampaignScenariosBase.cs
diff --git a/test/ServicesTests/FunctionalTests/Services/Marketing/MarketingScenarios.cs b/test/ServicesTests/Application.FunctionalTests/Services/Marketing/MarketingScenarios.cs
similarity index 100%
rename from test/ServicesTests/FunctionalTests/Services/Marketing/MarketingScenarios.cs
rename to test/ServicesTests/Application.FunctionalTests/Services/Marketing/MarketingScenarios.cs
diff --git a/test/ServicesTests/FunctionalTests/Services/Marketing/MarketingScenariosBase.cs b/test/ServicesTests/Application.FunctionalTests/Services/Marketing/MarketingScenariosBase.cs
similarity index 100%
rename from test/ServicesTests/FunctionalTests/Services/Marketing/MarketingScenariosBase.cs
rename to test/ServicesTests/Application.FunctionalTests/Services/Marketing/MarketingScenariosBase.cs
diff --git a/test/ServicesTests/FunctionalTests/Services/Marketing/MarketingTestsStartup.cs b/test/ServicesTests/Application.FunctionalTests/Services/Marketing/MarketingTestsStartup.cs
similarity index 100%
rename from test/ServicesTests/FunctionalTests/Services/Marketing/MarketingTestsStartup.cs
rename to test/ServicesTests/Application.FunctionalTests/Services/Marketing/MarketingTestsStartup.cs
diff --git a/test/ServicesTests/FunctionalTests/Services/Marketing/UserLocationRoleScenariosBase.cs b/test/ServicesTests/Application.FunctionalTests/Services/Marketing/UserLocationRoleScenariosBase.cs
similarity index 100%
rename from test/ServicesTests/FunctionalTests/Services/Marketing/UserLocationRoleScenariosBase.cs
rename to test/ServicesTests/Application.FunctionalTests/Services/Marketing/UserLocationRoleScenariosBase.cs
diff --git a/test/ServicesTests/FunctionalTests/Services/Marketing/appsettings.json b/test/ServicesTests/Application.FunctionalTests/Services/Marketing/appsettings.json
similarity index 100%
rename from test/ServicesTests/FunctionalTests/Services/Marketing/appsettings.json
rename to test/ServicesTests/Application.FunctionalTests/Services/Marketing/appsettings.json
diff --git a/test/ServicesTests/FunctionalTests/Services/Ordering/OrderingScenarios.cs b/test/ServicesTests/Application.FunctionalTests/Services/Ordering/OrderingScenarios.cs
similarity index 100%
rename from test/ServicesTests/FunctionalTests/Services/Ordering/OrderingScenarios.cs
rename to test/ServicesTests/Application.FunctionalTests/Services/Ordering/OrderingScenarios.cs
diff --git a/test/ServicesTests/FunctionalTests/Services/Ordering/OrderingScenariosBase.cs b/test/ServicesTests/Application.FunctionalTests/Services/Ordering/OrderingScenariosBase.cs
similarity index 100%
rename from test/ServicesTests/FunctionalTests/Services/Ordering/OrderingScenariosBase.cs
rename to test/ServicesTests/Application.FunctionalTests/Services/Ordering/OrderingScenariosBase.cs
diff --git a/test/ServicesTests/FunctionalTests/Services/Ordering/OrderingTestsStartup.cs b/test/ServicesTests/Application.FunctionalTests/Services/Ordering/OrderingTestsStartup.cs
similarity index 100%
rename from test/ServicesTests/FunctionalTests/Services/Ordering/OrderingTestsStartup.cs
rename to test/ServicesTests/Application.FunctionalTests/Services/Ordering/OrderingTestsStartup.cs
diff --git a/test/ServicesTests/FunctionalTests/Services/Ordering/appsettings.json b/test/ServicesTests/Application.FunctionalTests/Services/Ordering/appsettings.json
similarity index 100%
rename from test/ServicesTests/FunctionalTests/Services/Ordering/appsettings.json
rename to test/ServicesTests/Application.FunctionalTests/Services/Ordering/appsettings.json
diff --git a/test/ServicesTests/FunctionalTests/Setup/CatalogBrands.csv b/test/ServicesTests/Application.FunctionalTests/Setup/CatalogBrands.csv
similarity index 100%
rename from test/ServicesTests/FunctionalTests/Setup/CatalogBrands.csv
rename to test/ServicesTests/Application.FunctionalTests/Setup/CatalogBrands.csv
diff --git a/test/ServicesTests/FunctionalTests/Setup/CatalogItems.csv b/test/ServicesTests/Application.FunctionalTests/Setup/CatalogItems.csv
similarity index 100%
rename from test/ServicesTests/FunctionalTests/Setup/CatalogItems.csv
rename to test/ServicesTests/Application.FunctionalTests/Setup/CatalogItems.csv
diff --git a/test/ServicesTests/FunctionalTests/Setup/CatalogItems.zip b/test/ServicesTests/Application.FunctionalTests/Setup/CatalogItems.zip
similarity index 100%
rename from test/ServicesTests/FunctionalTests/Setup/CatalogItems.zip
rename to test/ServicesTests/Application.FunctionalTests/Setup/CatalogItems.zip
diff --git a/test/ServicesTests/FunctionalTests/Setup/CatalogTypes.csv b/test/ServicesTests/Application.FunctionalTests/Setup/CatalogTypes.csv
similarity index 100%
rename from test/ServicesTests/FunctionalTests/Setup/CatalogTypes.csv
rename to test/ServicesTests/Application.FunctionalTests/Setup/CatalogTypes.csv