diff --git a/test/Services/FunctionalTests/Services/Locations/LocationsScenariosBase.cs b/test/Services/FunctionalTests/Services/Locations/LocationsScenariosBase.cs
index d63f3d4e7..ec3296908 100644
--- a/test/Services/FunctionalTests/Services/Locations/LocationsScenariosBase.cs
+++ b/test/Services/FunctionalTests/Services/Locations/LocationsScenariosBase.cs
@@ -10,7 +10,7 @@
         public TestServer CreateServer()
         {
             var webHostBuilder = new WebHostBuilder();
-            webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory() + "\\Services\\Locations");
+            webHostBuilder.UseContentRoot(Directory.GetCurrentDirectory() + "\\Services\\Location");
             webHostBuilder.UseStartup<LocationsTestsStartup>();
 
             return new TestServer(webHostBuilder);
diff --git a/test/Services/IntegrationTests/Services/Locations/LocationsScenarioBase.cs b/test/Services/IntegrationTests/Services/Locations/LocationsScenarioBase.cs
index f50aa1441..27b94e065 100644
--- a/test/Services/IntegrationTests/Services/Locations/LocationsScenarioBase.cs
+++ b/test/Services/IntegrationTests/Services/Locations/LocationsScenarioBase.cs
@@ -19,12 +19,12 @@ namespace IntegrationTests.Services.Locations
         {
             public static string Locations = "api/v1/locations";
 
-            public static string LocationBy(string id)
+            public static string LocationBy(int id)
             {
                 return $"api/v1/locations/{id}";
             }
 
-            public static string UserLocationBy(Guid id)
+            public static string UserLocationBy(string id)
             {
                 return $"api/v1/locations/user/{id}";
             }
diff --git a/test/Services/IntegrationTests/Services/Locations/LocationsScenarios.cs b/test/Services/IntegrationTests/Services/Locations/LocationsScenarios.cs
index ae69219f5..0a2d52c32 100644
--- a/test/Services/IntegrationTests/Services/Locations/LocationsScenarios.cs
+++ b/test/Services/IntegrationTests/Services/Locations/LocationsScenarios.cs
@@ -19,7 +19,7 @@ namespace IntegrationTests.Services.Locations
         {
             using (var server = CreateServer())
             {
-                var userId = new Guid("4611ce3f-380d-4db5-8d76-87a8689058ed");
+                var userId = "4611ce3f-380d-4db5-8d76-87a8689058ed";
                 var content = new StringContent(BuildLocationsRequest(-122.315752, 47.604610), UTF8Encoding.UTF8, "application/json");
 
                 // Expected result
@@ -51,7 +51,7 @@ namespace IntegrationTests.Services.Locations
         {
             using (var server = CreateServer())
             {
-                var userId = new Guid("4611ce3f-380d-4db5-8d76-87a8689058ed");
+                var userId = "4611ce3f-380d-4db5-8d76-87a8689058ed";
                 var content = new StringContent(BuildLocationsRequest(-122.119998, 47.690876), UTF8Encoding.UTF8, "application/json");
 
                 // Expected result
@@ -83,7 +83,7 @@ namespace IntegrationTests.Services.Locations
         {
             using (var server = CreateServer())
             {
-                var userId = new Guid("4611ce3f-380d-4db5-8d76-87a8689058ed");
+                var userId = "4611ce3f-380d-4db5-8d76-87a8689058ed";
                 var content = new StringContent(BuildLocationsRequest(-121.040360, 48.091631), UTF8Encoding.UTF8, "application/json");
 
                 // Expected result