diff --git a/.gitignore b/.gitignore
index 790a84f..fdc3240 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 # For useful gitignore templates see: https://github.com/github/gitignore
 
 # Salesforce cache
+.sf/
 .sfdx/
 .localdevserver/
 
diff --git a/sfdx-project.json b/sfdx-project.json
index 503b680..310cd97 100644
--- a/sfdx-project.json
+++ b/sfdx-project.json
@@ -8,5 +8,5 @@
   "name": "fflib-apex-extensions",
   "namespace": "",
   "sfdcLoginUrl": "https://login.salesforce.com",
-  "sourceApiVersion": "53.0"
+  "sourceApiVersion": "57.0"
 }
diff --git a/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicDomainFactory.cls-meta.xml b/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicDomainFactory.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicDomainFactory.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicDomainFactory.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicSelectorFactory.cls-meta.xml b/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicSelectorFactory.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicSelectorFactory.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicSelectorFactory.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicServiceFactory.cls-meta.xml b/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicServiceFactory.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicServiceFactory.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicServiceFactory.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicTriggerHandlerFactory.cls-meta.xml b/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicTriggerHandlerFactory.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicTriggerHandlerFactory.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicTriggerHandlerFactory.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicUnitOfWorkFactory.cls-meta.xml b/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicUnitOfWorkFactory.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicUnitOfWorkFactory.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicUnitOfWorkFactory.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBinding.cls-meta.xml b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBinding.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBinding.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBinding.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingMetaDataModule.cls-meta.xml b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingMetaDataModule.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingMetaDataModule.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingMetaDataModule.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingModule.cls-meta.xml b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingModule.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingModule.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingModule.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingResolver.cls-meta.xml b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingResolver.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingResolver.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingResolver.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingType.cls-meta.xml b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingType.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingType.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingType.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindings.cls-meta.xml b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindings.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindings.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindings.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingsSelector.cls-meta.xml b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingsSelector.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingsSelector.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_AppBindingsSelector.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_DynamicAppFactory.cls-meta.xml b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_DynamicAppFactory.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_DynamicAppFactory.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_DynamicAppFactory.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_DynamicDomainFactory.cls-meta.xml b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_DynamicDomainFactory.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_DynamicDomainFactory.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_DynamicDomainFactory.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_DynamicSelectorFactory.cls-meta.xml b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_DynamicSelectorFactory.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_DynamicSelectorFactory.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_DynamicSelectorFactory.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_DynamicServiceFactory.cls-meta.xml b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_DynamicServiceFactory.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_DynamicServiceFactory.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_DynamicServiceFactory.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_SharingMode.cls-meta.xml b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_SharingMode.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_SharingMode.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/application/dynamic/classes/fflib_SharingMode.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/application/dynamic/classes/interfaces/fflib_IAppBinding.cls-meta.xml b/sfdx-source/apex-extensions/main/application/dynamic/classes/interfaces/fflib_IAppBinding.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/application/dynamic/classes/interfaces/fflib_IAppBinding.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/application/dynamic/classes/interfaces/fflib_IAppBinding.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/application/dynamic/classes/interfaces/fflib_IAppBindingModule.cls-meta.xml b/sfdx-source/apex-extensions/main/application/dynamic/classes/interfaces/fflib_IAppBindingModule.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/application/dynamic/classes/interfaces/fflib_IAppBindingModule.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/application/dynamic/classes/interfaces/fflib_IAppBindingModule.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/application/dynamic/classes/interfaces/fflib_IAppBindingResolver.cls-meta.xml b/sfdx-source/apex-extensions/main/application/dynamic/classes/interfaces/fflib_IAppBindingResolver.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/application/dynamic/classes/interfaces/fflib_IAppBindingResolver.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/application/dynamic/classes/interfaces/fflib_IAppBindingResolver.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/application/dynamic/classes/interfaces/fflib_IAppBindingRouter.cls-meta.xml b/sfdx-source/apex-extensions/main/application/dynamic/classes/interfaces/fflib_IAppBindingRouter.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/application/dynamic/classes/interfaces/fflib_IAppBindingRouter.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/application/dynamic/classes/interfaces/fflib_IAppBindingRouter.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/application/dynamic/classes/interfaces/fflib_IAppBindings.cls-meta.xml b/sfdx-source/apex-extensions/main/application/dynamic/classes/interfaces/fflib_IAppBindings.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/application/dynamic/classes/interfaces/fflib_IAppBindings.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/application/dynamic/classes/interfaces/fflib_IAppBindings.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/criteria/fflib_Comparator.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/criteria/fflib_Comparator.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/criteria/fflib_Comparator.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/criteria/fflib_Comparator.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/criteria/fflib_Criteria.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/criteria/fflib_Criteria.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/criteria/fflib_Criteria.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/criteria/fflib_Criteria.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/criteria/fflib_Operator.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/criteria/fflib_Operator.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/criteria/fflib_Operator.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/criteria/fflib_Operator.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/criteria/fflib_OperatorUtils.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/criteria/fflib_OperatorUtils.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/criteria/fflib_OperatorUtils.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/criteria/fflib_OperatorUtils.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/domains/fflib_DateTimes.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/domains/fflib_DateTimes.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/domains/fflib_DateTimes.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/domains/fflib_DateTimes.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Dates.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Dates.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Dates.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Dates.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Decimals.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Decimals.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Decimals.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Decimals.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Doubles.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Doubles.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Doubles.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Doubles.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/domains/fflib_ISObjects2.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/domains/fflib_ISObjects2.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/domains/fflib_ISObjects2.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/domains/fflib_ISObjects2.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Ids.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Ids.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Ids.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Ids.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Integers.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Integers.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Integers.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Integers.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Longs.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Longs.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Longs.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Longs.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Objects2.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Objects2.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Objects2.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Objects2.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/domains/fflib_SObjects2.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/domains/fflib_SObjects2.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/domains/fflib_SObjects2.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/domains/fflib_SObjects2.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Strings.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Strings.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Strings.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/domains/fflib_Strings.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/factories/fflib_ISObjectFactory.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/factories/fflib_ISObjectFactory.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/factories/fflib_ISObjectFactory.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/factories/fflib_ISObjectFactory.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/factories/fflib_SObjectFactory.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/factories/fflib_SObjectFactory.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/factories/fflib_SObjectFactory.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/factories/fflib_SObjectFactory.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/selectors/fflib_SObjectShareSelector.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/selectors/fflib_SObjectShareSelector.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/selectors/fflib_SObjectShareSelector.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/selectors/fflib_SObjectShareSelector.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/triggerHanders/fflib_ISObjectTriggerHandler.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/triggerHanders/fflib_ISObjectTriggerHandler.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/triggerHanders/fflib_ISObjectTriggerHandler.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/triggerHanders/fflib_ISObjectTriggerHandler.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/triggerHanders/fflib_SObjectTriggerHandler.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/triggerHanders/fflib_SObjectTriggerHandler.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/triggerHanders/fflib_SObjectTriggerHandler.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/triggerHanders/fflib_SObjectTriggerHandler.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/utils/fflib_ArrayUtils.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/utils/fflib_ArrayUtils.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/utils/fflib_ArrayUtils.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/utils/fflib_ArrayUtils.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/utils/fflib_MockSOQLResult.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/utils/fflib_MockSOQLResult.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/utils/fflib_MockSOQLResult.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/utils/fflib_MockSOQLResult.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/utils/fflib_MockSObjectUtil.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/utils/fflib_MockSObjectUtil.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/utils/fflib_MockSObjectUtil.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/utils/fflib_MockSObjectUtil.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/utils/fflib_RecordTypeId.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/utils/fflib_RecordTypeId.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/utils/fflib_RecordTypeId.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/utils/fflib_RecordTypeId.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/utils/fflib_SObjectShare.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/utils/fflib_SObjectShare.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/utils/fflib_SObjectShare.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/utils/fflib_SObjectShare.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/default/classes/utils/fflib_StringUtils.cls-meta.xml b/sfdx-source/apex-extensions/main/default/classes/utils/fflib_StringUtils.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/default/classes/utils/fflib_StringUtils.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/default/classes/utils/fflib_StringUtils.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/logger/classes/fflib_ALogAppenderFilter.cls-meta.xml b/sfdx-source/apex-extensions/main/logger/classes/fflib_ALogAppenderFilter.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/logger/classes/fflib_ALogAppenderFilter.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/logger/classes/fflib_ALogAppenderFilter.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/logger/classes/fflib_LogEntry.cls-meta.xml b/sfdx-source/apex-extensions/main/logger/classes/fflib_LogEntry.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/logger/classes/fflib_LogEntry.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/logger/classes/fflib_LogEntry.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/logger/classes/fflib_LogEventAppender.cls-meta.xml b/sfdx-source/apex-extensions/main/logger/classes/fflib_LogEventAppender.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/logger/classes/fflib_LogEventAppender.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/logger/classes/fflib_LogEventAppender.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/logger/classes/fflib_LogEventDomain.cls-meta.xml b/sfdx-source/apex-extensions/main/logger/classes/fflib_LogEventDomain.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/logger/classes/fflib_LogEventDomain.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/logger/classes/fflib_LogEventDomain.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/logger/classes/fflib_LogEventStoreListener.cls-meta.xml b/sfdx-source/apex-extensions/main/logger/classes/fflib_LogEventStoreListener.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/logger/classes/fflib_LogEventStoreListener.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/logger/classes/fflib_LogEventStoreListener.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/logger/classes/fflib_Logger.cls-meta.xml b/sfdx-source/apex-extensions/main/logger/classes/fflib_Logger.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/logger/classes/fflib_Logger.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/logger/classes/fflib_Logger.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/logger/classes/fflib_PlatformEventDomain.cls-meta.xml b/sfdx-source/apex-extensions/main/logger/classes/fflib_PlatformEventDomain.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/logger/classes/fflib_PlatformEventDomain.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/logger/classes/fflib_PlatformEventDomain.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_ILogAppender.cls-meta.xml b/sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_ILogAppender.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_ILogAppender.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_ILogAppender.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_ILogMessageFormatter.cls-meta.xml b/sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_ILogMessageFormatter.cls-meta.xml
index 70d3c75..45cccbd 100644
--- a/sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_ILogMessageFormatter.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_ILogMessageFormatter.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
\ No newline at end of file
diff --git a/sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_ILogger.cls-meta.xml b/sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_ILogger.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_ILogger.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_ILogger.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_IPlatformEventDomain.cls-meta.xml b/sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_IPlatformEventDomain.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_IPlatformEventDomain.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_IPlatformEventDomain.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/logger/triggers/fflib_LogEventTrigger.trigger-meta.xml b/sfdx-source/apex-extensions/main/logger/triggers/fflib_LogEventTrigger.trigger-meta.xml
index 268e21b..b01a1f0 100644
--- a/sfdx-source/apex-extensions/main/logger/triggers/fflib_LogEventTrigger.trigger-meta.xml
+++ b/sfdx-source/apex-extensions/main/logger/triggers/fflib_LogEventTrigger.trigger-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexTrigger xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexTrigger>
diff --git a/sfdx-source/apex-extensions/main/triggerHandler/classes/fflib_TriggerAction.cls-meta.xml b/sfdx-source/apex-extensions/main/triggerHandler/classes/fflib_TriggerAction.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/triggerHandler/classes/fflib_TriggerAction.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/triggerHandler/classes/fflib_TriggerAction.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/triggerHandler/classes/fflib_TriggerActionConfig.cls-meta.xml b/sfdx-source/apex-extensions/main/triggerHandler/classes/fflib_TriggerActionConfig.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/triggerHandler/classes/fflib_TriggerActionConfig.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/triggerHandler/classes/fflib_TriggerActionConfig.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/triggerHandler/classes/fflib_TriggerActionConfigSelector.cls-meta.xml b/sfdx-source/apex-extensions/main/triggerHandler/classes/fflib_TriggerActionConfigSelector.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/triggerHandler/classes/fflib_TriggerActionConfigSelector.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/triggerHandler/classes/fflib_TriggerActionConfigSelector.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/triggerHandler/classes/fflib_TriggerContext.cls-meta.xml b/sfdx-source/apex-extensions/main/triggerHandler/classes/fflib_TriggerContext.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/triggerHandler/classes/fflib_TriggerContext.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/triggerHandler/classes/fflib_TriggerContext.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/triggerHandler/classes/fflib_TriggerHandler.cls-meta.xml b/sfdx-source/apex-extensions/main/triggerHandler/classes/fflib_TriggerHandler.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/triggerHandler/classes/fflib_TriggerHandler.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/triggerHandler/classes/fflib_TriggerHandler.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/triggerHandler/classes/interfaces/fflib_ITriggerAction.cls-meta.xml b/sfdx-source/apex-extensions/main/triggerHandler/classes/interfaces/fflib_ITriggerAction.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/triggerHandler/classes/interfaces/fflib_ITriggerAction.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/triggerHandler/classes/interfaces/fflib_ITriggerAction.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/triggerHandler/classes/interfaces/fflib_ITriggerActionConfig.cls-meta.xml b/sfdx-source/apex-extensions/main/triggerHandler/classes/interfaces/fflib_ITriggerActionConfig.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/triggerHandler/classes/interfaces/fflib_ITriggerActionConfig.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/triggerHandler/classes/interfaces/fflib_ITriggerActionConfig.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/triggerHandler/classes/interfaces/fflib_ITriggerActionConfigSelector.cls-meta.xml b/sfdx-source/apex-extensions/main/triggerHandler/classes/interfaces/fflib_ITriggerActionConfigSelector.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/triggerHandler/classes/interfaces/fflib_ITriggerActionConfigSelector.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/triggerHandler/classes/interfaces/fflib_ITriggerActionConfigSelector.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/triggerHandler/classes/interfaces/fflib_ITriggerContext.cls-meta.xml b/sfdx-source/apex-extensions/main/triggerHandler/classes/interfaces/fflib_ITriggerContext.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/triggerHandler/classes/interfaces/fflib_ITriggerContext.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/triggerHandler/classes/interfaces/fflib_ITriggerContext.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/triggerHandler/classes/interfaces/fflib_ITriggerHandler.cls-meta.xml b/sfdx-source/apex-extensions/main/triggerHandler/classes/interfaces/fflib_ITriggerHandler.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/triggerHandler/classes/interfaces/fflib_ITriggerHandler.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/triggerHandler/classes/interfaces/fflib_ITriggerHandler.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/unitOfWork/classes/fflib_DoWork.cls-meta.xml b/sfdx-source/apex-extensions/main/unitOfWork/classes/fflib_DoWork.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/unitOfWork/classes/fflib_DoWork.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/unitOfWork/classes/fflib_DoWork.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/unitOfWork/classes/fflib_SObjectUnitOfWork2.cls-meta.xml b/sfdx-source/apex-extensions/main/unitOfWork/classes/fflib_SObjectUnitOfWork2.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/unitOfWork/classes/fflib_SObjectUnitOfWork2.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/unitOfWork/classes/fflib_SObjectUnitOfWork2.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/unitOfWork/classes/fflib_UnitOfWork.cls-meta.xml b/sfdx-source/apex-extensions/main/unitOfWork/classes/fflib_UnitOfWork.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/unitOfWork/classes/fflib_UnitOfWork.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/unitOfWork/classes/fflib_UnitOfWork.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/unitOfWork/classes/interfaces/fflib_IDoWork.cls-meta.xml b/sfdx-source/apex-extensions/main/unitOfWork/classes/interfaces/fflib_IDoWork.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/unitOfWork/classes/interfaces/fflib_IDoWork.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/unitOfWork/classes/interfaces/fflib_IDoWork.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/main/unitOfWork/classes/interfaces/fflib_IUnitOfWork.cls-meta.xml b/sfdx-source/apex-extensions/main/unitOfWork/classes/interfaces/fflib_IUnitOfWork.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/main/unitOfWork/classes/interfaces/fflib_IUnitOfWork.cls-meta.xml
+++ b/sfdx-source/apex-extensions/main/unitOfWork/classes/interfaces/fflib_IUnitOfWork.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/tests/classes/application/fflib_ClassicDomainFactoryTest.cls-meta.xml b/sfdx-source/apex-extensions/tests/classes/application/fflib_ClassicDomainFactoryTest.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/tests/classes/application/fflib_ClassicDomainFactoryTest.cls-meta.xml
+++ b/sfdx-source/apex-extensions/tests/classes/application/fflib_ClassicDomainFactoryTest.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicDomainFactoryTest.cls b/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicDomainFactoryTest.cls
index 6cef48b..fbeaf0d 100644
--- a/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicDomainFactoryTest.cls
+++ b/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicDomainFactoryTest.cls
@@ -52,7 +52,7 @@ public class fflib_DynamicDomainFactoryTest
         Object instance = Domain.newInstance(records);
         System.Test.stopTest();
 
