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/DbUtil.cs b/server/AyaNova/util/DbUtil.cs
index 0e5ba4d8..abb02051 100644
--- a/server/AyaNova/util/DbUtil.cs
+++ b/server/AyaNova/util/DbUtil.cs
@@ -281,6 +281,12 @@ namespace AyaNova.Util
                     cmd.CommandText = "update auser set customerid=null;";
                     await cmd.ExecuteNonQueryAsync();
 
+                    cmd.Connection = conn;
+                    cmd.CommandText = "update aunit set replacedbyunitid=null, parentunitid=null, purchasedfromvendorid=null, unitmodelid=null;";
+                    await cmd.ExecuteNonQueryAsync();
+
+
+
                     cmd.CommandText = "update auser set headofficeid=null;";
                     await cmd.ExecuteNonQueryAsync();
 
@@ -315,7 +321,7 @@ namespace AyaNova.Util
                 await EraseTableAsync("asearchkey", conn);
                 await EraseTableAsync("asearchdictionary", conn);
                 await EraseTableAsync("atag", conn);
-
+                await EraseTableAsync("aunit", conn);
                 await EraseTableAsync("acustomernote", conn);
                 await EraseTableAsync("acustomer", conn);
                 await EraseTableAsync("aheadoffice", conn);
@@ -332,7 +338,7 @@ namespace AyaNova.Util
                 await EraseTableAsync("aquote", conn);
                 await EraseTableAsync("aquotetemplateitem", conn);
                 await EraseTableAsync("aquotetemplate", conn);
-                await EraseTableAsync("aunit", conn);
+
                 await EraseTableAsync("aunitmodel", conn);
                 await EraseTableAsync("avendor", conn);
                 //--- WorkOrder
@@ -363,7 +369,7 @@ namespace AyaNova.Util
                 await EraseTableAsync("areminder", conn);//depends on User
                 await EraseTableAsync("areview", conn);//depends on User
 
-                
+
                 await EraseTableAsync("aservicerate", conn);
                 await EraseTableAsync("atravelrate", conn);
                 await EraseTableAsync("ataxcode", conn);