diff --git a/backend/tools/TestSuite/TestSuite.ApiTests/AnonymousTests.cs b/backend/tools/TestSuite/TestSuite.ApiTests/AnonymousTests.cs
index 8a857a268..818afd586 100644
--- a/backend/tools/TestSuite/TestSuite.ApiTests/AnonymousTests.cs
+++ b/backend/tools/TestSuite/TestSuite.ApiTests/AnonymousTests.cs
@@ -45,7 +45,7 @@ namespace TestSuite.ApiTests
 
 
             // STEP 3: Check anonymous permission
-            var url = $"{_.ClientManager.Options.Url}/api/apps/{appName}/settings";
+            var url = $"{_.ClientManager.Options.Url}api/apps/{appName}/settings";
 
             using (var httpClient = new HttpClient())
             {
@@ -82,7 +82,7 @@ namespace TestSuite.ApiTests
 
 
             // STEP 3: Create a content.
-            var url = $"{_.ClientManager.Options.Url}/api/content/{appName}/my-content";
+            var url = $"{_.ClientManager.Options.Url}api/content/{appName}/my-content";
 
             using (var httpClient = new HttpClient())
             {
diff --git a/backend/tools/TestSuite/TestSuite.ApiTests/AssetFixture.cs b/backend/tools/TestSuite/TestSuite.ApiTests/AssetFixture.cs
index 58ab01b44..f709a6d15 100644
--- a/backend/tools/TestSuite/TestSuite.ApiTests/AssetFixture.cs
+++ b/backend/tools/TestSuite/TestSuite.ApiTests/AssetFixture.cs
@@ -18,7 +18,9 @@ namespace TestSuite.ApiTests
 
             using (var client = new HttpClient())
             {
-                var url = $"{ServerUrl}{asset._links["content"].Href}";
+                client.BaseAddress = new Uri(ServerUrl);
+
+                var url = asset._links["content"].Href;
 
                 if (version > 0)
                 {
diff --git a/backend/tools/TestSuite/TestSuite.ApiTests/ContentLanguageTests.cs b/backend/tools/TestSuite/TestSuite.ApiTests/ContentLanguageTests.cs
index d92421fbc..44c15bd33 100644
--- a/backend/tools/TestSuite/TestSuite.ApiTests/ContentLanguageTests.cs
+++ b/backend/tools/TestSuite/TestSuite.ApiTests/ContentLanguageTests.cs
@@ -112,7 +112,7 @@ namespace TestSuite.ApiTests
 
         private async Task<(string, string)> GetEtagAsync(string id, Dictionary<string, string> headers)
         {
-            var url = $"{_.ClientManager.Options.Url}/api/content/{_.AppName}/{_.SchemaName}/{id}";
+            var url = $"{_.ClientManager.Options.Url}api/content/{_.AppName}/{_.SchemaName}/{id}";
 
             using (var httpClient = _.ClientManager.CreateHttpClient())
             {
diff --git a/backend/tools/TestSuite/TestSuite.ApiTests/ContentQueryFixture.cs b/backend/tools/TestSuite/TestSuite.ApiTests/ContentQueryFixture.cs
index 0c9cd48c4..704d8f481 100644
--- a/backend/tools/TestSuite/TestSuite.ApiTests/ContentQueryFixture.cs
+++ b/backend/tools/TestSuite/TestSuite.ApiTests/ContentQueryFixture.cs
@@ -5,6 +5,8 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
+using System.Globalization;
+using Newtonsoft.Json.Linq;
 using Squidex.ClientLibrary;
 using TestSuite.Fixtures;
 using TestSuite.Model;
@@ -24,9 +26,25 @@ namespace TestSuite.ApiTests
 
             await DisposeAsync();
 
-            for (var i = 10; i > 0; i--)
+            for (var index = 10; index > 0; index--)
             {
-                var data = TestEntity.CreateTestEntry(i);
+                var data = new TestEntityData
+                {
+                    Number = index,
+                    Json = JObject.FromObject(new
+                    {
+                        nested1 = new
+                        {
+                            nested2 = index
+                        }
+                    }),
+                    Geo = GeoJson.Point(index, index, oldFormat: index % 2 == 1),
+                    Localized = new Dictionary<string, string>
+                    {
+                        ["en"] = index.ToString(CultureInfo.InvariantCulture)
+                    },
+                    String = index.ToString(CultureInfo.InvariantCulture),
+                };
 
                 await Contents.CreateAsync(data, ContentCreateOptions.AsPublish);
             }
diff --git a/backend/tools/TestSuite/TestSuite.ApiTests/OpenApiTests.cs b/backend/tools/TestSuite/TestSuite.ApiTests/OpenApiTests.cs
index 24f9edad7..35bc991bb 100644
--- a/backend/tools/TestSuite/TestSuite.ApiTests/OpenApiTests.cs
+++ b/backend/tools/TestSuite/TestSuite.ApiTests/OpenApiTests.cs
@@ -24,7 +24,7 @@ namespace TestSuite.ApiTests
         [Fact]
         public async Task Should_provide_general_spec()
         {
-            var url = $"{_.ClientManager.Options.Url}/api/swagger/v1/swagger.json";
+            var url = $"{_.ClientManager.Options.Url}api/swagger/v1/swagger.json";
 
             var document = await OpenApiDocument.FromUrlAsync(url);
 
@@ -34,7 +34,7 @@ namespace TestSuite.ApiTests
         [Fact]
         public async Task Should_provide_content_spec()
         {
-            var url = $"{_.ClientManager.Options.Url}/api/content/{_.AppName}/swagger/v1/swagger.json";
+            var url = $"{_.ClientManager.Options.Url}api/content/{_.AppName}/swagger/v1/swagger.json";
 
             var document = await OpenApiDocument.FromUrlAsync(url);
 
@@ -44,7 +44,7 @@ namespace TestSuite.ApiTests
         [Fact]
         public async Task Should_provide_flat_content_spec()
         {
-            var url = $"{_.ClientManager.Options.Url}/api/content/{_.AppName}/flat/swagger/v1/swagger.json";
+            var url = $"{_.ClientManager.Options.Url}api/content/{_.AppName}/flat/swagger/v1/swagger.json";
 
             var document = await OpenApiDocument.FromUrlAsync(url);
 
diff --git a/backend/tools/TestSuite/TestSuite.LoadTests/ReadingFixture.cs b/backend/tools/TestSuite/TestSuite.LoadTests/ReadingFixture.cs
index 233fbb992..a6d97b8c7 100644
--- a/backend/tools/TestSuite/TestSuite.LoadTests/ReadingFixture.cs
+++ b/backend/tools/TestSuite/TestSuite.LoadTests/ReadingFixture.cs
@@ -5,6 +5,8 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
+using System.Globalization;
+using Newtonsoft.Json.Linq;
 using Squidex.ClientLibrary;
 using TestSuite.Fixtures;
 using TestSuite.Model;
@@ -24,9 +26,29 @@ namespace TestSuite.LoadTests
 
             await DisposeAsync();
 
-            for (var i = 10; i > 0; i--)
+            var current = await Contents.GetAsync(new ContentQuery
             {
-                var data = TestEntity.CreateTestEntry(i);
+                Top = 0
+            });
+
+            var countTotal = (int)current.Total;
+            var countMissing = 100 - countTotal;
+
+            for (var index = countMissing; index > 0; index--)
+            {
+                var data = new TestEntityData
+                {
+                    Number = index,
+                    Json = JObject.FromObject(new
+                    {
+                        nested0 = index,
+                        nested1 = new
+                        {
+                            nested2 = index
+                        }
+                    }),
+                    String = index.ToString(CultureInfo.InvariantCulture)
+                };
 
                 await Contents.CreateAsync(data, ContentCreateOptions.AsPublish);
             }
diff --git a/backend/tools/TestSuite/TestSuite.Shared/TestSuite.Shared.csproj b/backend/tools/TestSuite/TestSuite.Shared/TestSuite.Shared.csproj
index 5f2d0839f..bd203d027 100644
--- a/backend/tools/TestSuite/TestSuite.Shared/TestSuite.Shared.csproj
+++ b/backend/tools/TestSuite/TestSuite.Shared/TestSuite.Shared.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
     <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
-    <PackageReference Include="Squidex.ClientLibrary" Version="8.12.0" />
+    <PackageReference Include="Squidex.ClientLibrary" Version="8.16.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
     <PackageReference Include="xunit" Version="2.4.1" />
   </ItemGroup>