-        System.assert(instance instanceof fflib_SObjects);
+        System.Assert.isInstanceOfType(instance, fflib_SObjects.class);
     }
 
     @IsTest
@@ -76,8 +76,8 @@ public class fflib_DynamicDomainFactoryTest
         Object instance = Domain.newInstance(ids);
         System.Test.stopTest();
 
-        System.assert(instance instanceof fflib_SObjects);
-        System.assertEquals(records, ((fflib_SObjects) instance).getRecords());
+        System.Assert.isInstanceOfType(instance, fflib_SObjects.class);
+        System.Assert.areEqual(records, ((fflib_SObjects) instance).getRecords());
     }
 
     @IsTest
@@ -103,8 +103,8 @@ public class fflib_DynamicDomainFactoryTest
         fflib_SObjects instanceB = (fflib_SObjects) Domain.newInstance(records, ACCOUNT_OBJECT_TYPE);
         System.Test.stopTest();
 
-        System.assertEquals(records, instanceA.getRecords());
-        System.assert(instanceB.getRecords().isEmpty());
+        System.Assert.areEqual(records, instanceA.getRecords());
+        System.Assert.isTrue(instanceB.getRecords().isEmpty());
     }
 
 
diff --git a/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicDomainFactoryTest.cls-meta.xml b/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicDomainFactoryTest.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicDomainFactoryTest.cls-meta.xml
+++ b/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicDomainFactoryTest.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicSelectorFactoryTest.cls b/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicSelectorFactoryTest.cls
index f52c905..4146781 100644
--- a/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicSelectorFactoryTest.cls
+++ b/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicSelectorFactoryTest.cls
@@ -52,7 +52,7 @@ public class fflib_DynamicSelectorFactoryTest
 		Object instance = Selector.newInstance(Schema.Account.SObjectType);
 		System.Test.stopTest();
 
-		System.assert(instance instanceof fflib_DynamicSelectorFactoryTest.MySelector);
+		System.Assert.isInstanceOfType(instance, fflib_DynamicSelectorFactoryTest.MySelector.class);
 	}
 
 	@IsTest
@@ -67,8 +67,8 @@ public class fflib_DynamicSelectorFactoryTest
 		Object instanceB = Selector.newInstance(Schema.Account.SObjectType);
 		System.Test.stopTest();
 
-		System.assert(instanceA instanceof fflib_DynamicSelectorFactoryTest.MySelector);
-		System.assert(instanceB instanceof fflib_DynamicSelectorFactoryTest.MyMockSelector);
+		System.Assert.isInstanceOfType(instanceA, fflib_DynamicSelectorFactoryTest.MySelector.class);
+		System.Assert.isInstanceOfType(instanceB, fflib_DynamicSelectorFactoryTest.MyMockSelector.class);
 	}
 
 	@IsTest
@@ -90,7 +90,7 @@ public class fflib_DynamicSelectorFactoryTest
 		List<SObject> result = Selector.selectById(ids);
 		System.Test.stopTest();
 
-		System.assert(result == records);
+		System.Assert.areEqual(records, result);
 		((fflib_ISObjectSelector) mocks.verify(selectorMock)).selectSObjectsById(ids);
 	}
 
@@ -115,7 +115,7 @@ public class fflib_DynamicSelectorFactoryTest
 		List<SObject> result = Selector.selectByRelationship(contacts, Schema.Contact.AccountId);
 		System.Test.stopTest();
 
-		System.assert(result == accounts);
+		System.Assert.areEqual(accounts, result);
 		((fflib_ISObjectSelector) mocks.verify(selectorMock)).selectSObjectsById(ids);
 	}
 
diff --git a/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicSelectorFactoryTest.cls-meta.xml b/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicSelectorFactoryTest.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicSelectorFactoryTest.cls-meta.xml
+++ b/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicSelectorFactoryTest.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicServiceFactoryTest.cls b/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicServiceFactoryTest.cls
index 68fe81c..3c50250 100644
--- a/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicServiceFactoryTest.cls
+++ b/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicServiceFactoryTest.cls
@@ -46,7 +46,7 @@ public class fflib_DynamicServiceFactoryTest
         Object instance = Service.newInstance(MY_SERVICE_TYPE);
         System.Test.stopTest();
 
-        System.assert(instance instanceof fflib_DynamicServiceFactoryTest.MyService);
+        System.Assert.isInstanceOfType(instance, fflib_DynamicServiceFactoryTest.MyService.class);
     }
 
     @IsTest
@@ -61,7 +61,7 @@ public class fflib_DynamicServiceFactoryTest
         Object instance = Service.newInstance(MY_SERVICE_TYPE);
         System.Test.stopTest();
 
-        System.assert(instance instanceof fflib_DynamicServiceFactoryTest.MyAltService);
+        System.Assert.isInstanceOfType(instance, fflib_DynamicServiceFactoryTest.MyAltService.class);
     }
 
     @IsTest
@@ -77,7 +77,7 @@ public class fflib_DynamicServiceFactoryTest
         Object instance = Service.newInstance(MY_SERVICE_TYPE);
         System.Test.stopTest();
 
-        System.assert(instance instanceof fflib_DynamicServiceFactoryTest.MyAltService);
+        System.Assert.isInstanceOfType(instance, fflib_DynamicServiceFactoryTest.MyAltService.class);
     }
 
     @IsTest
@@ -89,7 +89,7 @@ public class fflib_DynamicServiceFactoryTest
         Object instance = Service.newInstance(MY_SERVICE_INTERFACE_TYPE);
         System.Test.stopTest();
 
-        System.assert(instance instanceof fflib_DynamicServiceFactoryTest.MyService);
+        System.Assert.isInstanceOfType(instance, fflib_DynamicServiceFactoryTest.MyService.class);
     }
 
     @IsTest
@@ -101,7 +101,7 @@ public class fflib_DynamicServiceFactoryTest
         Object instance = Service.newInstance(MY_SERVICE_INTERFACE_TYPE);
         System.Test.stopTest();
 
-        System.assert(instance instanceof fflib_DynamicServiceFactoryTest.MyAltService);
+        System.Assert.isInstanceOfType(instance, fflib_DynamicServiceFactoryTest.MyAltService.class);
     }
 
 
diff --git a/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicServiceFactoryTest.cls-meta.xml b/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicServiceFactoryTest.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicServiceFactoryTest.cls-meta.xml
+++ b/sfdx-source/apex-extensions/tests/classes/application/fflib_DynamicServiceFactoryTest.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/tests/classes/criteria/fflib_ComparatorTest.cls b/sfdx-source/apex-extensions/tests/classes/criteria/fflib_ComparatorTest.cls
index f0feee6..07bd573 100644
--- a/sfdx-source/apex-extensions/tests/classes/criteria/fflib_ComparatorTest.cls
+++ b/sfdx-source/apex-extensions/tests/classes/criteria/fflib_ComparatorTest.cls
@@ -37,9 +37,9 @@ private with sharing class fflib_ComparatorTest
 		String aNull = null;
 		Object aNullO = aNull;
 		Object xyz = 'xyz';
-		System.assertEquals(-1, fflib_Comparator.compare(aNullO, xyz));
-		System.assertEquals(0, fflib_Comparator.compare(aNullO, aNullO));
-		System.assertEquals(1, fflib_Comparator.compare(xyz, aNullO));
+		System.Assert.areEqual(-1, fflib_Comparator.compare(aNullO, xyz));
+		System.Assert.areEqual(0, fflib_Comparator.compare(aNullO, aNullO));
+		System.Assert.areEqual(1, fflib_Comparator.compare(xyz, aNullO));
 	}
 
 	private static testmethod void testBlob()
@@ -55,7 +55,7 @@ private with sharing class fflib_ComparatorTest
 		{
 			exceptionThrown = true;
 		}
-		System.assert(exceptionThrown);
+		System.Assert.isTrue(exceptionThrown);
 	}
 
 	private static testmethod void testBoolean()
@@ -68,7 +68,7 @@ private with sharing class fflib_ComparatorTest
 
 	private static void assertCompareBoolean(Object b1, Object b2, Integer expected)
 	{
-		System.assertEquals(expected, fflib_Comparator.compare(b1, b2));
+		System.Assert.areEqual(expected, fflib_Comparator.compare(b1, b2));
 	}
 
 	private static testmethod void testDate()
@@ -80,7 +80,7 @@ private with sharing class fflib_ComparatorTest
 
 	private static void assertCompareDate(Object d1, Object d2, Integer expected)
 	{
-		System.assertEquals(expected, fflib_Comparator.compare(d1, d2));
+		System.Assert.areEqual(expected, fflib_Comparator.compare(d1, d2));
 	}
 
 	private static testmethod void testDatetime()
@@ -103,7 +103,7 @@ private with sharing class fflib_ComparatorTest
 
 	private static void assertCompareDatetime(Object d1, Object d2, Integer expected)
 	{
-		System.assertEquals(expected, fflib_Comparator.compare(d1, d2));
+		System.Assert.areEqual(expected, fflib_Comparator.compare(d1, d2));
 	}
 
 	private static testmethod void testDecimal()
@@ -117,7 +117,7 @@ private with sharing class fflib_ComparatorTest
 
 	private static void assertCompareDecimal(Object d1, Object d2, Integer expected)
 	{
-		System.assertEquals(expected, fflib_Comparator.compare(d1, d2));
+		System.Assert.areEqual(expected, fflib_Comparator.compare(d1, d2));
 	}
 
 	private static testmethod void testDouble()
@@ -131,7 +131,7 @@ private with sharing class fflib_ComparatorTest
 
 	private static void assertCompareDouble(Object d1, Object d2, Integer expected)
 	{
-		System.assertEquals(expected, fflib_Comparator.compare(d1, d2));
+		System.Assert.areEqual(expected, fflib_Comparator.compare(d1, d2));
 	}
 
 	private static testmethod void testInteger()
@@ -145,7 +145,7 @@ private with sharing class fflib_ComparatorTest
 
 	private static void assertCompare(Object i1, Object i2, Integer expected)
 	{
-		System.assertEquals(expected, fflib_Comparator.compare(i1, i2));
+		System.Assert.areEqual(expected, fflib_Comparator.compare(i1, i2));
 	}
 
 	private static testmethod void testLong()
@@ -159,7 +159,7 @@ private with sharing class fflib_ComparatorTest
 
 	private static void assertCompareLong(Object l1, Object l2, Integer expected)
 	{
-		System.assertEquals(expected, fflib_Comparator.compare(l1, l2));
+		System.Assert.areEqual(expected, fflib_Comparator.compare(l1, l2));
 	}
 
 	private static testmethod void testTime()
@@ -172,7 +172,7 @@ private with sharing class fflib_ComparatorTest
 	}
 	private static void assertCompareTime(Object t1, Object t2, Integer expected)
 	{
-		System.assertEquals(expected, fflib_Comparator.compare(t1, t2));
+		System.Assert.areEqual(expected, fflib_Comparator.compare(t1, t2));
 	}
 
 	private static testmethod void testString()
@@ -186,46 +186,46 @@ private with sharing class fflib_ComparatorTest
 
 	private static void assertCompareString(Object s1, Object s2, Integer expected)
 	{
-		System.assertEquals(expected, fflib_Comparator.compare(s1, s2));
+		System.Assert.areEqual(expected, fflib_Comparator.compare(s1, s2));
 	}
 
 	private static testMethod void assertContainsNull()
 	{
-		System.assert(fflib_Comparator.contains(null, null));
+		System.Assert.isTrue(fflib_Comparator.contains(null, null));
 	}
 
 	private static testMethod void assertContainsSourceNull()
 	{
-		System.assert(!fflib_Comparator.contains(null, 0));
+		System.Assert.isTrue(!fflib_Comparator.contains(null, 0));
 	}
 
 	private static testMethod void assertContainsSearchNull()
 	{
-		System.assert(!fflib_Comparator.contains(new Set<String>(), null));
+		System.Assert.isTrue(!fflib_Comparator.contains(new Set<String>(), null));
 	}
 
 	private static testMethod void assertContainsDate()
 	{
 		Date myDate = Date.newInstance(1976, 6, 1);
-		System.assert(fflib_Comparator.contains(new Set<Date> {myDate}, myDate));
+		System.Assert.isTrue(fflib_Comparator.contains(new Set<Date> {myDate}, myDate));
 	}
 
 	private static testMethod void assertContainsDateTime()
 	{
 		Datetime myDateTime = DateTime.newInstance(1976, 6, 1, 11, 55, 0);
-		System.assert(fflib_Comparator.contains(new Set<Datetime> {myDateTime}, myDateTime));
+		System.Assert.isTrue(fflib_Comparator.contains(new Set<Datetime> {myDateTime}, myDateTime));
 	}
 
 	private static testMethod void assertContainsDouble()
 	{
 		Double myDouble = Double.valueOf(123);
-		System.assert(fflib_Comparator.contains(new Set<Double> {myDouble}, myDouble));
+		System.Assert.isTrue(fflib_Comparator.contains(new Set<Double> {myDouble}, myDouble));
 	}
 
 	private static testMethod void assertContainsId()
 	{
 		Id id = fflib_IDGenerator.generate(Account.SObjectType);
-		System.assert(fflib_Comparator.contains(new Set<Id> {id}, id));
+		System.Assert.isTrue(fflib_Comparator.contains(new Set<Id> {id}, id));
 	}
 
 	private static testMethod void assertContainsInteger()
@@ -235,34 +235,34 @@ private with sharing class fflib_ComparatorTest
 				0, 1, 2, 3
 		};
 		Object obj = (object) integerSet;
-		System.assertEquals(true, fflib_Comparator.contains(obj, 2));
-		System.assertEquals(false, fflib_Comparator.contains(obj, 5));
+		System.Assert.istrue(fflib_Comparator.contains(obj, 2));
+		System.Assert.isfalse(fflib_Comparator.contains(obj, 5));
 
 		Account acc = new Account(Name = 'TEST', NumberOfEmployees = 1);
-		System.assertEquals(true, (object) acc.get('NumberOfEmployees') instanceof integer);
+		System.Assert.istrue((object) acc.get('NumberOfEmployees') instanceof integer);
 	}
 
 	private static testMethod void assertContainsLong()
 	{
 		Long myLong = Long.valueOf('3123');
-		System.assert(fflib_Comparator.contains(new Set<Long> {myLong}, myLong));
+		System.Assert.isTrue(fflib_Comparator.contains(new Set<Long> {myLong}, myLong));
 	}
 
 	private static testMethod void assertContainsObject()
 	{
 		Object obj = (Object) '134';
-		System.assert(fflib_Comparator.contains(new Set<Object>{obj}, obj));
+		System.Assert.istrue(fflib_Comparator.contains(new Set<Object>{obj}, obj));
 	}
 
 	private static testMethod void assertContainsTime()
 	{
 		Time myTime = Time.newInstance(11, 55, 0, 0);
-		System.assert(fflib_Comparator.contains(new Set<Time> {myTime}, myTime));
+		System.Assert.istrue(fflib_Comparator.contains(new Set<Time> {myTime}, myTime));
 	}
 
 	private static testMethod void assertContainsString()
 	{
-		System.assert(fflib_Comparator.contains(new Set<String> {'Test'}, 'Test'));
+		System.Assert.istrue(fflib_Comparator.contains(new Set<String> {'Test'}, 'Test'));
 	}
 
 	private static testMethod void assertContainsSObject()
