diff --git a/.vscode/launch.json b/.vscode/launch.json
index 0e2049e9..8fd97968 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -53,7 +53,7 @@
         "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
         "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
         "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
-        "AYANOVA_SERVER_TEST_MODE": "false",
+        "AYANOVA_SERVER_TEST_MODE": "true",
         "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
         "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
         "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\"
diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs
index 51e011ab..08992c9f 100644
--- a/server/AyaNova/util/AySchema.cs
+++ b/server/AyaNova/util/AySchema.cs
@@ -253,9 +253,6 @@ namespace AyaNova.Util
                 await ExecQueryAsync("CREATE TABLE aglobalbizsettings (id INTEGER NOT NULL PRIMARY KEY, "
                                      + "searchcasesensitiveonly BOOL DEFAULT FALSE, "
                                      + "useinventory BOOL DEFAULT TRUE, "
-                                     + "taxpartpurchaseid BIGINT REFERENCES ataxcode, "
-                                     + "taxpartsaleid BIGINT REFERENCES ataxcode, "
-                                     + "taxratesaleid BIGINT REFERENCES ataxcode, "
                                      + "workordercompletebyage  INTERVAL NOT NULL DEFAULT '00:00:00'"
                                      + ")");
 
@@ -513,6 +510,10 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
                     + "notes TEXT, wiki TEXT, customfields TEXT, tags VARCHAR(255) ARRAY, "
                     + "taxapct DECIMAL(8,5) NOT NULL default 0, taxbpct DECIMAL(8,5) NOT NULL default 0, taxontax BOOL NOT NULL default false)");
 
+                //Global tax code defaults
+                await ExecQueryAsync("ALTER TABLE aglobalbizsettings ADD column taxpartpurchaseid BIGINT REFERENCES ataxcode, "
+                    +"ADD column taxpartsaleid BIGINT REFERENCES ataxcode, ADD column taxratesaleid BIGINT REFERENCES ataxcode");
+
                 //MEMO                
                 await ExecQueryAsync("CREATE TABLE amemo (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, name TEXT NOT NULL, "
                     + "notes TEXT, wiki TEXT, customfields TEXT, tags VARCHAR(255) ARRAY, "