diff --git a/Elwig/App.xaml.cs b/Elwig/App.xaml.cs
index 06a76e7..4881bbf 100644
--- a/Elwig/App.xaml.cs
+++ b/Elwig/App.xaml.cs
@@ -53,7 +53,7 @@ namespace Elwig {
         public static string? BranchFaxNr { get; private set; }
         public static string? BranchMobileNr { get; private set; }
         public static IList<IScale> Scales { get; private set; }
-        public static ClientParameters Client { get; private set; }
+        public static ClientParameters Client { get; set; }
 
         public static bool IsPrintingReady => Html.IsReady && Pdf.IsReady;
         public static Dispatcher MainDispatcher { get; private set; }
diff --git a/Tests/DatabaseSetup.cs b/Tests/DatabaseSetup.cs
index 53523ab..632bc45 100644
--- a/Tests/DatabaseSetup.cs
+++ b/Tests/DatabaseSetup.cs
@@ -1,4 +1,5 @@
-using Elwig.Helpers;
+using Elwig;
+using Elwig.Helpers;
 using Elwig.Helpers.Billing;
 using Microsoft.Data.Sqlite;
 using System.Reflection;
@@ -10,7 +11,7 @@ namespace Tests {
         private SqliteConnection? Connection;
 
         [OneTimeSetUp]
-        public async Task SetupDatabase() {
+        public async Task Setup_1_Database() {
             AppDbContext.ConnectionStringOverride = $"Data Source=ElwigTestDB; Mode=Memory; Foreign Keys=True; Cache=Shared";
             Connection = await AppDbContext.ConnectAsync();
             await AppDbContext.ExecuteEmbeddedScript(Connection, Assembly.GetExecutingAssembly(), "Tests.Resources.Sql.Create.sql");
@@ -18,7 +19,13 @@ namespace Tests {
         }
 
         [OneTimeSetUp]
-        public async Task SetupBillingData() {
+        public void Setup_2_Client() {
+            using var ctx = new AppDbContext();
+            App.Client = new ClientParameters(ctx);
+        }
+
+        [OneTimeSetUp]
+        public async Task Setup_3_BillingData() {
             await BillingData.Init();
         }