diff --git a/DataFilter/DataFilterCrud.cs b/DataFilter/DataFilterCrud.cs
index 26fd6dd..24a6e4b 100644
--- a/DataFilter/DataFilterCrud.cs
+++ b/DataFilter/DataFilterCrud.cs
@@ -103,7 +103,7 @@ namespace raven_integration
 
             ApiResponse a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateErrorCodeResponse(a, 2200, 400);
-            Util.ShouldContainValidationError(a, "ListKey", "VALIDATION_INVALID_VALUE");
+            Util.ShouldContainValidationError(a, "ListKey", "2203");
 
         }
 
@@ -133,7 +133,7 @@ namespace raven_integration
 
             ApiResponse a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateErrorCodeResponse(a, 2200, 400);
-            Util.ShouldContainValidationError(a, "Filter", "VALIDATION_INVALID_VALUE");
+            Util.ShouldContainValidationError(a, "Filter", "2203");
 
         }
 
@@ -164,7 +164,7 @@ namespace raven_integration
 
             ApiResponse a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), d.ToString());
             Util.ValidateErrorCodeResponse(a, 2200, 400);
-            Util.ShouldContainValidationError(a, "Filter", "VALIDATION_INVALID_VALUE");
+            Util.ShouldContainValidationError(a, "Filter", "2203");
 
         }
 
diff --git a/Widget/WidgetValidationTests.cs b/Widget/WidgetValidationTests.cs
index efa63e2..bad1004 100644
--- a/Widget/WidgetValidationTests.cs
+++ b/Widget/WidgetValidationTests.cs
@@ -29,7 +29,7 @@ namespace raven_integration
         //     ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("InventoryFull"), d.ToString());
 
         //     Util.ValidateErrorCodeResponse(a, 2200, 400);
-        //     Util.ShouldContainValidationError(a, "Active", "VALIDATION_INVALID_VALUE");
+        //     Util.ShouldContainValidationError(a, "Active", "2203");
 
         // }
 
@@ -61,7 +61,7 @@ namespace raven_integration
 
             //2002 in-valid expected
             Util.ValidateErrorCodeResponse(a, 2200, 400);
-            Util.ShouldContainValidationError(a, "Name", "VALIDATION_NOT_UNIQUE");
+            Util.ShouldContainValidationError(a, "Name", "2206");
 
         }
 
@@ -87,7 +87,7 @@ namespace raven_integration
 
             //2002 in-valid expected
             Util.ValidateErrorCodeResponse(a, 2200, 400);
-            Util.ShouldContainValidationError(a, "Name", "VALIDATION_REQUIRED");
+            Util.ShouldContainValidationError(a, "Name", "2201");
 
         }
 
@@ -111,7 +111,7 @@ namespace raven_integration
 
             //2002 in-valid expected
             Util.ValidateErrorCodeResponse(a, 2200, 400);
-            Util.ShouldContainValidationError(a, "Name", "VALIDATION_LENGTH_EXCEEDED", "255 max");
+            Util.ShouldContainValidationError(a, "Name", "2202", "255 max");
 
         }
 
@@ -140,7 +140,7 @@ namespace raven_integration
 
             //2002 in-valid expected
             Util.ValidateErrorCodeResponse(a, 2200, 400);
-            Util.ShouldContainValidationError(a, "EndDate", "VALIDATION_REQUIRED");
+            Util.ShouldContainValidationError(a, "EndDate", "2201");
 
         }
 
@@ -168,7 +168,7 @@ namespace raven_integration
 
             //2002 in-valid expected
             Util.ValidateErrorCodeResponse(a, 2200, 400);
-            Util.ShouldContainValidationError(a, "StartDate", "VALIDATION_REQUIRED");
+            Util.ShouldContainValidationError(a, "StartDate", "2201");
 
         }
 
@@ -196,7 +196,7 @@ namespace raven_integration
 
             //2002 in-valid expected
             Util.ValidateErrorCodeResponse(a, 2200, 400);
-            Util.ShouldContainValidationError(a, "StartDate", "VALIDATION_STARTDATE_AFTER_ENDDATE");
+            Util.ShouldContainValidationError(a, "StartDate", "2207");
 
         }
 
@@ -224,7 +224,7 @@ namespace raven_integration
 
             //2002 in-valid expected
             Util.ValidateErrorCodeResponse(a, 2200, 400);
-            Util.ShouldContainValidationError(a, "Roles", "VALIDATION_INVALID_VALUE");
+            Util.ShouldContainValidationError(a, "Roles", "2203");
 
         }