@@ -276,7 +276,7 @@ private with sharing class fflib_ComparatorTest
 		{
 			exceptionThrown = true;
 		}
-		System.assert(exceptionThrown);
+		System.Assert.istrue(exceptionThrown);
 
 	}
 }
\ No newline at end of file
diff --git a/sfdx-source/apex-extensions/tests/classes/criteria/fflib_ComparatorTest.cls-meta.xml b/sfdx-source/apex-extensions/tests/classes/criteria/fflib_ComparatorTest.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/tests/classes/criteria/fflib_ComparatorTest.cls-meta.xml
+++ b/sfdx-source/apex-extensions/tests/classes/criteria/fflib_ComparatorTest.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/tests/classes/criteria/fflib_CriteriaTest.cls b/sfdx-source/apex-extensions/tests/classes/criteria/fflib_CriteriaTest.cls
index ff6a521..e63a88f 100755
--- a/sfdx-source/apex-extensions/tests/classes/criteria/fflib_CriteriaTest.cls
+++ b/sfdx-source/apex-extensions/tests/classes/criteria/fflib_CriteriaTest.cls
@@ -52,26 +52,26 @@ private with sharing class fflib_CriteriaTest
 						'{"attributes":{"type":"Account"},"Name":"Test", "LastViewedDate":"2021-01-01T10:10:00.000+0000"}', Account.class
 				);
 
-		System.assert(
+		System.Assert.isTrue(
 			new fflib_Criteria()
 					.greaterOrEqualTo(Schema.Account.LastViewedDate, Datetime.newInstance(2020,01,01))
 					.evaluate(record),
 				'Datetime is not greater or equal too'
 		);
-		System.assert(
+		System.Assert.isTrue(
 			new fflib_Criteria()
 					.greaterOrEqualTo(Schema.Account.LastViewedDate, Datetime.newInstance(2030,01,01))
 					.evaluate(record) == false,
 				'Datetime should not be greater or equal too'
 		);
 
-		System.assert(
+		System.Assert.isTrue(
 				new fflib_Criteria()
 						.lessOrEqualTo(Schema.Account.LastViewedDate, Datetime.newInstance(2030,01,01))
 						.evaluate(record),
 				'Datetime is not less or equal too'
 		);
-		System.assert(
+		System.Assert.isTrue(
 				new fflib_Criteria()
 						.lessOrEqualTo(Schema.Account.LastViewedDate, Datetime.newInstance(2000,01,01))
 						.evaluate(record) == false,
@@ -84,11 +84,11 @@ private with sharing class fflib_CriteriaTest
 	{
 		fflib_Criteria criteria = new fflib_Criteria()
 				.contains(Account.Name, A_STRING);
-		System.assert(criteria.evaluate(new Account(Name = SAME_STRING)));
-		System.assert(criteria.evaluate(new Account(Name = 'prefix ' + SAME_STRING)));
-		System.assert(criteria.evaluate(new Account(Name = SAME_STRING + ' suffix')));
-		System.assert(criteria.evaluate(new Account(Name = 'prefix ' + SAME_STRING + ' suffix')));
-		System.assertEquals('Name LIKE \'%' + A_STRING + '%\'', criteria.toSOQL());
+		System.Assert.isTrue(criteria.evaluate(new Account(Name = SAME_STRING)));
+		System.Assert.isTrue(criteria.evaluate(new Account(Name = 'prefix ' + SAME_STRING)));
+		System.Assert.isTrue(criteria.evaluate(new Account(Name = SAME_STRING + ' suffix')));
+		System.Assert.isTrue(criteria.evaluate(new Account(Name = 'prefix ' + SAME_STRING + ' suffix')));
+		System.Assert.areEqual('Name LIKE \'%' + A_STRING + '%\'', criteria.toSOQL());
 	}
 
 	@IsTest
@@ -96,11 +96,11 @@ private with sharing class fflib_CriteriaTest
 	{
 		fflib_Criteria criteria = new fflib_Criteria()
 				.contains(Account.Name, null);
-		System.assert(false == criteria.evaluate(new Account(Name = SAME_STRING)));
-		System.assert(false == criteria.evaluate(new Account(Name = 'prefix ' + SAME_STRING)));
-		System.assert(false == criteria.evaluate(new Account(Name = SAME_STRING + ' suffix')));
-		System.assert(false == criteria.evaluate(new Account(Name = 'prefix ' + SAME_STRING + ' suffix')));
-		System.assertEquals('Name LIKE \'%null%\'', criteria.toSOQL());
+		System.Assert.isFalse(criteria.evaluate(new Account(Name = SAME_STRING)));
+		System.Assert.isFalse(criteria.evaluate(new Account(Name = 'prefix ' + SAME_STRING)));
+		System.Assert.isFalse(criteria.evaluate(new Account(Name = SAME_STRING + ' suffix')));
+		System.Assert.isFalse(criteria.evaluate(new Account(Name = 'prefix ' + SAME_STRING + ' suffix')));
+		System.Assert.areEqual('Name LIKE \'%null%\'', criteria.toSOQL());
 	}
 
 	@IsTest
@@ -109,29 +109,27 @@ private with sharing class fflib_CriteriaTest
 		fflib_Criteria criteria = new fflib_Criteria()
 				.andCriteria()
 				.equalTo(Account.Name, A_STRING);
-		System.assert(criteria.evaluate(new Account(Name = SAME_STRING)));
-		System.assertEquals('Name=\'' + A_STRING + '\'',criteria.toSOQL());
+		System.Assert.istrue(criteria.evaluate(new Account(Name = SAME_STRING)));
+		System.Assert.areEqual('Name=\'' + A_STRING + '\'',criteria.toSOQL());
 	}
 
 	@IsTest
 	static void itShouldEvaluateAnEqualsToCondition_ReturningFalse()
 	{
-		System.assert(
+		System.Assert.isFalse(
 				new fflib_Criteria()
 						.equalTo(Account.Name, A_STRING)
 						.evaluate(new Account(Name = ANOTHER_STRING))
-						== FAILING
 		);
 	}
 
 	@IsTest
 	static void itShouldEvaluateAnEqualsToCondition_NullValues()
 	{
-		System.assert(
+		System.Assert.isFalse(
 				new fflib_Criteria()
 						.equalTo(Account.Name, A_STRING)
 						.evaluate(new Account())
-						== FAILING
 		);
 	}
 
@@ -140,18 +138,17 @@ private with sharing class fflib_CriteriaTest
 	{
 		fflib_Criteria criteria = new fflib_Criteria()
 				.notEqualTo(Account.Name, A_STRING);
-		System.assert(criteria.evaluate(new Account(Name = ANOTHER_STRING)));
-		System.assertEquals('Name!=\'' + A_STRING + '\'', criteria.toSOQL());
+		System.Assert.istrue(criteria.evaluate(new Account(Name = ANOTHER_STRING)));
+		System.Assert.areEqual('Name!=\'' + A_STRING + '\'', criteria.toSOQL());
 	}
 
 	@IsTest
 	static void itShouldEvaluateANotEqualsToCondition_ReturningFalse()
 	{
-		System.assert(
+		System.Assert.isFalse(
 				new fflib_Criteria()
 						.notEqualTo('Name', A_STRING)
 						.evaluate(new Account(Name = SAME_STRING))
-						== FAILING
 		);
 	}
 
@@ -160,14 +157,14 @@ private with sharing class fflib_CriteriaTest
 	{
 		fflib_Criteria criteria = new fflib_Criteria()
 				.greaterOrEqualTo(Account.AnnualRevenue, A_NUMBER);
-		System.assert(criteria.evaluate(new Account(AnnualRevenue = HIGHER_NUMBER)));
-		System.assertEquals('AnnualRevenue>=' + A_NUMBER, criteria.toSOQL());
+		System.Assert.istrue(criteria.evaluate(new Account(AnnualRevenue = HIGHER_NUMBER)));
+		System.Assert.areEqual('AnnualRevenue>=' + A_NUMBER, criteria.toSOQL());
 	}
 
 	@IsTest
 	static void itShouldEvaluateAddGreaterOrEqualToCondition_Equal()
 	{
-		System.assert(
+		System.Assert.istrue(
 				new fflib_Criteria()
 						.greaterOrEqualTo('AnnualRevenue', A_NUMBER)
 						.evaluate(new Account(AnnualRevenue = SAME_NUMBER))
@@ -177,21 +174,19 @@ private with sharing class fflib_CriteriaTest
 	@IsTest
 	static void itShouldEvaluateAddGreaterOrEqualToCondition_ReturningFalse()
 	{
-		System.assert(
+		System.Assert.isFalse(
 				new fflib_Criteria()
 						.greaterOrEqualTo(Account.AnnualRevenue, A_NUMBER)
 						.evaluate(new Account(AnnualRevenue = LOWER_NUMBER))
-						== FAILING
 		);
 	}
 	@IsTest
 	static void itShouldEvaluateAddGreaterOrEqualToCondition_NullValues()
 	{
-		System.assert(
+		System.Assert.isFalse(
 				new fflib_Criteria()
 						.greaterOrEqualTo(Account.AnnualRevenue, A_NUMBER)
 						.evaluate(new Account())
-						== FAILING
 		);
 	}
 
@@ -200,46 +195,43 @@ private with sharing class fflib_CriteriaTest
 	{
 		fflib_Criteria criteria = new fflib_Criteria()
 				.greaterThan(Account.AnnualRevenue, A_NUMBER);
-		System.assert(criteria.evaluate(new Account(AnnualRevenue = HIGHER_NUMBER)));
-		System.assertEquals('AnnualRevenue>' + A_NUMBER, criteria.toSOQL());
+		System.Assert.istrue(criteria.evaluate(new Account(AnnualRevenue = HIGHER_NUMBER)));
+		System.Assert.areEqual('AnnualRevenue>' + A_NUMBER, criteria.toSOQL());
 	}
 
 	@IsTest
 	static void itShouldEvaluateAddGreaterThanCondition_EqualValues()
 	{
-		System.assert(
+		System.Assert.isFalse(
 				new fflib_Criteria()
 						.greaterThan('AnnualRevenue', A_NUMBER)
 						.evaluate(new Account(AnnualRevenue = SAME_NUMBER))
-						== FAILING
 		);
 	}
 
 	@IsTest
 	static void itShouldEvaluateAddGreaterThanCondition_ReturningFalse()
 	{
-		System.assert(
+		System.Assert.isFalse(
 				new fflib_Criteria()
 						.greaterThan(Account.AnnualRevenue, A_NUMBER)
 						.evaluate(new Account(AnnualRevenue = LOWER_NUMBER))
-						== FAILING
 		);
 	}
 	@IsTest
 	static void itShouldEvaluateAddGreaterThanCondition_NullValues()
 	{
-		System.assert(
+		System.Assert.isFalse(
 				new fflib_Criteria()
 						.greaterThan(Account.AnnualRevenue, A_NUMBER)
 						.evaluate(new Account())
-						== FAILING
 		);
 	}
 
 	@IsTest
 	static void itShouldEvaluateAddLessOrEqualToCondition()
 	{
-		System.assert(
+		System.Assert.istrue(
 				new fflib_Criteria()
 						.lessOrEqualTo(Account.AnnualRevenue, A_NUMBER)
 						.evaluate(new Account(AnnualRevenue = LOWER_NUMBER))
@@ -249,7 +241,7 @@ private with sharing class fflib_CriteriaTest
 	@IsTest
 	static void itShouldEvaluateAddLessOrEqualToCondition_Equal()
 	{
-		System.assert(
+		System.Assert.istrue(
 				new fflib_Criteria()
 						.lessOrEqualTo('AnnualRevenue', A_NUMBER)
 						.evaluate(new Account(AnnualRevenue = SAME_NUMBER))
@@ -259,17 +251,16 @@ private with sharing class fflib_CriteriaTest
 	@IsTest
 	static void itShouldEvaluateAddLessOrEqualToCondition_ReturningFalse()
 	{
-		System.assert(
+		System.Assert.isFalse(
 				new fflib_Criteria()
 						.lessOrEqualTo(Account.AnnualRevenue, A_NUMBER)
 						.evaluate(new Account(AnnualRevenue = HIGHER_NUMBER))
-						== FAILING
 		);
 	}
 	@IsTest
 	static void itShouldEvaluateAddLessOrEqualToCondition_NullValues()
 	{
-		System.assert(
+		System.Assert.istrue(
 				new fflib_Criteria()
 						.lessOrEqualTo(Account.AnnualRevenue, A_NUMBER)
 						.evaluate(new Account())
@@ -279,7 +270,7 @@ private with sharing class fflib_CriteriaTest
 	@IsTest
 	static void itShouldEvaluateAddLessThanCondition()
 	{
-		System.assert(
+		System.Assert.istrue(
 				new fflib_Criteria()
 						.lessThan(Account.AnnualRevenue, A_NUMBER)
 						.evaluate(new Account(AnnualRevenue = LOWER_NUMBER))
@@ -289,29 +280,27 @@ private with sharing class fflib_CriteriaTest
 	@IsTest
 	static void itShouldEvaluateAddLessThanCondition_EqualValues()
 	{
-		System.assert(
+		System.Assert.isFalse(
 				new fflib_Criteria()
 						.lessThan('AnnualRevenue', A_NUMBER)
 						.evaluate(new Account(AnnualRevenue = SAME_NUMBER))
-						== FAILING
 		);
 	}
 
 	@IsTest
 	static void itShouldEvaluateAddLessThanCondition_ReturningFalse()
 	{
-		System.assert(
+		System.Assert.isFalse(
 				new fflib_Criteria()
 						.lessThan(Account.AnnualRevenue, A_NUMBER)
 						.evaluate(new Account(AnnualRevenue = HIGHER_NUMBER))
-						== FAILING
 		);
 	}
 
 	@IsTest
 	static void itShouldEvaluateAddLessThanCondition_NullValues()
 	{
-		System.assert(
+		System.Assert.istrue(
 				new fflib_Criteria()
 						.lessThan(Account.AnnualRevenue, A_NUMBER)
 						.evaluate(new Account())
@@ -323,13 +312,13 @@ private with sharing class fflib_CriteriaTest
 	{
 		fflib_Criteria criteria = new fflib_Criteria()
 				.inSet(Account.AnnualRevenue, new Set<Decimal> {1.1, 2.2});
-		System.assert(criteria.evaluate(new Account(AnnualRevenue = 1.1)));
-		System.assertEquals('AnnualRevenue IN (1.1,2.2)', criteria.toSOQL());
+		System.Assert.istrue(criteria.evaluate(new Account(AnnualRevenue = 1.1)));
+		System.Assert.areEqual('AnnualRevenue IN (1.1,2.2)', criteria.toSOQL());
 
 		fflib_Criteria criteriaB = new fflib_Criteria()
 				.inSet('AnnualRevenue', new Set<Decimal> {1.1, 2.2});
-		System.assert(criteriaB.evaluate(new Account(AnnualRevenue = 1.1)));
-		System.assertEquals('AnnualRevenue IN (1.1,2.2)', criteriaB.toSOQL());
+		System.Assert.istrue(criteriaB.evaluate(new Account(AnnualRevenue = 1.1)));
+		System.Assert.areEqual('AnnualRevenue IN (1.1,2.2)', criteriaB.toSOQL());
 
 	}
 
@@ -338,12 +327,12 @@ private with sharing class fflib_CriteriaTest
 	{
 		Id idOne = fflib_IDGenerator.generate(Account.SObjectType);
 		Id idTwo = fflib_IDGenerator.generate(Account.SObjectType);
-		System.assert(
+		System.Assert.istrue(
 				new fflib_Criteria()
 						.inSet(Account.Id, new Set<Id> {idOne, idTwo})
 						.evaluate(new Account(Id = idOne))
 		);
-		System.assert(
+		System.Assert.istrue(
 				new fflib_Criteria()
 						.inSet('Id', new Set<Id> {idOne, idTwo})
 						.evaluate(new Account(Id = idOne))
@@ -353,12 +342,12 @@ private with sharing class fflib_CriteriaTest
 	@IsTest
 	static void itShouldEvaluateInSetCondition_Integer()
 	{
-		System.assert(
+		System.Assert.istrue(
 				new fflib_Criteria()
 						.inSet(Account.NumberOfEmployees, new Set<Integer> {1, 10})
 						.evaluate(new Account(NumberOfEmployees = 1))
 		);
-		System.assert(
+		System.Assert.istrue(
 				new fflib_Criteria()
 						.inSet('NumberOfEmployees', new Set<Integer> {1, 10})
 						.evaluate(new Account(NumberOfEmployees = 1))
@@ -368,12 +357,12 @@ private with sharing class fflib_CriteriaTest
 	@IsTest
 	static void itShouldEvaluateInSetCondition()
 	{
-		System.assert(
+		System.Assert.istrue(
 				new fflib_Criteria()
 						.inSet(Account.Type, new Set<String> {A_STRING, HELLO_WORLD})
 						.evaluate(new Account(Type = SAME_STRING))
 		);
-		System.assert(
+		System.Assert.istrue(
 				new fflib_Criteria()
 						.inSet('Type', new Set<String> {A_STRING, HELLO_WORLD})
 						.evaluate(new Account(Type = SAME_STRING))
@@ -383,22 +372,20 @@ private with sharing class fflib_CriteriaTest
 	@IsTest
 	static void itShouldEvaluateInSetCondition_ReturningFalse()
 	{
-		System.assert(
+		System.Assert.isFalse(
 				new fflib_Criteria()
 						.inSet(Account.Type, new Set<String> {A_STRING, HELLO_WORLD})
 						.evaluate(new Account(Type = ANOTHER_STRING))
-						== FAILING
 		);
 	}
 
 	@IsTest
 	static void itShouldEvaluateInSetCondition_NullValues()
 	{
-		System.assert(
+		System.Assert.isFalse(
 				new fflib_Criteria()
 						.inSet(Account.Type, new Set<String> {A_STRING, HELLO_WORLD})
 						.evaluate(new Account())
-						== FAILING
 		);
 	}
 
@@ -407,31 +394,30 @@ private with sharing class fflib_CriteriaTest
 	{
 		fflib_Criteria criteria = new fflib_Criteria()
 				.notInSet(Account.Name, new Set<String> {A_STRING, HELLO_WORLD});
-		System.assert(criteria.evaluate(new Account(Name = ANOTHER_STRING)));
-		System.assertEquals('Name NOT IN (\'Example\',\'Hello World!\')', criteria.toSOQL());
+		System.Assert.isTrue(criteria.evaluate(new Account(Name = ANOTHER_STRING)));
+		System.Assert.areEqual('Name NOT IN (\'Example\',\'Hello World!\')', criteria.toSOQL());
 
 	}
 
 	@IsTest
 	static void itShouldEvaluateNotInSetCondition_Failing()
 	{
-		System.assert(
+		System.Assert.isFalse(
 				new fflib_Criteria()
 						.notInSet('Name', new Set<String> {A_STRING, HELLO_WORLD})
 						.evaluate(new Account(Name = SAME_STRING))
-						== FAILING
 		);
 	}
 
 	@IsTest
 	static void itShouldEvaluateNotInSetCondition_Decimal()
 	{
-		System.assert(
+		System.Assert.isTrue(
 				new fflib_Criteria()
 						.notInSet(Account.AnnualRevenue, new Set<Decimal> {1.1, 2.2})
 						.evaluate(new Account(AnnualRevenue = 3.3))
 		);
-		System.assert(
+		System.Assert.isTrue(
 				new fflib_Criteria()
 						.notInSet('AnnualRevenue', new Set<Decimal> {1.1, 2.2})
 						.evaluate(new Account(AnnualRevenue = 3.3))
@@ -444,12 +430,12 @@ private with sharing class fflib_CriteriaTest
 		Id idOne = fflib_IDGenerator.generate(Account.SObjectType);
 		Id idTwo = fflib_IDGenerator.generate(Account.SObjectType);
 		Id idThree = fflib_IDGenerator.generate(Account.SObjectType);
-		System.assert(
+		System.Assert.isTrue(
 				new fflib_Criteria()
 						.notInSet(Account.Id, new Set<Id> {idOne, idTwo})
 						.evaluate(new Account(Id = idThree))
 		);
-		System.assert(
+		System.Assert.isTrue(
 				new fflib_Criteria()
 						.notInSet('Id', new Set<Id> {idOne, idTwo})
 						.evaluate(new Account(Id = idThree))
@@ -459,12 +445,12 @@ private with sharing class fflib_CriteriaTest
 	@IsTest
 	static void itShouldEvaluateNotInSetCondition_Integer()
 	{
-		System.assert(
+		System.Assert.isTrue(
 				new fflib_Criteria()
 						.notInSet(Account.NumberOfEmployees, new Set<Integer> {1, 10})
 						.evaluate(new Account(NumberOfEmployees = 2))
 		);
-		System.assert(
+		System.Assert.isTrue(
 				new fflib_Criteria()
 						.notInSet('NumberOfEmployees', new Set<Integer> {1, 10})
 						.evaluate(new Account(NumberOfEmployees = 2))
@@ -474,7 +460,7 @@ private with sharing class fflib_CriteriaTest
 	@IsTest
 	static void itShouldEvaluateOrCondition_First()
 	{
-		System.assert(
+		System.Assert.isTrue(
 				new fflib_Criteria()
 						.orCriteria()
 						.equalTo(Account.Name, A_STRING)
@@ -486,7 +472,7 @@ private with sharing class fflib_CriteriaTest
 	@IsTest
 	static void itShouldEvaluateOrCondition_Second()
 	{
-		System.assert(
+		System.Assert.isTrue(
 				new fflib_Criteria()
 						.orCriteria()
 						.equalTo(Account.Name, A_STRING)
@@ -498,20 +484,19 @@ private with sharing class fflib_CriteriaTest
 	@IsTest
 	static void itShouldEvaluateOrCondition_Failing()
 	{
-		System.assert(
+		System.Assert.isFalse(
 				new fflib_Criteria()
 						.orCriteria()
 						.equalTo(Account.Name, A_STRING)
 						.equalTo(Account.Name, ANOTHER_STRING)
 						.evaluate(new Account(Name = HELLO_WORLD))
-						== FAILING
 		);
 	}
 
 	@IsTest
 	static void itShouldEvaluateAddOrCondition_First()
 	{
-		System.assert(
+		System.Assert.isTrue(
 				new fflib_Criteria()
 						.equalTo(Account.Name, A_STRING)
 						.addOrCriteria(
@@ -526,7 +511,7 @@ private with sharing class fflib_CriteriaTest
 	@IsTest
 	static void itShouldEvaluateAddOrCondition_Second()
 	{
-		System.assert(
+		System.Assert.isTrue(
 				new fflib_Criteria()
 						.equalTo(Account.Name, A_STRING)
 						.addOrCriteria(
@@ -541,7 +526,7 @@ private with sharing class fflib_CriteriaTest
 	@IsTest
 	static void itShouldEvaluateAddOrCondition_Failing()
 	{
-		System.assert(
+		System.Assert.isFalse(
 				new fflib_Criteria()
 						.equalTo(Account.Name, A_STRING)
 						.addOrCriteria(
@@ -550,14 +535,13 @@ private with sharing class fflib_CriteriaTest
 								.equalTo(Account.AccountNumber, '002')
 				)
 						.evaluate(new Account(Name = ANOTHER_STRING, AccountNumber = '001'))
-						== FAILING
 		);
 	}
 
 	@IsTest
 	static void itShouldEvaluateAddAndCondition_First()
 	{
-		System.assert(
+		System.Assert.isTrue(
 				new fflib_Criteria()
 						.orCriteria()
 						.equalTo(Account.Name, A_STRING)
@@ -574,7 +558,7 @@ private with sharing class fflib_CriteriaTest
 	@IsTest
 	static void itShouldEvaluateAddAndCondition_Second()
 	{
-		System.assert(
+		System.Assert.isTrue(
 				new fflib_Criteria()
 						.orCriteria()
 						.equalTo(Account.Name, A_STRING)
@@ -591,7 +575,7 @@ private with sharing class fflib_CriteriaTest
 	@IsTest
 	static void itShouldEvaluateAddAndCondition_SecondFailing()
 	{
-		System.assert(
+		System.Assert.isFalse(
 				new fflib_Criteria()
 						.orCriteria()
 						.equalTo(Account.Name, A_STRING)
@@ -602,14 +586,13 @@ private with sharing class fflib_CriteriaTest
 								.equalTo(Account.AccountNumber, '002')
 				)
 						.evaluate(new Account(Name = HELLO_WORLD))
-						== FAILING
 		);
 	}
 
 	@IsTest
 	static void itShouldEvaluateEmptyCondition()
 	{
-		System.assert(
+		System.Assert.isTrue(
 				new fflib_Criteria()
 						.evaluate(new Account())
 		);
@@ -618,7 +601,7 @@ private with sharing class fflib_CriteriaTest
 	@IsTest
 	static void itShouldGenerateQueryString_EqualsToCondition()
 	{
-		System.assertEquals(
+		System.Assert.areEqual(
 				'Name=\'Example\'',
 				new fflib_Criteria()
 						.andCriteria()
@@ -630,7 +613,7 @@ private with sharing class fflib_CriteriaTest
 	@IsTest
 	static void itShouldGenerateQueryString_AddOrCondition()
 	{
-		System.assertEquals(
+		System.Assert.areEqual(
 				'Name=\'Example\' AND (AccountNumber=\'001\' OR AccountNumber=\'002\')',
 				new fflib_Criteria()
 						.equalTo(Account.Name, A_STRING)
@@ -657,18 +640,18 @@ private with sharing class fflib_CriteriaTest
 		// WHEN we run a criteria con the contact record validating related data on the parent Account
 		fflib_Criteria criteriaA = new fflib_Criteria()
 				.equalTo('Account.Name', 'Dummy');
-		System.assert(criteriaA.evaluate(record));
-		System.assertEquals('Account.Name=\'Dummy\'', criteriaA.toSOQL());
+		System.Assert.isTrue(criteriaA.evaluate(record));
+		System.Assert.areEqual('Account.Name=\'Dummy\'', criteriaA.toSOQL());
 
 		fflib_Criteria criteriaB = new fflib_Criteria()
 				.inSet('Account.Name', new Set<String>{'Dummy', A_STRING });
-		System.assert(criteriaB.evaluate(record));
-		System.assertEquals('Account.Name IN (\'Dummy\',\'' + A_STRING + '\')', criteriaB.toSOQL());
+		System.Assert.isTrue(criteriaB.evaluate(record));
+		System.Assert.areEqual('Account.Name IN (\'Dummy\',\'' + A_STRING + '\')', criteriaB.toSOQL());
 
 		fflib_Criteria criteriaC = new fflib_Criteria()
 				.notInSet('Account.Name', new Set<String>{ A_STRING, ANOTHER_STRING });
-		System.assert(criteriaC.evaluate(record) );
-		System.assertEquals('Account.Name NOT IN (\'' + A_STRING + '\',\'' + ANOTHER_STRING + '\')', criteriaC.toSOQL());
+		System.Assert.isTrue(criteriaC.evaluate(record) );
+		System.Assert.areEqual('Account.Name NOT IN (\'' + A_STRING + '\',\'' + ANOTHER_STRING + '\')', criteriaC.toSOQL());
 	}
 
 	@IsTest
@@ -687,12 +670,12 @@ private with sharing class fflib_CriteriaTest
 				.equalTo(Contact.LastName, 'Smith')
 				.equalTo(Contact.FirstName, 'John')
 				.equalTo(Contact.Department, 'MIB');
-		System.assert(criteria.evaluate(record));
-		System.assertEquals('(TRUE AND TRUE) OR (TRUE AND FALSE)', criteria.getEvaluatedFormula(), 'Incorrect formula returned');
-		System.assertEquals(
+		System.Assert.isTrue(criteria.evaluate(record));
+		System.Assert.areEqual('(TRUE AND TRUE) OR (TRUE AND FALSE)', criteria.getEvaluatedFormula(), 'Incorrect formula returned');
+		System.Assert.areEqual(
 				'(LastName=\'Smith\' AND FirstName=\'John\') OR (LastName=\'Smith\' AND Department=\'MIB\')',
 				criteria.toSOQL());
-		System.assertEquals(false,
+		System.Assert.areEqual(false,
 				new fflib_Criteria()
 						.FormulaCriteria('(1 AND 2) OR (1 AND 3)')
 						.equalTo(Contact.LastName, 'Ford')
@@ -706,13 +689,13 @@ private with sharing class fflib_CriteriaTest
 	@IsTest
 	static void itShouldEvaluateFormula_WithSingleItem()
 	{
-		System.assert(
+		System.Assert.isTrue(
 				new fflib_Criteria()
 						.FormulaCriteria('1')
 						.equalTo(Contact.LastName, 'Smith')
 						.evaluate(new Contact(LastName = 'Smith'))
 		);
-		System.assertEquals(false,
+		System.Assert.areEqual(false,
 				new fflib_Criteria()
 						.FormulaCriteria('1')
 						.equalTo(Contact.LastName, 'Ford')
@@ -728,7 +711,7 @@ private with sharing class fflib_CriteriaTest
 				new Account(Id = fflib_IDGenerator.generate(Account.SObjectType), Industry = 'Energy'),
 				'Account');
 
-		System.assertEquals(null,
+		System.Assert.areEqual(null,
 				new fflib_Criteria()
 						.FormulaCriteria('1')
 						.equalTo('AccountTypo.Industry', 'Energy')
diff --git a/sfdx-source/apex-extensions/tests/classes/criteria/fflib_CriteriaTest.cls-meta.xml b/sfdx-source/apex-extensions/tests/classes/criteria/fflib_CriteriaTest.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/tests/classes/criteria/fflib_CriteriaTest.cls-meta.xml
+++ b/sfdx-source/apex-extensions/tests/classes/criteria/fflib_CriteriaTest.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/tests/classes/domains/fflib_PrimitiveDomainsTest.cls b/sfdx-source/apex-extensions/tests/classes/domains/fflib_PrimitiveDomainsTest.cls
index fe7d14a..aa0f904 100644
--- a/sfdx-source/apex-extensions/tests/classes/domains/fflib_PrimitiveDomainsTest.cls
+++ b/sfdx-source/apex-extensions/tests/classes/domains/fflib_PrimitiveDomainsTest.cls
@@ -52,8 +52,8 @@ private class fflib_PrimitiveDomainsTest
         fflib_Dates DatesB = new fflib_Dates(dateList);
         fflib_Dates DatesC = new fflib_Dates((List<Object>) dateList);
 
-        System.assert(datesA.getDateSet().containsAll(DatesB.getDates()));
-        System.assert(datesA.getDateSet().containsAll(DatesC.getDates()));
+        System.Assert.isTrue(datesA.getDateSet().containsAll(DatesB.getDates()));
+        System.Assert.isTrue(datesA.getDateSet().containsAll(DatesC.getDates()));
     }
 
     @IsTest
@@ -77,8 +77,8 @@ private class fflib_PrimitiveDomainsTest
         fflib_DateTimes datetimeB = new fflib_DateTimes(dateList);
         fflib_DateTimes datetimeC = new fflib_DateTimes((List<Object>) dateList);
 
-        System.assert(datetimeA.getDateTimeSet().containsAll(datetimeB.getDateTimes()));
-        System.assert(datetimeA.getDateTimeSet().containsAll(datetimeC.getDateTimes()));
+        System.Assert.isTrue(datetimeA.getDateTimeSet().containsAll(datetimeB.getDateTimes()));
+        System.Assert.isTrue(datetimeA.getDateTimeSet().containsAll(datetimeC.getDateTimes()));
     }
 
     @IsTest
@@ -91,8 +91,8 @@ private class fflib_PrimitiveDomainsTest
         fflib_Decimals domainB = new fflib_Decimals(dataList);
         fflib_Decimals domainC = new fflib_Decimals((List<Object>) dataList);
 
-        System.assert(domainA.getDecimalSet().containsAll(domainB.getDecimals()));
-        System.assert(domainA.getDecimalSet().containsAll(domainC.getDecimals()));
+        System.Assert.isTrue(domainA.getDecimalSet().containsAll(domainB.getDecimals()));
+        System.Assert.isTrue(domainA.getDecimalSet().containsAll(domainC.getDecimals()));
     }
 
     @IsTest
@@ -105,8 +105,8 @@ private class fflib_PrimitiveDomainsTest
         fflib_Doubles domainB = new fflib_Doubles(dataList);
         fflib_Doubles domainC = new fflib_Doubles((List<Object>) dataList);
 
-        System.assert(domainA.getDoubleSet().containsAll(domainB.getDoubles()));
-        System.assert(domainA.getDoubleSet().containsAll(domainC.getDoubles()));
+        System.Assert.isTrue(domainA.getDoubleSet().containsAll(domainB.getDoubles()));
+        System.Assert.isTrue(domainA.getDoubleSet().containsAll(domainC.getDoubles()));
     }
 
     @IsTest
@@ -123,8 +123,8 @@ private class fflib_PrimitiveDomainsTest
         fflib_Ids domainB = new fflib_Ids(new List<Id>(dataSet));
         fflib_Ids domainC = new fflib_Ids((List<Object>) new List<Id>(dataSet));
 
-        System.assert(domainA.getIds().containsAll(domainB.getIdList()));
-        System.assert(domainA.getIds().containsAll(domainC.getIdList()));
+        System.Assert.isTrue(domainA.getIds().containsAll(domainB.getIdList()));
+        System.Assert.isTrue(domainA.getIds().containsAll(domainC.getIdList()));
     }
 
     @IsTest
@@ -140,7 +140,7 @@ private class fflib_PrimitiveDomainsTest
 
         fflib_Ids domainA = new fflib_Ids(data);
 
-        System.assert(domainA.getIds().containsAll((List<Id>) data.getObjects()));
+        System.Assert.isTrue(domainA.getIds().containsAll((List<Id>) data.getObjects()));
     }
 
     @IsTest
@@ -152,8 +152,8 @@ private class fflib_PrimitiveDomainsTest
         fflib_Integers domainB = new fflib_Integers(new List<Integer>(dataSet));
         fflib_Integers domainC = new fflib_Integers((List<Object>) new List<Integer>(dataSet));
 
-        System.assert(domainA.getIntegerSet().containsAll(domainB.getIntegers()));
-        System.assert(domainA.getIntegerSet().containsAll(domainC.getIntegers()));
+        System.Assert.istrue(domainA.getIntegerSet().containsAll(domainB.getIntegers()));
+        System.Assert.istrue(domainA.getIntegerSet().containsAll(domainC.getIntegers()));
     }
 
     @IsTest
@@ -165,8 +165,8 @@ private class fflib_PrimitiveDomainsTest
         fflib_Longs domainB = new fflib_Longs(new List<Long>(dataSet));
         fflib_Longs domainC = new fflib_Longs((List<Object>) new List<Long>(dataSet));
 
-        System.assert(domainA.getLongSet().containsAll(domainB.getLongs()));
-        System.assert(domainA.getLongSet().containsAll(domainC.getLongs()));
+        System.Assert.istrue(domainA.getLongSet().containsAll(domainB.getLongs()));
+        System.Assert.istrue(domainA.getLongSet().containsAll(domainC.getLongs()));
     }
 
     @IsTest
@@ -178,7 +178,7 @@ private class fflib_PrimitiveDomainsTest
         fflib_Strings domainB = new fflib_Strings(new List<String>(dataSet));
         fflib_Strings domainC = new fflib_Strings((List<Object>) new List<String>(dataSet));
 
-        System.assert(domainA.getStringSet().containsAll(domainB.getStrings()));
-        System.assert(domainA.getStringSet().containsAll(domainC.getStrings()));
+        System.Assert.istrue(domainA.getStringSet().containsAll(domainB.getStrings()));
+        System.Assert.istrue(domainA.getStringSet().containsAll(domainC.getStrings()));
     }
 }
\ No newline at end of file
diff --git a/sfdx-source/apex-extensions/tests/classes/domains/fflib_PrimitiveDomainsTest.cls-meta.xml b/sfdx-source/apex-extensions/tests/classes/domains/fflib_PrimitiveDomainsTest.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/tests/classes/domains/fflib_PrimitiveDomainsTest.cls-meta.xml
+++ b/sfdx-source/apex-extensions/tests/classes/domains/fflib_PrimitiveDomainsTest.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/tests/classes/domains/fflib_SObjects2Test.cls b/sfdx-source/apex-extensions/tests/classes/domains/fflib_SObjects2Test.cls
index 11db36b..f45a7e4 100644
--- a/sfdx-source/apex-extensions/tests/classes/domains/fflib_SObjects2Test.cls
+++ b/sfdx-source/apex-extensions/tests/classes/domains/fflib_SObjects2Test.cls
@@ -48,7 +48,7 @@ private class fflib_SObjects2Test
 
 		domain.addError(Schema.Account.Name,'Oops');
 
-		System.assertEquals(
+		System.Assert.areEqual(
 				2,
 				fflib_SObjects.Errors.getAll().size()
 		);
@@ -59,23 +59,23 @@ private class fflib_SObjects2Test
 	{
 		Account record = new Account(ShippingCountry = 'Holland');
 		DomainAccounts domain = new DomainAccounts(new List<Account> {record});
-		System.assert(!domain.selectByShippingCountry('Holland').isEmpty(), 'Incorrect test data');
+		System.Assert.isFalse(domain.selectByShippingCountry('Holland').isEmpty(), 'Incorrect test data');
 
 		domain.clearShippingCountry();
 
-		System.assert(domain.selectByShippingCountry('Holland').isEmpty(), 'Field should have been nullified');
+		System.Assert.isTrue(domain.selectByShippingCountry('Holland').isEmpty(), 'Field should have been nullified');
 	}
 
 	@IsTest
 	static void itShouldReturnTheCreatedData()
 	{
-		System.assertEquals(
+		System.Assert.areEqual(
 				(Object) Schema.Account.SObjectType,
 				new DomainAccounts(new List<Account>())
 						.getType(),
 				'Unexpected Domain Type'
 		);
-		System.assertEquals(
+		System.Assert.areEqual(
 				Schema.Account.SObjectType,
 				new DomainAccounts(new List<Account>())
 						.getSObjectType(),
@@ -156,13 +156,13 @@ private class fflib_SObjects2Test
 		System.Test.stopTest();
 
 		// THEN it should return the AccountId By CaseId
-		System.assertEquals(3, result.size(), 'Expected one related account to the case');
-		System.assert(result.containsKey(caseIdA));
-		System.assert(result.containsKey(caseIdB));
-		System.assert(result.containsKey(caseIdC));
-		System.assertEquals(accountId, result.get(caseIdA), 'Account Id should be related to the Case Id A');
-		System.assertEquals(null, result.get(caseIdB), 'Case Id B should have no related Account Id');
-		System.assertEquals(null, result.get(caseIdC), 'Case Id B should have no related Account Id');
+		System.Assert.areEqual(3, result.size(), 'Expected one related account to the case');
+		System.Assert.isTrue(result.containsKey(caseIdA));
+		System.Assert.isTrue(result.containsKey(caseIdB));
+		System.Assert.isTrue(result.containsKey(caseIdC));
+		System.Assert.areEqual(accountId, result.get(caseIdA), 'Account Id should be related to the Case Id A');
+		System.Assert.isNull(result.get(caseIdB), 'Case Id B should have no related Account Id');
+		System.Assert.isNull(result.get(caseIdC), 'Case Id B should have no related Account Id');
 	}
 
 	@IsTest
@@ -175,8 +175,8 @@ private class fflib_SObjects2Test
 		System.Test.startTest();
 		Map<String, Id> nameById = domain.getIdFieldByStringField(Schema.Account.Id, Schema.Account.Name);
 		System.Test.stopTest();
-		System.assert(nameById.containsKey(accountName));
-		System.assertEquals(accountId, nameById.get(accountName));
+		System.Assert.isTrue(nameById.containsKey(accountName));
+		System.Assert.areEqual(accountId, nameById.get(accountName));
 	}
 
 	@IsTest
@@ -195,9 +195,9 @@ private class fflib_SObjects2Test
 		Map<Id, String> result = domain.getStringFieldByIdField(Account.Name, Account.Id);
 		System.Test.stopTest();
 
-		System.assertEquals(1, result.size(), 'Incorrect returned amount of results');
-		System.assert(result.keySet().contains(accountId), 'The accountId is missing from the results');
-		System.assertEquals(accountName, result.get(accountId), 'Incorrect returned account name');
+		System.Assert.areEqual(1, result.size(), 'Incorrect returned amount of results');
+		System.Assert.isTrue(result.keySet().contains(accountId), 'The accountId is missing from the results');
+		System.Assert.areEqual(accountName, result.get(accountId), 'Incorrect returned account name');
 	}
 
 	@IsTest
@@ -218,9 +218,9 @@ private class fflib_SObjects2Test
 		Map<Id, Date> result = domain.getDateFieldByIdField(Account.CreatedDate, Account.Id);
 		System.Test.stopTest();
 
-		System.assertEquals(1, result.size(), 'Incorrect returned amount of results');
-		System.assert(result.keySet().contains(accountId), 'The accountId is missing from the results');
-		System.assertEquals(today, result.get(accountId), 'Incorrect returned date');
+		System.Assert.areEqual(1, result.size(), 'Incorrect returned amount of results');
+		System.Assert.istrue(result.keySet().contains(accountId), 'The accountId is missing from the results');
+		System.Assert.areEqual(today, result.get(accountId), 'Incorrect returned date');
 	}
 
 	@IsTest
@@ -246,12 +246,12 @@ private class fflib_SObjects2Test
 						.getIntegerSet();
 		System.Test.stopTest();
 
-		System.assertEquals(2, result.size(), 'Incorrect amount of results');
-		System.assert(result.contains(numberOfEmployees), 'The expected numberOfEmployees was not returned');
-		System.assert(result.contains(numberOfEmployees * 2), 'The expected numberOfEmployees was not returned');
+		System.Assert.areEqual(2, result.size(), 'Incorrect amount of results');
+		System.Assert.istrue(result.contains(numberOfEmployees), 'The expected numberOfEmployees was not returned');
+		System.Assert.istrue(result.contains(numberOfEmployees * 2), 'The expected numberOfEmployees was not returned');
 
-		System.assertEquals(1, result2.size(), 'Incorrect amount of results');
-		System.assert(result2.contains(numberOfEmployees * 2), 'The expected numberOfEmployees was not returned');
+		System.Assert.areEqual(1, result2.size(), 'Incorrect amount of results');
+		System.Assert.istrue(result2.contains(numberOfEmployees * 2), 'The expected numberOfEmployees was not returned');
 	}
 
 	@IsTest
@@ -277,12 +277,12 @@ private class fflib_SObjects2Test
 						.getLongSet();
 		System.Test.stopTest();
 
-		System.assertEquals(2, result.size(), 'Incorrect amount of results');
-		System.assert(result.contains(numberOfEmployees), 'The expected numberOfEmployees was not returned');
-		System.assert(result.contains(numberOfEmployees * 2), 'The expected numberOfEmployees was not returned');
+		System.Assert.areEqual(2, result.size(), 'Incorrect amount of results');
+		System.Assert.istrue(result.contains(numberOfEmployees), 'The expected numberOfEmployees was not returned');
+		System.Assert.istrue(result.contains(numberOfEmployees * 2), 'The expected numberOfEmployees was not returned');
 
-		System.assertEquals(1, result2.size(), 'Incorrect amount of results');
-		System.assert(result2.contains(numberOfEmployees * 2), 'The expected numberOfEmployees was not returned');
+		System.Assert.areEqual(1, result2.size(), 'Incorrect amount of results');
+		System.Assert.istrue(result2.contains(numberOfEmployees * 2), 'The expected numberOfEmployees was not returned');
 	}
 
 	@IsTest
@@ -295,8 +295,8 @@ private class fflib_SObjects2Test
 		System.Test.startTest();
 		Map<Id, Id> accountIdByContactId = domain.getIdFieldByIdField(Schema.Contact.AccountId, Schema.Contact.Id);
 		System.Test.stopTest();
-		System.assert(accountIdByContactId.containsKey(contactId));
-		System.assertEquals(accountId, accountIdByContactId.get(contactId));
+		System.Assert.istrue(accountIdByContactId.containsKey(contactId));
+		System.Assert.areEqual(accountId, accountIdByContactId.get(contactId));
 	}
 
 	@IsTest
@@ -317,7 +317,7 @@ private class fflib_SObjects2Test
 		);
 
 		Set<Id> recordIds = new Set<Id> {idA, idB, idC};
-		System.assert(
+		System.Assert.istrue(
 				domain.getSObjectById().keySet().containsAll(recordIds),
 				'The domain should return all the record Ids'
 		);
@@ -342,7 +342,7 @@ private class fflib_SObjects2Test
 		);
 
 		Set<Id> recordIds = new Set<Id> {idA, idB, idC};
-		System.assert(
+		System.Assert.istrue(
 				domain.getRecordIds().containsAll(recordIds),
 				'The domain should return all the record Ids'
 		);
@@ -353,7 +353,7 @@ private class fflib_SObjects2Test
 	{
 		DomainAccounts domain = generateDomain();
 
-		System.assert(domain.getRecords().size() == 6);
+		System.Assert.areEqual(6, domain.getRecords().size());
 	}
 
 	@IsTest
@@ -367,7 +367,7 @@ private class fflib_SObjects2Test
 						new Account(Name = 'B', Id = fflib_IDGenerator.generate(Schema.Account.SObjectType))
 				});
 
-		System.assertEquals(
+		System.Assert.areEqual(
 				'A',
 				domain.getRecords(
 						new fflib_Criteria()
@@ -389,7 +389,7 @@ private class fflib_SObjects2Test
 						new Account(Name = 'B', Id = fflib_IDGenerator.generate(Schema.Account.SObjectType))
 				});
 
-		System.assertEquals('A', domain.getRecord(idA).get('Name'));
+		System.Assert.areEqual('A', domain.getRecord(idA).get('Name'));
 	}
 
 	@IsTest
@@ -404,7 +404,7 @@ private class fflib_SObjects2Test
 						new Account(Name = 'B', Id = fflib_IDGenerator.generate(Schema.Account.SObjectType))
 				});
 
-		System.assertEquals('A', domain.getRecords(ids).get(0).get('Name'));
+		System.Assert.areEqual('A', domain.getRecords(ids).get(0).get('Name'));
 	}
 
 	@IsTest
@@ -418,7 +418,7 @@ private class fflib_SObjects2Test
 						new Account(Name = 'B', Id = fflib_IDGenerator.generate(Schema.Account.SObjectType))
 				});
 
-		System.assertEquals('A', domain.getRecords(new Set<Id> {idA}).get(0).get('Name'));
+		System.Assert.areEqual('A', domain.getRecords(new Set<Id> {idA}).get(0).get('Name'));
 	}
 
 	@IsTest
@@ -426,7 +426,7 @@ private class fflib_SObjects2Test
 	{
 		DomainAccounts domain = generateDomain();
 
-		System.assert(domain.selectByShippingCountry('USA').size() == 1);
+		System.Assert.areEqual(1, domain.selectByShippingCountry('USA').size());
 	}
 
 	@IsTest
@@ -434,7 +434,7 @@ private class fflib_SObjects2Test
 	{
 		DomainAccounts domain = generateDomain();
 
-		System.assert(domain.selectWithoutShippingCountry().size() == 3);
+		System.Assert.areEqual(3, domain.selectWithoutShippingCountry().size());
 	}
 
 	@IsTest
@@ -442,7 +442,7 @@ private class fflib_SObjects2Test
 	{
 		DomainAccounts domain = generateDomain();
 
-		System.assert(domain.selectWithEmptyRecord().size() == 1);
+		System.Assert.areEqual(1, domain.selectWithEmptyRecord().size());
 	}
 
 	@IsTest
@@ -450,7 +450,7 @@ private class fflib_SObjects2Test
 	{
 		DomainAccounts domain = generateDomain();
 
-		System.assert(domain.selectWithShippingCountry().size() == 3);
+		System.Assert.areEqual(3, domain.selectWithShippingCountry().size());
 	}
 
 	@IsTest
@@ -458,7 +458,7 @@ private class fflib_SObjects2Test
 	{
 		DomainAccounts domain = generateDomain();
 
-		System.assert(domain.selectPopulatedRecords().size() == 3);
+		System.Assert.areEqual(3, domain.selectPopulatedRecords().size());
 	}
 
 	@IsTest
@@ -466,7 +466,7 @@ private class fflib_SObjects2Test
 	{
 		DomainAccounts domain = generateDomain();
 
-		System.assert(
+		System.Assert.istrue(
 				domain.getStringFieldValues(Schema.Account.ShippingCountry)
 						.containsAll(
 						new Set<String>
@@ -487,7 +487,7 @@ private class fflib_SObjects2Test
 		String country = 'Holland';
 		domain.setShippingCountry(country);
 
-		System.assert(domain.selectByShippingCountry(country).size() == 6);
+		System.Assert.areEqual(6, domain.selectByShippingCountry(country).size());
 	}
 
 	@IsTest
@@ -501,15 +501,15 @@ private class fflib_SObjects2Test
 				}
 		);
 
-		System.assert(domain.selectByRating('Hot').size() == 1);
+		System.Assert.areEqual(1, domain.selectByRating('Hot').size());
 	}
 
 	@IsTest
 	static void itShouldGetTheSumOfAnnualRevenue()
 	{
 		DomainAccounts domain = generateDomain();
-		System.assert(domain.getDecimalFieldSum(Account.AnnualRevenue) == 11);
-		System.assert(domain.getDecimalFieldValues(Account.AnnualRevenue).contains((Decimal) 5));
+		System.Assert.areEqual(11, domain.getDecimalFieldSum(Account.AnnualRevenue));
+		System.Assert.isTrue(domain.getDecimalFieldValues(Account.AnnualRevenue).contains((Decimal) 5));
 	}
 
 	@IsTest
@@ -528,7 +528,7 @@ private class fflib_SObjects2Test
 				}
 		);
 
-		System.assert(domain.getFirstSObject().get('Name') == 'Hello');
+		System.Assert.areEqual('Hello', domain.getFirstSObject().get('Name'));
 	}
 
 	@IsTest
@@ -546,7 +546,7 @@ private class fflib_SObjects2Test
 				}
 		);
 
-		System.assert(domain.getFirstSObject().get('Rating') == 'Warm');
+		System.Assert.areEqual('Warm', domain.getFirstSObject().get('Rating'));
 	}
 
 	@IsTest
@@ -557,7 +557,7 @@ private class fflib_SObjects2Test
 
 		domain.setFieldValue(Account.Name, 'Hello World', new fflib_Criteria().equalTo(Account.Rating, 'Cold'));
 
-		System.assert(domain.getFirstSObject().get('Name') == 'Hello World');
+		System.Assert.areEqual('Hello World', domain.getFirstSObject().get('Name'));
 	}
 
 	private static DomainAccounts generateDomain()
diff --git a/sfdx-source/apex-extensions/tests/classes/domains/fflib_SObjects2Test.cls-meta.xml b/sfdx-source/apex-extensions/tests/classes/domains/fflib_SObjects2Test.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/tests/classes/domains/fflib_SObjects2Test.cls-meta.xml
+++ b/sfdx-source/apex-extensions/tests/classes/domains/fflib_SObjects2Test.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/tests/classes/factories/fflib_SObjectFactoryTest.cls b/sfdx-source/apex-extensions/tests/classes/factories/fflib_SObjectFactoryTest.cls
index 27e2757..316603f 100644
--- a/sfdx-source/apex-extensions/tests/classes/factories/fflib_SObjectFactoryTest.cls
+++ b/sfdx-source/apex-extensions/tests/classes/factories/fflib_SObjectFactoryTest.cls
@@ -46,8 +46,8 @@ private class fflib_SObjectFactoryTest
 		List<Contact> result = (List<Contact>) new ContactsFactory().generateById(ids);
 
 		// THEN there should be three Contact records
-		System.assertEquals(3, result.size(), 'Not enough records created');
-		System.assert(new Map<Id, Contact>(result).keySet().containsAll(ids), 'Records should contain the given ids');
+		System.Assert.areEqual(3, result.size(), 'Not enough records created');
+		System.Assert.isTrue(new Map<Id, Contact>(result).keySet().containsAll(ids), 'Records should contain the given ids');
 	}
 
 	@IsTest
@@ -65,10 +65,10 @@ private class fflib_SObjectFactoryTest
 		List<Contact> result = (List<Contact>) new ContactsFactory().generateByAccountId(ids);
 
 		// THEN there should be three Contact records
-		System.assertEquals(3, result.size(), 'Not enough records created');
+		System.Assert.areEqual(3, result.size(), 'Not enough records created');
 		Set<Id> accountIds = new Set<Id>();
 		for (Contact record : result) accountIds.add(record.AccountId);
-		System.assert(accountIds.containsAll(ids), 'Records should contain the given ids');
+		System.Assert.isTrue(accountIds.containsAll(ids), 'Records should contain the given ids');
 	}
 
 	private class ContactsFactory extends fflib_SObjectFactory
diff --git a/sfdx-source/apex-extensions/tests/classes/factories/fflib_SObjectFactoryTest.cls-meta.xml b/sfdx-source/apex-extensions/tests/classes/factories/fflib_SObjectFactoryTest.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/tests/classes/factories/fflib_SObjectFactoryTest.cls-meta.xml
+++ b/sfdx-source/apex-extensions/tests/classes/factories/fflib_SObjectFactoryTest.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/tests/classes/logger/fflib_ALogAppenderFilterTest.cls b/sfdx-source/apex-extensions/tests/classes/logger/fflib_ALogAppenderFilterTest.cls
index de220d4..95bf5c2 100644
--- a/sfdx-source/apex-extensions/tests/classes/logger/fflib_ALogAppenderFilterTest.cls
+++ b/sfdx-source/apex-extensions/tests/classes/logger/fflib_ALogAppenderFilterTest.cls
@@ -43,7 +43,7 @@ private class fflib_ALogAppenderFilterTest
 		Boolean isValid = appender.checkValidLogLevel(System.LoggingLevel.ERROR);
 
 		// THEN - It should be valid
-		System.assert(isValid);
+		System.Assert.isTrue(isValid);
 	}
 
 	@IsTest
@@ -57,7 +57,7 @@ private class fflib_ALogAppenderFilterTest
 		Boolean isValid = appender.checkValidLogLevel(System.LoggingLevel.ERROR);
 
 		// THEN - It should not be valid
-		System.assert(!isValid);
+		System.Assert.isFalse(isValid);
 	}
 
 	@IsTest
@@ -70,7 +70,7 @@ private class fflib_ALogAppenderFilterTest
 		Boolean isValid = appender.checkValidLogLevel(System.LoggingLevel.WARN);
 
 		// THEN - It should not be valid
-		System.assert(!isValid);
+		System.Assert.isFalse(isValid);
 	}
 
 	/**
@@ -98,7 +98,7 @@ private class fflib_ALogAppenderFilterTest
 		}
 
 		// Then - It should be valid
-		System.assert(isValid);
+		System.Assert.istrue(isValid);
 	}*/
 
 	/**
@@ -126,7 +126,7 @@ private class fflib_ALogAppenderFilterTest
 		}
 
 		// Then - It should be valid
-		System.assert(isValid);
+		System.Assert.istrue(isValid);
 	}*/
 
 	@IsTest
@@ -144,7 +144,7 @@ private class fflib_ALogAppenderFilterTest
 		Boolean isValid = appender.checkValidLogLevel(System.LoggingLevel.WARN);
 
 		// Then - It should be valid
-		System.assert(isValid);
+		System.Assert.isTrue(isValid);
 	}
 
 	@IsTest
@@ -162,7 +162,7 @@ private class fflib_ALogAppenderFilterTest
 		Boolean isValid = appender.checkValidLogLevel(System.LoggingLevel.WARN);
 
 		// Then - It should be valid
-		System.assert(isValid);
+		System.Assert.isTrue(isValid);
 	}
 
 
@@ -181,7 +181,7 @@ private class fflib_ALogAppenderFilterTest
 		Boolean isValid = appender.checkValidLogLevel(System.LoggingLevel.WARN);
 
 		// Then - It should be valid
-		System.assert(!isValid);
+		System.Assert.isFalse(isValid);
 	}
 
 	@IsTest
@@ -195,7 +195,7 @@ private class fflib_ALogAppenderFilterTest
 		Boolean isValid = appender.checkValidLogLevel(System.LoggingLevel.WARN);
 
 		// Then - It should not be valid
-		System.assert(!isValid);
+		System.Assert.isFalse(isValid);
 	}
 
 
diff --git a/sfdx-source/apex-extensions/tests/classes/logger/fflib_ALogAppenderFilterTest.cls-meta.xml b/sfdx-source/apex-extensions/tests/classes/logger/fflib_ALogAppenderFilterTest.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/tests/classes/logger/fflib_ALogAppenderFilterTest.cls-meta.xml
+++ b/sfdx-source/apex-extensions/tests/classes/logger/fflib_ALogAppenderFilterTest.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/tests/classes/logger/fflib_LogEventAppenderTest.cls b/sfdx-source/apex-extensions/tests/classes/logger/fflib_LogEventAppenderTest.cls
index 70eaed0..02060d9 100644
--- a/sfdx-source/apex-extensions/tests/classes/logger/fflib_LogEventAppenderTest.cls
+++ b/sfdx-source/apex-extensions/tests/classes/logger/fflib_LogEventAppenderTest.cls
@@ -52,7 +52,7 @@ private class fflib_LogEventAppenderTest
 		}
 
 		// THEN - An Log Event should be thrown
-		System.assert(!caughtException);
+		System.Assert.isTrue(!caughtException);
 	}
 
 	@IsTest
@@ -65,7 +65,7 @@ private class fflib_LogEventAppenderTest
 		eventAppender.append(new fflib_LogEntry(System.LoggingLevel.INFO, TEST_ERROR_MESSAGE));
 
 		// THEN - It should be ignored
-		System.assertEquals(0, Limits.getDmlStatements(), 'Oops, the log entry should have been ignored');
+		System.Assert.areEqual(0, Limits.getDmlStatements(), 'Oops, the log entry should have been ignored');
 	}
 
 	@IsTest
@@ -81,7 +81,7 @@ private class fflib_LogEventAppenderTest
 		System.Test.stopTest();
 
 		// THEN - It should be ignored
-		System.assertEquals(1, [SELECT COUNT() FROM fflib_LogEntry__c]);
+		System.Assert.areEqual(1, [SELECT COUNT() FROM fflib_LogEntry__c]);
 	}
 
 	@IsTest
@@ -101,6 +101,6 @@ private class fflib_LogEventAppenderTest
 		System.Test.stopTest();
 
 		// THEN - It should be ignored
-		System.assertEquals(1, [SELECT COUNT() FROM fflib_LogEntry__c]);
+		System.Assert.areEqual(1, [SELECT COUNT() FROM fflib_LogEntry__c]);
 	}
 }
\ No newline at end of file
diff --git a/sfdx-source/apex-extensions/tests/classes/logger/fflib_LogEventAppenderTest.cls-meta.xml b/sfdx-source/apex-extensions/tests/classes/logger/fflib_LogEventAppenderTest.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/tests/classes/logger/fflib_LogEventAppenderTest.cls-meta.xml
+++ b/sfdx-source/apex-extensions/tests/classes/logger/fflib_LogEventAppenderTest.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/tests/classes/logger/fflib_LogEventStoreListenerTest.cls b/sfdx-source/apex-extensions/tests/classes/logger/fflib_LogEventStoreListenerTest.cls
index 8c91dc1..71ada16 100644
--- a/sfdx-source/apex-extensions/tests/classes/logger/fflib_LogEventStoreListenerTest.cls
+++ b/sfdx-source/apex-extensions/tests/classes/logger/fflib_LogEventStoreListenerTest.cls
@@ -48,7 +48,7 @@ private class fflib_LogEventStoreListenerTest
 		System.Test.stopTest();
 
 		// THEN - a record should be created in the Log Event Store
-		System.assertEquals(1, [SELECT COUNT() FROM fflib_LogEntry__c]);
+		System.Assert.areEqual(1, [SELECT COUNT() FROM fflib_LogEntry__c]);
 	}
 
 	/**
@@ -72,8 +72,8 @@ private class fflib_LogEventStoreListenerTest
 
 		// THEN - a record should be created in the Log Event Store
 		List<fflib_LogEntry__c> logEntries = [SELECT Id, LogLevel__c, Message__c, User__c FROM fflib_LogEntry__c];
-		System.assert(logEntries.size() == 1);
-		System.assertEquals(testUser.Id, logEntries.get(0).User__c, 'Log Entry stored with wrong CreatedById');
+		System.Assert.areEqual(1, logEntries.size());
+		System.Assert.areEqual(testUser.Id, logEntries.get(0).User__c, 'Log Entry stored with wrong CreatedById');
 	}
 
 	private static fflib_LogEvent__e generateLoggingLevelEvent(LoggingLevel loggingLevel, String message)
diff --git a/sfdx-source/apex-extensions/tests/classes/logger/fflib_LogEventStoreListenerTest.cls-meta.xml b/sfdx-source/apex-extensions/tests/classes/logger/fflib_LogEventStoreListenerTest.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/tests/classes/logger/fflib_LogEventStoreListenerTest.cls-meta.xml
+++ b/sfdx-source/apex-extensions/tests/classes/logger/fflib_LogEventStoreListenerTest.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/tests/classes/logger/fflib_LoggerTest.cls b/sfdx-source/apex-extensions/tests/classes/logger/fflib_LoggerTest.cls
index 2d4257e..290e032 100644
--- a/sfdx-source/apex-extensions/tests/classes/logger/fflib_LoggerTest.cls
+++ b/sfdx-source/apex-extensions/tests/classes/logger/fflib_LoggerTest.cls
@@ -63,7 +63,7 @@ private class fflib_LoggerTest
 		log.add(ERROR_MESSAGE);
 
 		// THEN - It should be appended to the logAppender
-		System.assert(APPENDER_MOCK.getAppendedMessages(System.LoggingLevel.INFO).contains(ERROR_MESSAGE));
+		System.Assert.isTrue(APPENDER_MOCK.getAppendedMessages(System.LoggingLevel.INFO).contains(ERROR_MESSAGE));
 	}
 
 	@IsTest
@@ -76,7 +76,7 @@ private class fflib_LoggerTest
 		log.debug(ERROR_MESSAGE);
 
 		// THEN - It should be appended to the logAppender
-		System.assert(
+		System.Assert.isTrue(
 				APPENDER_MOCK
 						.getAppendedMessages(System.LoggingLevel.DEBUG)
 						.contains(ERROR_MESSAGE)
@@ -97,7 +97,7 @@ private class fflib_LoggerTest
 		log.debug(e);
 
 		// THEN - It should be appended to the logAppender
-		System.assert(
+		System.Assert.isTrue(
 				APPENDER_MOCK
 						.getAppendedMessages(System.LoggingLevel.DEBUG)
 						.contains(ERROR_MESSAGE_FORMATTED_WITH_EXCEPTION)
@@ -115,7 +115,7 @@ private class fflib_LoggerTest
 		log.debug(ERROR_MESSAGE_WITH_ARGS, ARGUMENTS);
 
 		// THEN - It should be appended to the logAppender
-		System.assert(
+		System.Assert.isTrue(
 				APPENDER_MOCK
 						.getAppendedMessages(System.LoggingLevel.DEBUG)
 						.contains(ERROR_MESSAGE_FORMATTED_WITH_ARGS)
@@ -132,7 +132,7 @@ private class fflib_LoggerTest
 		log.error(ERROR_MESSAGE);
 
 		// THEN - It should be appended to the logAppender
-		System.assert(APPENDER_MOCK.getAppendedMessages(System.LoggingLevel.ERROR).contains(ERROR_MESSAGE));
+		System.Assert.isTrue(APPENDER_MOCK.getAppendedMessages(System.LoggingLevel.ERROR).contains(ERROR_MESSAGE));
 	}
 
 	@IsTest
@@ -145,7 +145,7 @@ private class fflib_LoggerTest
 		log.error(ERROR_MESSAGE_WITH_ARGS, ARGUMENTS);
 
 		// THEN - It should be appended to the logAppender
-		System.assert(
+		System.Assert.isTrue(
 				APPENDER_MOCK
 						.getAppendedMessages(System.LoggingLevel.ERROR)
 						.contains(ERROR_MESSAGE_FORMATTED_WITH_ARGS)
@@ -162,7 +162,7 @@ private class fflib_LoggerTest
 		log.info(ERROR_MESSAGE);
 
 		// THEN - It should be appended to the logAppender
-		System.assert(APPENDER_MOCK.getAppendedMessages(System.LoggingLevel.INFO).contains(ERROR_MESSAGE));
+		System.Assert.isTrue(APPENDER_MOCK.getAppendedMessages(System.LoggingLevel.INFO).contains(ERROR_MESSAGE));
 	}
 
 	@IsTest
@@ -175,7 +175,7 @@ private class fflib_LoggerTest
 		log.info(ERROR_MESSAGE_WITH_ARGS, ARGUMENTS);
 
 		// THEN - It should be appended to the logAppender
-		System.assert(
+		System.Assert.isTrue(
 				APPENDER_MOCK
 						.getAppendedMessages(System.LoggingLevel.INFO)
 						.contains(ERROR_MESSAGE_FORMATTED_WITH_ARGS)
@@ -192,7 +192,7 @@ private class fflib_LoggerTest
 		log.warning(ERROR_MESSAGE);
 
 		// THEN - It should be appended to the logAppender
-		System.assert(APPENDER_MOCK.getAppendedMessages(System.LoggingLevel.WARN).contains(ERROR_MESSAGE));
+		System.Assert.isTrue(APPENDER_MOCK.getAppendedMessages(System.LoggingLevel.WARN).contains(ERROR_MESSAGE));
 	}
 
 	@IsTest
@@ -205,7 +205,7 @@ private class fflib_LoggerTest
 		log.warning(ERROR_MESSAGE_WITH_ARGS, ARGUMENTS);
 
 		// THEN - It should be appended to the logAppender
-		System.assert(
+		System.Assert.isTrue(
 				APPENDER_MOCK
 						.getAppendedMessages(System.LoggingLevel.WARN)
 						.contains(ERROR_MESSAGE_FORMATTED_WITH_ARGS)
@@ -225,12 +225,12 @@ private class fflib_LoggerTest
 		log.error(ERROR_MESSAGE);
 
 		// THEN - It Should be added to both appenders
-		System.assert(
+		System.Assert.isTrue(
 				APPENDER_MOCK
 						.getAppendedMessages(System.LoggingLevel.ERROR)
 						.contains(ERROR_MESSAGE)
 		);
-		System.assert(
+		System.Assert.istrue(
 				APPENDER_MOCK_B
 						.getAppendedMessages(System.LoggingLevel.ERROR)
 						.contains(ERROR_MESSAGE)
diff --git a/sfdx-source/apex-extensions/tests/classes/logger/fflib_LoggerTest.cls-meta.xml b/sfdx-source/apex-extensions/tests/classes/logger/fflib_LoggerTest.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/tests/classes/logger/fflib_LoggerTest.cls-meta.xml
+++ b/sfdx-source/apex-extensions/tests/classes/logger/fflib_LoggerTest.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/tests/classes/triggerHandler/fflib_TriggerHandlerTest.cls b/sfdx-source/apex-extensions/tests/classes/triggerHandler/fflib_TriggerHandlerTest.cls
index ee5ce4d..0be6b87 100644
--- a/sfdx-source/apex-extensions/tests/classes/triggerHandler/fflib_TriggerHandlerTest.cls
+++ b/sfdx-source/apex-extensions/tests/classes/triggerHandler/fflib_TriggerHandlerTest.cls
@@ -67,12 +67,12 @@ private class fflib_TriggerHandlerTest
 		System.Test.stopTest();
 
 		// THEN the trigger handler should be invoked
-		System.assert(handlerGotInvoked, 'Whoops, the Trigger Action was not invoked');
-		System.assertEquals(records, ctx.records);
-		System.assert(ctx.isInsert());
-		System.assert(ctx.isBefore());
-		System.assert(ctx.isDelete() == false);
-		System.assert(ctx.isUndelete() == false);
+		System.Assert.isTrue(handlerGotInvoked, 'Whoops, the Trigger Action was not invoked');
+		System.Assert.areEqual(records, ctx.records);
+		System.Assert.isTrue(ctx.isInsert());
+		System.Assert.isTrue(ctx.isBefore());
+		System.Assert.isFalse(ctx.isDelete());
+		System.Assert.isFalse(ctx.isUndelete());
 	}
 
 	@IsTest
@@ -103,9 +103,9 @@ private class fflib_TriggerHandlerTest
 
 		// THEN it should only return the changed records
 		Map<Id, SObject> resultMap = new Map<Id, SObject>(result);
-		System.assertEquals(2, result.size());
-		System.assert(resultMap.containsKey(idLuke));
-		System.assert(resultMap.containsKey(idHan));
+		System.Assert.areEqual(2, result.size());
+		System.Assert.istrue(resultMap.containsKey(idLuke));
+		System.Assert.istrue(resultMap.containsKey(idHan));
 	}
 
 	@IsTest
@@ -136,8 +136,8 @@ private class fflib_TriggerHandlerTest
 
 		// THEN it should only return the changed records
 		Map<Id, SObject> resultMap = new Map<Id, SObject>(result);
-		System.assertEquals(1, result.size());
-		System.assert(resultMap.containsKey(idLuke));
+		System.Assert.areEqual(1, result.size());
+		System.Assert.istrue(resultMap.containsKey(idLuke));
 	}
 
 	@IsTest
@@ -152,8 +152,8 @@ private class fflib_TriggerHandlerTest
 		ctx.triggerOperation = System.TriggerOperation.AFTER_DELETE;
 		new MyTriggerAction().setContext(ctx).doWork();
 
-		System.assert(ctx.isAfter());
-		System.assert(ctx.isDelete());
+		System.Assert.istrue(ctx.isAfter());
+		System.Assert.istrue(ctx.isDelete());
 	}
 
 	@IsTest
@@ -168,8 +168,8 @@ private class fflib_TriggerHandlerTest
 		ctx.triggerOperation = System.TriggerOperation.AFTER_INSERT;
 		new MyTriggerAction().setContext(ctx).doWork();
 
-		System.assert(ctx.isAfter());
-		System.assert(ctx.isInsert());
+		System.Assert.istrue(ctx.isAfter());
+		System.Assert.istrue(ctx.isInsert());
 	}
 
 	@IsTest
@@ -184,8 +184,8 @@ private class fflib_TriggerHandlerTest
 		ctx.triggerOperation = System.TriggerOperation.AFTER_UNDELETE;
 		new MyTriggerAction().setContext(ctx).doWork();
 
-		System.assert(ctx.isAfter());
-		System.assert(ctx.isUndelete());
+		System.Assert.istrue(ctx.isAfter());
+		System.Assert.istrue(ctx.isUndelete());
 	}
 
 	@IsTest
@@ -200,8 +200,8 @@ private class fflib_TriggerHandlerTest
 		ctx.triggerOperation = System.TriggerOperation.AFTER_UPDATE;
 		new MyTriggerAction().setContext(ctx).doWork();
 
-		System.assert(ctx.isAfter());
-		System.assert(ctx.isUpdate());
+		System.Assert.istrue(ctx.isAfter());
+		System.Assert.istrue(ctx.isUpdate());
 	}
 
 	@IsTest
@@ -216,8 +216,8 @@ private class fflib_TriggerHandlerTest
 		ctx.triggerOperation = System.TriggerOperation.BEFORE_DELETE;
 		new MyTriggerAction().setContext(ctx).doWork();
 
-		System.assert(ctx.isBefore());
-		System.assert(ctx.isDelete());
+		System.Assert.istrue(ctx.isBefore());
+		System.Assert.istrue(ctx.isDelete());
 	}
 
 	@IsTest
@@ -232,8 +232,8 @@ private class fflib_TriggerHandlerTest
 		ctx.triggerOperation = System.TriggerOperation.BEFORE_INSERT;
 		new MyTriggerAction().setContext(ctx).doWork();
 
-		System.assert(ctx.isBefore());
-		System.assert(ctx.isInsert());
+		System.Assert.istrue(ctx.isBefore());
+		System.Assert.istrue(ctx.isInsert());
 	}
 
 	@IsTest
@@ -248,8 +248,8 @@ private class fflib_TriggerHandlerTest
 		ctx.triggerOperation = System.TriggerOperation.BEFORE_UPDATE;
 		new MyTriggerAction().setContext(ctx).doWork();
 
-		System.assert(ctx.isBefore());
-		System.assert(ctx.isUpdate());
+		System.Assert.istrue(ctx.isBefore());
+		System.Assert.istrue(ctx.isUpdate());
 	}
 
 	@IsTest
diff --git a/sfdx-source/apex-extensions/tests/classes/triggerHandler/fflib_TriggerHandlerTest.cls-meta.xml b/sfdx-source/apex-extensions/tests/classes/triggerHandler/fflib_TriggerHandlerTest.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/tests/classes/triggerHandler/fflib_TriggerHandlerTest.cls-meta.xml
+++ b/sfdx-source/apex-extensions/tests/classes/triggerHandler/fflib_TriggerHandlerTest.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/tests/classes/unitOfWork/fflib_UnitOfWorkTest.cls b/sfdx-source/apex-extensions/tests/classes/unitOfWork/fflib_UnitOfWorkTest.cls
index ee3b865..b749537 100644
--- a/sfdx-source/apex-extensions/tests/classes/unitOfWork/fflib_UnitOfWorkTest.cls
+++ b/sfdx-source/apex-extensions/tests/classes/unitOfWork/fflib_UnitOfWorkTest.cls
@@ -50,10 +50,10 @@ private class fflib_UnitOfWorkTest
         System.Test.stopTest();
 
         // THEN - Then all three work items should be executed
-        System.assert(workA.didWork, 'Work item A did not execute');
-        System.assert(workB.didWork, 'Work item B did not execute');
-        System.assert(workC.didWork, 'Work item C did not execute');
-        System.assertEquals(3, [SELECT COUNT() FROM fflib_LogEntry__c]);
+        System.Assert.istrue(workA.didWork, 'Work item A did not execute');
+        System.Assert.istrue(workB.didWork, 'Work item B did not execute');
+        System.Assert.istrue(workC.didWork, 'Work item C did not execute');
+        System.Assert.areEqual(3, [SELECT COUNT() FROM fflib_LogEntry__c]);
 	}
 
     @IsTest
@@ -72,10 +72,10 @@ private class fflib_UnitOfWorkTest
         myWork.doWork();  // Execute without start-stop test due to Salesforce limitation
 
         // THEN - Then all three work items should be executed
-        System.assert(workA.didWork, 'Work item A did not execute');
-        System.assert(workB.didWork, 'Work item B did not execute');
-        System.assert(workC.didWork, 'Work item C was executed in realtime while is should be queued');
-        System.assertEquals(3, [SELECT COUNT() FROM fflib_LogEntry__c]);
+        System.Assert.istrue(workA.didWork, 'Work item A did not execute');
+        System.Assert.istrue(workB.didWork, 'Work item B did not execute');
+        System.Assert.istrue(workC.didWork, 'Work item C was executed in realtime while is should be queued');
+        System.Assert.areEqual(3, [SELECT COUNT() FROM fflib_LogEntry__c]);
     }
 
     @IsTest
@@ -97,7 +97,7 @@ private class fflib_UnitOfWorkTest
         myWork.doWork();    // Execute without start-stop test due to Salesforce limitation
 
         // THEN - Then all three work items should be executed
-        System.assertEquals(3, [SELECT COUNT() FROM fflib_LogEntry__c]);
+        System.Assert.areEqual(3, [SELECT COUNT() FROM fflib_LogEntry__c]);
     }
 
     @IsTest
@@ -117,9 +117,9 @@ private class fflib_UnitOfWorkTest
         System.Test.stopTest();
 
         // THEN - Then all three work items should be executed
-        System.assert(orderOfExecution.get(0).contains('WorkC'), 'Expected Work C with priority 3 to be executed first');
-        System.assert(orderOfExecution.get(1).contains('WorkB'), 'Expected Work B with priority 2 to be executed second');
-        System.assert(orderOfExecution.get(2).contains('WorkA'), 'Expected Work B with priority 1 to be executed last');
+        System.Assert.istrue(orderOfExecution.get(0).contains('WorkC'), 'Expected Work C with priority 3 to be executed first');
+        System.Assert.istrue(orderOfExecution.get(1).contains('WorkB'), 'Expected Work B with priority 2 to be executed second');
+        System.Assert.istrue(orderOfExecution.get(2).contains('WorkA'), 'Expected Work B with priority 1 to be executed last');
     }
 
     @IsTest
@@ -139,9 +139,9 @@ private class fflib_UnitOfWorkTest
         System.Test.stopTest();
 
         // THEN - Then all three work items should be executed
-        System.assert(orderOfExecution.get(0).contains('WorkC'), 'Expected Work C with priority 3 to be executed first');
-        System.assert(orderOfExecution.get(1).contains('WorkB'), 'Expected Work B with priority 2 to be executed second');
-        System.assert(orderOfExecution.get(2).contains('WorkA'), 'Expected Work B with priority 1 to be executed last');
+        System.Assert.istrue(orderOfExecution.get(0).contains('WorkC'), 'Expected Work C with priority 3 to be executed first');
+        System.Assert.istrue(orderOfExecution.get(1).contains('WorkB'), 'Expected Work B with priority 2 to be executed second');
+        System.Assert.istrue(orderOfExecution.get(2).contains('WorkA'), 'Expected Work B with priority 1 to be executed last');
     }
 
     private virtual class Work extends fflib_DoWork
diff --git a/sfdx-source/apex-extensions/tests/classes/unitOfWork/fflib_UnitOfWorkTest.cls-meta.xml b/sfdx-source/apex-extensions/tests/classes/unitOfWork/fflib_UnitOfWorkTest.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/tests/classes/unitOfWork/fflib_UnitOfWorkTest.cls-meta.xml
+++ b/sfdx-source/apex-extensions/tests/classes/unitOfWork/fflib_UnitOfWorkTest.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/tests/classes/utils/fflib_ArrayUtilsTest.cls b/sfdx-source/apex-extensions/tests/classes/utils/fflib_ArrayUtilsTest.cls
index 2efe0a5..39c7bea 100644
--- a/sfdx-source/apex-extensions/tests/classes/utils/fflib_ArrayUtilsTest.cls
+++ b/sfdx-source/apex-extensions/tests/classes/utils/fflib_ArrayUtilsTest.cls
@@ -11,7 +11,7 @@ private class fflib_ArrayUtilsTest
     @IsTest
     static void testObjectToString()
     {
-        System.assertEquals(
+        System.Assert.areEqual(
                 new List<String> {'123', '456', '789'},
                 fflib_ArrayUtils.objectToString(
                         new List<Object> {123, 456, 789}
@@ -22,7 +22,7 @@ private class fflib_ArrayUtilsTest
     @IsTest
     static void testObjectStringToString()
     {
-        System.assertEquals(
+        System.Assert.areEqual(
                 new List<String> {'123', '456', '789'},
                 fflib_ArrayUtils.objectToString(
                         new List<Object> {'123', '456', '789'}
@@ -33,7 +33,7 @@ private class fflib_ArrayUtilsTest
     @IsTest
     static void itShouldReturnEmptyListOnEmptyObjectToString()
     {
-        System.assertEquals(
+        System.Assert.areEqual(
                 new List<String>(),
                 fflib_ArrayUtils.objectToString(
                         new List<Object>()
@@ -44,7 +44,7 @@ private class fflib_ArrayUtilsTest
     @IsTest
     static void itShouldConvertSetToListOfString()
     {
-        System.assertEquals(
+        System.Assert.areEqual(
                 new List<String> {'1', '2', '3'},
                 fflib_ArrayUtils.objectToString(
                         new Set<Object> {1, 2, 3}
@@ -57,7 +57,7 @@ private class fflib_ArrayUtilsTest
     {
         Id idA = fflib_IDGenerator.generate(Account.SObjectType);
         Id idB = fflib_IDGenerator.generate(Account.SObjectType);
-        System.assertEquals(
+        System.Assert.areEqual(
                 new Set<Id> {idA, idB},
                 fflib_ArrayUtils.objectToIds(
                         new Set<Object>
@@ -72,7 +72,7 @@ private class fflib_ArrayUtilsTest
     @IsTest
     static void itShouldReturnReversedObjectList()
     {
-        System.assertEquals(
+        System.Assert.areEqual(
                 new List<Object>
                 {
                         (Object) 'C',
@@ -93,7 +93,7 @@ private class fflib_ArrayUtilsTest
     @IsTest
     static void itShouldReturnReversedSObjectList()
     {
-        System.assertEquals(
+        System.Assert.areEqual(
                 new List<SObject>
                 {
                         (SObject) new Account(Name = 'C'),
@@ -114,7 +114,7 @@ private class fflib_ArrayUtilsTest
     @IsTest
     static void itShouldConvertListOfStringsIntoUpperCase()
     {
-        System.assertEquals(
+        System.Assert.areEqual(
                 new List<String>
                 {
                         'TEST A',
@@ -135,7 +135,7 @@ private class fflib_ArrayUtilsTest
     @IsTest
     static void testLowerCase()
     {
-        System.assertEquals(
+        System.Assert.areEqual(
                 new List<String> {'abc', 'def'},
                 fflib_ArrayUtils.lowerCase(
                         new List<String> {'ABC', 'DEF'}
@@ -147,28 +147,28 @@ private class fflib_ArrayUtilsTest
     static void testIsEmpty()
     {
         List<String> aNull = null;
-        System.assertEquals(true, fflib_ArrayUtils.isEmpty(aNull));
-        System.assertEquals(true, fflib_ArrayUtils.isEmpty(new List<String> {}));
-        System.assertEquals(false, fflib_ArrayUtils.isEmpty(new List<String> {'a'}));
-        System.assertEquals(false, fflib_ArrayUtils.isEmpty(new List<String> {'a', 'b'}));
-        System.assertEquals(true, fflib_ArrayUtils.isEmpty(new List<Integer> {}));
-        System.assertEquals(false, fflib_ArrayUtils.isEmpty(new List<Integer> {1}));
-        System.assertEquals(false, fflib_ArrayUtils.isEmpty(new List<Integer> {1, 2}));
+        System.Assert.istrue(fflib_ArrayUtils.isEmpty(aNull));
+        System.Assert.istrue(fflib_ArrayUtils.isEmpty(new List<String> {}));
+        System.Assert.isfalse(fflib_ArrayUtils.isEmpty(new List<String> {'a'}));
+        System.Assert.isfalse(fflib_ArrayUtils.isEmpty(new List<String> {'a', 'b'}));
+        System.Assert.istrue(fflib_ArrayUtils.isEmpty(new List<Integer> {}));
+        System.Assert.isfalse(fflib_ArrayUtils.isEmpty(new List<Integer> {1}));
+        System.Assert.isfalse(fflib_ArrayUtils.isEmpty(new List<Integer> {1, 2}));
     }
 
     @IsTest
     static void testIsNotEmpty()
     {
         List<String> aNull = null;
-        System.assertEquals(false, fflib_ArrayUtils.isNotEmpty(aNull));
-        System.assertEquals(false, fflib_ArrayUtils.isNotEmpty(new List<String> {}));
-        System.assertEquals(true, fflib_ArrayUtils.isNotEmpty(new List<String> {'a'}));
-        System.assertEquals(true, fflib_ArrayUtils.isNotEmpty(new List<String> {'a', 'b'}));
-        System.assertEquals(false, fflib_ArrayUtils.isNotEmpty(new List<Integer> {}));
-        System.assertEquals(true, fflib_ArrayUtils.isNotEmpty(new List<Integer> {1}));
-        System.assertEquals(true, fflib_ArrayUtils.isNotEmpty(new List<Integer> {1, 2}));
-        System.assertEquals(false, fflib_ArrayUtils.isNotEmpty(new List<Account> {}));
-        System.assertEquals(true, fflib_ArrayUtils.isNotEmpty(new List<Account> {new Account(Name = 'test')}));
+        System.Assert.isfalse(fflib_ArrayUtils.isNotEmpty(aNull));
+        System.Assert.isfalse(fflib_ArrayUtils.isNotEmpty(new List<String> {}));
+        System.Assert.istrue(fflib_ArrayUtils.isNotEmpty(new List<String> {'a'}));
+        System.Assert.istrue(fflib_ArrayUtils.isNotEmpty(new List<String> {'a', 'b'}));
+        System.Assert.isfalse(fflib_ArrayUtils.isNotEmpty(new List<Integer> {}));
+        System.Assert.istrue(fflib_ArrayUtils.isNotEmpty(new List<Integer> {1}));
+        System.Assert.istrue(fflib_ArrayUtils.isNotEmpty(new List<Integer> {1, 2}));
+        System.Assert.isfalse(fflib_ArrayUtils.isNotEmpty(new List<Account> {}));
+        System.Assert.istrue(fflib_ArrayUtils.isNotEmpty(new List<Account> {new Account(Name = 'test')}));
     }
 
     @IsTest
@@ -181,7 +181,7 @@ private class fflib_ArrayUtilsTest
         Datetime maxDatetime = fflib_ArrayUtils.maxDatetime(datetimes);
 
         // THEN - the highest Datetime should be returned
-        System.assertEquals(datetimes.get(1), maxDatetime);
+        System.Assert.areEqual(datetimes.get(1), maxDatetime);
     }
 
     @IsTest
@@ -194,18 +194,18 @@ private class fflib_ArrayUtilsTest
         Datetime maxDatetime = fflib_ArrayUtils.minDatetime(datetimes);
 
         // THEN - the highest Datetime should be returned
-        System.assertEquals(datetimes.get(4), maxDatetime);
+        System.Assert.areEqual(datetimes.get(4), maxDatetime);
     }
 
     @IsTest
     static void itShouldHandleNullInputsForMaxDatatime()
     {
-        System.assertEquals(
-                null, fflib_ArrayUtils.maxDatetime(new List<Datetime>()),
+        System.Assert.isNull(
+                fflib_ArrayUtils.maxDatetime(new List<Datetime>()),
                 'maxDatetime method was unable to handle an empty list as input'
         );
-        System.assertEquals(
-                null, fflib_ArrayUtils.maxDatetime(null),
+        System.Assert.isNull(
+                fflib_ArrayUtils.maxDatetime(null),
                 'maxDatetime method was unable to handle null as input'
         );
     }
@@ -221,8 +221,8 @@ private class fflib_ArrayUtilsTest
 
         // WHEN - we request the a cloned and sorted list
         List<Integer> sorted = fflib_ArrayUtils.cloneAndSort(unsorted);
-        System.assertNotEquals(unsorted, sorted, 'The original object was modified, something went wrong with the cloning');
-        System.assertEquals(new List<Integer> {-7, 1, 2, 30, 76}, sorted, 'Incorrect sorted list returned');
+        System.Assert.areNotEqual(unsorted, sorted, 'The original object was modified, something went wrong with the cloning');
+        System.Assert.areEqual(new List<Integer> {-7, 1, 2, 30, 76}, sorted, 'Incorrect sorted list returned');
     }
 
     @IsTest
@@ -235,7 +235,7 @@ private class fflib_ArrayUtilsTest
         Object result = fflib_ArrayUtils.lastValue(objects);
 
         // THEN - the highest Datetime should be returned
-        System.assertEquals(8, result, 'Did not return the last value in the list of objects');
+        System.Assert.areEqual(8, result, 'Did not return the last value in the list of objects');
     }
 
     @IsTest
@@ -260,10 +260,10 @@ private class fflib_ArrayUtilsTest
 
         Map<Id, Id> result = fflib_ArrayUtils.replaceValue(source, replacement);
 
-        System.assertEquals(3, result.size());
-        System.assertEquals(accountIdB, result.get(accountIdA));
-        System.assertEquals(accountIdA, result.get(accountIdB));
-        System.assertEquals(null, result.get(accountIdC));
+        System.Assert.areEqual(3, result.size());
+        System.Assert.areEqual(accountIdB, result.get(accountIdA));
+        System.Assert.areEqual(accountIdA, result.get(accountIdB));
+        System.Assert.isNull(result.get(accountIdC));
     }
 
     @IsTest
@@ -284,7 +284,7 @@ private class fflib_ArrayUtilsTest
         Set<String> result = fflib_ArrayUtils.getAllValues(stringsByIds, new Set<Id> {accountIdA, accountIdB});
 
         // THEN we get the values of the provide sub-set Ids
-        System.assert(result.containsAll(new Set<String> {'Account A', 'Account B'}));
+        System.Assert.istrue(result.containsAll(new Set<String> {'Account A', 'Account B'}));
     }
 
     @IsTest
@@ -308,13 +308,13 @@ private class fflib_ArrayUtilsTest
 
         Map<Id, Set<String>> result = fflib_ArrayUtils.mergeMaps(stringsByIdsA, stringsByIdsB);
 
-        System.assert(result.keySet().containsAll(ids));
-        System.assert(result.get(accountIdA).containsAll(new Set<String>{'A1', 'A2', 'A3'}));
-        System.assert(result.get(accountIdA).size() == 3);
-        System.assert(result.get(accountIdB).contains('B1'));
-        System.assert(result.get(accountIdB).size() == 1);
-        System.assert(result.get(accountIdC).contains('C1'));
-        System.assert(result.get(accountIdC).size() == 1);
+        System.Assert.istrue(result.keySet().containsAll(ids));
+        System.Assert.istrue(result.get(accountIdA).containsAll(new Set<String>{'A1', 'A2', 'A3'}));
+        System.Assert.areEqual(3, result.get(accountIdA).size());
+        System.Assert.istrue(result.get(accountIdB).contains('B1'));
+        System.Assert.areEqual(1, result.get(accountIdB).size());
+        System.Assert.istrue(result.get(accountIdC).contains('C1'));
+        System.Assert.areEqual(1, result.get(accountIdC).size());
     }
 
     private static List<Datetime> generateDateTimes()
diff --git a/sfdx-source/apex-extensions/tests/classes/utils/fflib_ArrayUtilsTest.cls-meta.xml b/sfdx-source/apex-extensions/tests/classes/utils/fflib_ArrayUtilsTest.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/tests/classes/utils/fflib_ArrayUtilsTest.cls-meta.xml
+++ b/sfdx-source/apex-extensions/tests/classes/utils/fflib_ArrayUtilsTest.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/sfdx-source/apex-extensions/tests/classes/utils/fflib_OperatorUtilsTest.cls b/sfdx-source/apex-extensions/tests/classes/utils/fflib_OperatorUtilsTest.cls
index ef91a00..062011b 100644
--- a/sfdx-source/apex-extensions/tests/classes/utils/fflib_OperatorUtilsTest.cls
+++ b/sfdx-source/apex-extensions/tests/classes/utils/fflib_OperatorUtilsTest.cls
@@ -33,17 +33,17 @@ private class fflib_OperatorUtilsTest
 	@IsTest
 	static void testBehavior()
 	{
-		System.assertEquals('=', fflib_OperatorUtils.operatorToString(fflib_OperatorUtils.EQUALS));
-		System.assertEquals('!=', fflib_OperatorUtils.operatorToString(fflib_OperatorUtils.NOT_EQUALS));
-		System.assertEquals('<', fflib_OperatorUtils.operatorToString(fflib_OperatorUtils.LESS_THAN));
-		System.assertEquals('<=', fflib_OperatorUtils.operatorToString(fflib_OperatorUtils.LESS_THAN_OR_EQUAL_TO));
-		System.assertEquals('>', fflib_OperatorUtils.operatorToString(fflib_OperatorUtils.GREATER_THAN));
-		System.assertEquals('>=', fflib_OperatorUtils.operatorToString(fflib_OperatorUtils.GREATER_THAN_OR_EQUAL_TO));
-		System.assertEquals('like', fflib_OperatorUtils.operatorToString(fflib_OperatorUtils.LIKEx));
-		System.assertEquals('IN', fflib_OperatorUtils.operatorToString(fflib_OperatorUtils.INx));
-		System.assertEquals('NOT IN', fflib_OperatorUtils.operatorToString(fflib_OperatorUtils.NOT_IN));
-		System.assertEquals('INCLUDES', fflib_OperatorUtils.operatorToString(fflib_OperatorUtils.INCLUDES));
-		System.assertEquals('EXCLUDES', fflib_OperatorUtils.operatorToString(fflib_OperatorUtils.EXCLUDES));
-		System.assertEquals(null, fflib_OperatorUtils.operatorToString(null));
+		System.Assert.areEqual('=', fflib_OperatorUtils.operatorToString(fflib_OperatorUtils.EQUALS));
+		System.Assert.areEqual('!=', fflib_OperatorUtils.operatorToString(fflib_OperatorUtils.NOT_EQUALS));
+		System.Assert.areEqual('<', fflib_OperatorUtils.operatorToString(fflib_OperatorUtils.LESS_THAN));
+		System.Assert.areEqual('<=', fflib_OperatorUtils.operatorToString(fflib_OperatorUtils.LESS_THAN_OR_EQUAL_TO));
+		System.Assert.areEqual('>', fflib_OperatorUtils.operatorToString(fflib_OperatorUtils.GREATER_THAN));
+		System.Assert.areEqual('>=', fflib_OperatorUtils.operatorToString(fflib_OperatorUtils.GREATER_THAN_OR_EQUAL_TO));
+		System.Assert.areEqual('like', fflib_OperatorUtils.operatorToString(fflib_OperatorUtils.LIKEx));
+		System.Assert.areEqual('IN', fflib_OperatorUtils.operatorToString(fflib_OperatorUtils.INx));
+		System.Assert.areEqual('NOT IN', fflib_OperatorUtils.operatorToString(fflib_OperatorUtils.NOT_IN));
+		System.Assert.areEqual('INCLUDES', fflib_OperatorUtils.operatorToString(fflib_OperatorUtils.INCLUDES));
+		System.Assert.areEqual('EXCLUDES', fflib_OperatorUtils.operatorToString(fflib_OperatorUtils.EXCLUDES));
+		System.Assert.areEqual(null, fflib_OperatorUtils.operatorToString(null));
 	}
 }
\ No newline at end of file
diff --git a/sfdx-source/apex-extensions/tests/classes/utils/fflib_OperatorUtilsTest.cls-meta.xml b/sfdx-source/apex-extensions/tests/classes/utils/fflib_OperatorUtilsTest.cls-meta.xml
index f928c8e..754ecb1 100644
--- a/sfdx-source/apex-extensions/tests/classes/utils/fflib_OperatorUtilsTest.cls-meta.xml
+++ b/sfdx-source/apex-extensions/tests/classes/utils/fflib_OperatorUtilsTest.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>53.0</apiVersion>
+    <apiVersion>57.0</apiVersion>
     <status>Active</status>
 </ApexClass>