diff --git a/.github/workflows/jenkins-driver-tests.yml b/.github/workflows/jenkins-driver-tests.yml
index aff7f6f150..6af62c080e 100644
--- a/.github/workflows/jenkins-driver-tests.yml
+++ b/.github/workflows/jenkins-driver-tests.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         version:
-          [ 59, 60, 61, dev]
+          [57, 58, 59, 60, 61, dev]
 
     runs-on: ubuntu-latest
     steps:
diff --git a/drivers/SmartThings/matter-appliance/src/test/test_cook_top.lua b/drivers/SmartThings/matter-appliance/src/test/test_cook_top.lua
index 0321d956ce..4c489ee38d 100644
--- a/drivers/SmartThings/matter-appliance/src/test/test_cook_top.lua
+++ b/drivers/SmartThings/matter-appliance/src/test/test_cook_top.lua
@@ -91,7 +91,7 @@ test.register_coroutine_test(
     assert(component_to_endpoint_map["cookSurfaceTwo"] == COOK_SURFACE_TWO_ENDPOINT, "Cook Surface Two Endpoint must be 3")
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -117,7 +117,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -157,7 +157,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -192,7 +192,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-appliance/src/test/test_dishwasher.lua b/drivers/SmartThings/matter-appliance/src/test/test_dishwasher.lua
index 6819815506..93b6bbc3f3 100644
--- a/drivers/SmartThings/matter-appliance/src/test/test_dishwasher.lua
+++ b/drivers/SmartThings/matter-appliance/src/test/test_dishwasher.lua
@@ -103,7 +103,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -171,7 +171,7 @@ test.register_message_test(
     }, -- on receiving NO ERROR we don't do anything.
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -239,7 +239,7 @@ test.register_message_test(
     }, -- on receiving NO ERROR we don't do anything.
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -307,7 +307,7 @@ test.register_message_test(
     }, -- on receiving NO ERROR we don't do anything.
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -386,7 +386,7 @@ test.register_message_test(
     }, -- on receiving NO ERROR we don't do anything.
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -450,7 +450,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -490,7 +490,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -549,7 +549,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-appliance/src/test/test_extractor_hood.lua b/drivers/SmartThings/matter-appliance/src/test/test_extractor_hood.lua
index d176352f80..f326ba50b8 100644
--- a/drivers/SmartThings/matter-appliance/src/test/test_extractor_hood.lua
+++ b/drivers/SmartThings/matter-appliance/src/test/test_extractor_hood.lua
@@ -176,7 +176,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -250,7 +250,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -339,7 +339,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 test.register_message_test(
@@ -452,7 +452,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -490,7 +490,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -531,7 +531,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -592,7 +592,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -653,7 +653,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -666,7 +666,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_onoff,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -692,7 +692,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_onoff,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -716,7 +716,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_onoff,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-appliance/src/test/test_laundry_dryer.lua b/drivers/SmartThings/matter-appliance/src/test/test_laundry_dryer.lua
index ba1440af85..d942817d57 100644
--- a/drivers/SmartThings/matter-appliance/src/test/test_laundry_dryer.lua
+++ b/drivers/SmartThings/matter-appliance/src/test/test_laundry_dryer.lua
@@ -102,7 +102,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -170,7 +170,7 @@ test.register_message_test(
     }, -- on receiving NO ERROR we don't do anything.
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -238,7 +238,7 @@ test.register_message_test(
     }, -- on receiving NO ERROR we don't do anything.
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -306,7 +306,7 @@ test.register_message_test(
     }, -- on receiving NO ERROR we don't do anything.
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -385,7 +385,7 @@ test.register_message_test(
     }, -- on receiving NO ERROR we don't do anything.
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -449,7 +449,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -489,7 +489,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -548,7 +548,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -591,7 +591,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-appliance/src/test/test_laundry_washer.lua b/drivers/SmartThings/matter-appliance/src/test/test_laundry_washer.lua
index 6aba845a27..288d76778e 100644
--- a/drivers/SmartThings/matter-appliance/src/test/test_laundry_washer.lua
+++ b/drivers/SmartThings/matter-appliance/src/test/test_laundry_washer.lua
@@ -135,7 +135,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -178,7 +178,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-appliance/src/test/test_matter_appliance_rpc_5.lua b/drivers/SmartThings/matter-appliance/src/test/test_matter_appliance_rpc_5.lua
index 7e59d7925f..cc270cdddb 100644
--- a/drivers/SmartThings/matter-appliance/src/test/test_matter_appliance_rpc_5.lua
+++ b/drivers/SmartThings/matter-appliance/src/test/test_matter_appliance_rpc_5.lua
@@ -458,7 +458,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_dishwasher,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -500,7 +500,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_dishwasher,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -542,7 +542,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_washer,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -584,7 +584,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_washer,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -626,7 +626,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_dryer,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -668,7 +668,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_dryer,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -710,7 +710,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_oven,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -752,7 +752,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_oven,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -794,7 +794,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_refrigerator,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -836,7 +836,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_refrigerator,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -878,7 +878,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_refrigerator,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -920,7 +920,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_refrigerator,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-appliance/src/test/test_microwave_oven.lua b/drivers/SmartThings/matter-appliance/src/test/test_microwave_oven.lua
index cf69721714..b6c5f3091d 100644
--- a/drivers/SmartThings/matter-appliance/src/test/test_microwave_oven.lua
+++ b/drivers/SmartThings/matter-appliance/src/test/test_microwave_oven.lua
@@ -174,7 +174,7 @@ test.register_message_test(
     }, -- on receiving NO ERROR we don't do anything.
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -258,7 +258,7 @@ test.register_message_test(
       test_init()
       init_supported_microwave_oven_modes()
     end,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -338,7 +338,7 @@ test.register_message_test(
     }, -- on receiving NO ERROR we don't do anything.
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -453,7 +453,7 @@ test.register_message_test(
     }, -- on receiving NO ERROR we don't do anything.
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -479,7 +479,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-appliance/src/test/test_oven.lua b/drivers/SmartThings/matter-appliance/src/test/test_oven.lua
index 905f34d666..737f67de12 100644
--- a/drivers/SmartThings/matter-appliance/src/test/test_oven.lua
+++ b/drivers/SmartThings/matter-appliance/src/test/test_oven.lua
@@ -143,7 +143,7 @@ test.register_coroutine_test(
       "Cook Surface Two Endpoint must be 6")
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -228,7 +228,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -287,7 +287,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -371,7 +371,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -411,7 +411,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -437,7 +437,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -475,7 +475,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -513,7 +513,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -535,7 +535,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -557,7 +557,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-appliance/src/test/test_refrigerator.lua b/drivers/SmartThings/matter-appliance/src/test/test_refrigerator.lua
index 1210819d51..6fce3a45fb 100644
--- a/drivers/SmartThings/matter-appliance/src/test/test_refrigerator.lua
+++ b/drivers/SmartThings/matter-appliance/src/test/test_refrigerator.lua
@@ -147,7 +147,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -206,7 +206,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -249,7 +249,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -308,7 +308,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -351,7 +351,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-button/src/test/test_matter_button.lua b/drivers/SmartThings/matter-button/src/test/test_matter_button.lua
index dfc32bc7cb..aef4f9a422 100644
--- a/drivers/SmartThings/matter-button/src/test/test_matter_button.lua
+++ b/drivers/SmartThings/matter-button/src/test/test_matter_button.lua
@@ -71,7 +71,7 @@ test.register_message_test(
   }
 },
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -109,7 +109,7 @@ test.register_message_test(
   }
 },
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -148,7 +148,7 @@ test.register_message_test(
   },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -196,7 +196,7 @@ test.register_message_test(
   },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -220,7 +220,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -244,7 +244,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -268,7 +268,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -308,7 +308,7 @@ test.register_message_test(
 
 },
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -348,7 +348,7 @@ test.register_message_test(
 
 },
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -373,7 +373,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 -- run the tests
diff --git a/drivers/SmartThings/matter-button/src/test/test_matter_button_parent_child.lua b/drivers/SmartThings/matter-button/src/test/test_matter_button_parent_child.lua
index 01d3b103c7..3e41994c7f 100644
--- a/drivers/SmartThings/matter-button/src/test/test_matter_button_parent_child.lua
+++ b/drivers/SmartThings/matter-button/src/test/test_matter_button_parent_child.lua
@@ -136,7 +136,7 @@ test.register_message_test(
   }
 },
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -170,7 +170,7 @@ test.register_message_test(
   },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -213,7 +213,7 @@ test.register_message_test(
   },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -237,7 +237,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -261,7 +261,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -295,7 +295,7 @@ test.register_message_test(
 
 },
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -329,7 +329,7 @@ test.register_message_test(
 
 },
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -354,7 +354,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 -- run the tests
diff --git a/drivers/SmartThings/matter-button/src/test/test_matter_multi_button.lua b/drivers/SmartThings/matter-button/src/test/test_matter_multi_button.lua
index 91f3a06494..9158f8c6cd 100644
--- a/drivers/SmartThings/matter-button/src/test/test_matter_multi_button.lua
+++ b/drivers/SmartThings/matter-button/src/test/test_matter_multi_button.lua
@@ -136,7 +136,7 @@ test.register_message_test(
   }
 },
 {
-   min_api_version = 17
+   min_api_version = 15
 }
 )
 
@@ -169,7 +169,7 @@ test.register_message_test(
   }
 },
 {
-   min_api_version = 17
+   min_api_version = 15
 }
 )
 
@@ -194,7 +194,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("button2", button_attr.held({state_change = true})))
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -219,7 +219,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("button3", button_attr.pushed({state_change = true})))
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -243,7 +243,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -283,7 +283,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("button4", button_attr.double({state_change = true})))
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -311,7 +311,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -339,7 +339,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -377,7 +377,7 @@ test.register_message_test(
   }
 },
 {
-   min_api_version = 17
+   min_api_version = 15
 }
 )
 
@@ -416,7 +416,7 @@ test.register_message_test(
   },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -464,7 +464,7 @@ test.register_message_test(
   },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -488,7 +488,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -512,7 +512,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -536,7 +536,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -576,7 +576,7 @@ test.register_message_test(
 
 },
 {
-   min_api_version = 17
+   min_api_version = 15
 }
 )
 
@@ -616,7 +616,7 @@ test.register_message_test(
 
 },
 {
-   min_api_version = 17
+   min_api_version = 15
 }
 )
 
@@ -641,7 +641,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -686,7 +686,7 @@ test.register_message_test(
   -- no double event
 },
 {
-   min_api_version = 17
+   min_api_version = 15
 }
 )
 
@@ -744,7 +744,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 -- run the tests
diff --git a/drivers/SmartThings/matter-energy/src/test/test_battery_storage.lua b/drivers/SmartThings/matter-energy/src/test/test_battery_storage.lua
index 329daa6bd7..4c899a2042 100644
--- a/drivers/SmartThings/matter-energy/src/test/test_battery_storage.lua
+++ b/drivers/SmartThings/matter-energy/src/test/test_battery_storage.lua
@@ -104,7 +104,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 test.register_coroutine_test(
@@ -162,7 +162,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -179,7 +179,7 @@ test.register_coroutine_test(
       capabilities.powerMeter.power({ value = 30.0, unit = "W" })))
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -196,7 +196,7 @@ test.register_coroutine_test(
       capabilities.powerMeter.power({ value = 30.0, unit = "W" })))
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -301,7 +301,7 @@ test.register_coroutine_test(
     test_init = function()
       test_init()
     end,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-energy/src/test/test_evse.lua b/drivers/SmartThings/matter-energy/src/test/test_evse.lua
index 5614b0be18..d1b9c92324 100644
--- a/drivers/SmartThings/matter-energy/src/test/test_evse.lua
+++ b/drivers/SmartThings/matter-energy/src/test/test_evse.lua
@@ -120,7 +120,7 @@ test.register_coroutine_test(
       "Device Energy Management Endpoint must be 3")
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -150,7 +150,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -201,7 +201,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -225,7 +225,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -248,7 +248,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -271,7 +271,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -294,7 +294,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -317,7 +317,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -340,7 +340,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -364,7 +364,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -438,7 +438,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -541,7 +541,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-energy/src/test/test_evse_energy_meas.lua b/drivers/SmartThings/matter-energy/src/test/test_evse_energy_meas.lua
index f3b3b6c700..bf56269261 100644
--- a/drivers/SmartThings/matter-energy/src/test/test_evse_energy_meas.lua
+++ b/drivers/SmartThings/matter-energy/src/test/test_evse_energy_meas.lua
@@ -118,7 +118,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -152,7 +152,7 @@ test.register_coroutine_test(
     test_init = function()
       test_init()
     end,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-energy/src/test/test_solar_power.lua b/drivers/SmartThings/matter-energy/src/test/test_solar_power.lua
index 8e4e3c4e9a..f69f034a86 100644
--- a/drivers/SmartThings/matter-energy/src/test/test_solar_power.lua
+++ b/drivers/SmartThings/matter-energy/src/test/test_solar_power.lua
@@ -124,7 +124,7 @@ test.register_coroutine_test(
     capabilities.powerMeter.power({ value = 35.0, unit = "W" })))
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -172,7 +172,7 @@ test.register_coroutine_test(
     test_init = function()
       test_init()
     end,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -197,7 +197,7 @@ test.register_coroutine_test(
       clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 100000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0, apparent_energy = 0, reactive_energy = 0 })) })             --100Wh
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-hrap/src/test/test_thread_border_router_network.lua b/drivers/SmartThings/matter-hrap/src/test/test_thread_border_router_network.lua
index af8315375f..0633d93e65 100644
--- a/drivers/SmartThings/matter-hrap/src/test/test_thread_border_router_network.lua
+++ b/drivers/SmartThings/matter-hrap/src/test/test_thread_border_router_network.lua
@@ -108,7 +108,7 @@ test.register_coroutine_test(
         })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -143,7 +143,7 @@ test.register_message_test(
       }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -191,7 +191,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -213,7 +213,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -230,7 +230,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -247,7 +247,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -356,7 +356,7 @@ test.register_coroutine_test(
         )
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
diff --git a/drivers/SmartThings/matter-lock/src/test/test_aqara_matter_lock.lua b/drivers/SmartThings/matter-lock/src/test/test_aqara_matter_lock.lua
index 57d7e2b71e..f1873c7d82 100644
--- a/drivers/SmartThings/matter-lock/src/test/test_aqara_matter_lock.lua
+++ b/drivers/SmartThings/matter-lock/src/test/test_aqara_matter_lock.lua
@@ -95,7 +95,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -119,7 +119,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -141,7 +141,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -163,7 +163,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -185,7 +185,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -211,7 +211,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -310,7 +310,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -327,7 +327,7 @@ test.register_coroutine_test(
     )
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
diff --git a/drivers/SmartThings/matter-lock/src/test/test_bridged_matter_lock.lua b/drivers/SmartThings/matter-lock/src/test/test_bridged_matter_lock.lua
index 2f3566eb6c..0ce5d58404 100644
--- a/drivers/SmartThings/matter-lock/src/test/test_bridged_matter_lock.lua
+++ b/drivers/SmartThings/matter-lock/src/test/test_bridged_matter_lock.lua
@@ -91,7 +91,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -102,7 +102,7 @@ test.register_coroutine_test(
     mock_device_level:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-lock/src/test/test_matter_lock.lua b/drivers/SmartThings/matter-lock/src/test/test_matter_lock.lua
index 58185f2ec8..580bd34420 100644
--- a/drivers/SmartThings/matter-lock/src/test/test_matter_lock.lua
+++ b/drivers/SmartThings/matter-lock/src/test/test_matter_lock.lua
@@ -70,7 +70,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -94,7 +94,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -117,7 +117,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -140,7 +140,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -163,7 +163,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -186,7 +186,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -209,7 +209,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -234,7 +234,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -261,7 +261,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -330,7 +330,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -370,7 +370,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -385,7 +385,7 @@ test.register_coroutine_test(
     )
   end,
   {
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-lock/src/test/test_matter_lock_battery.lua b/drivers/SmartThings/matter-lock/src/test/test_matter_lock_battery.lua
index e43e075baf..9113374514 100644
--- a/drivers/SmartThings/matter-lock/src/test/test_matter_lock_battery.lua
+++ b/drivers/SmartThings/matter-lock/src/test/test_matter_lock_battery.lua
@@ -117,7 +117,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ profile = "base-lock" })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -145,7 +145,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ profile = "base-lock-batteryLevel" })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -155,7 +155,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_no_battery,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 test.run_registered_tests()
diff --git a/drivers/SmartThings/matter-lock/src/test/test_matter_lock_batteryLevel.lua b/drivers/SmartThings/matter-lock/src/test/test_matter_lock_batteryLevel.lua
index f1b3c2f182..8995332812 100644
--- a/drivers/SmartThings/matter-lock/src/test/test_matter_lock_batteryLevel.lua
+++ b/drivers/SmartThings/matter-lock/src/test/test_matter_lock_batteryLevel.lua
@@ -95,7 +95,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-lock/src/test/test_matter_lock_codes.lua b/drivers/SmartThings/matter-lock/src/test/test_matter_lock_codes.lua
index c2e86aae29..4ccc4d135b 100644
--- a/drivers/SmartThings/matter-lock/src/test/test_matter_lock_codes.lua
+++ b/drivers/SmartThings/matter-lock/src/test/test_matter_lock_codes.lua
@@ -223,7 +223,7 @@ test.register_coroutine_test(
     expect_reload_all_codes_messages(mock_device)
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -239,7 +239,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -263,7 +263,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -287,7 +287,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -311,7 +311,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -333,7 +333,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -358,7 +358,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -373,7 +373,7 @@ test.register_coroutine_test(
     expect_reload_all_codes_messages(mock_device)
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -418,7 +418,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -456,7 +456,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -562,7 +562,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -611,7 +611,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -671,7 +671,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -706,7 +706,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 test.register_coroutine_test(
@@ -740,7 +740,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -782,7 +782,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -825,7 +825,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -904,7 +904,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -971,7 +971,7 @@ test.register_coroutine_test(
 
   end,
   {
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 test.run_registered_tests()
diff --git a/drivers/SmartThings/matter-lock/src/test/test_matter_lock_cota.lua b/drivers/SmartThings/matter-lock/src/test/test_matter_lock_cota.lua
index 39066776f9..9e39655943 100644
--- a/drivers/SmartThings/matter-lock/src/test/test_matter_lock_cota.lua
+++ b/drivers/SmartThings/matter-lock/src/test/test_matter_lock_cota.lua
@@ -143,7 +143,7 @@ test.register_coroutine_test(
     expect_kick_off_cota_process(mock_device)
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -160,7 +160,7 @@ test.register_coroutine_test(
       })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -177,7 +177,7 @@ test.register_coroutine_test(
       })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -212,7 +212,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -236,7 +236,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -338,7 +338,7 @@ test.register_coroutine_test(
     test.socket.matter:__expect_send({mock_device.id, read_attribute_list})
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -436,7 +436,7 @@ test.register_coroutine_test(
     test.socket.matter:__expect_send({mock_device.id, read_attribute_list})
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -527,7 +527,7 @@ test.register_coroutine_test(
     test.socket.matter:__expect_send({mock_device.id, read_attribute_list})
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -587,7 +587,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -627,7 +627,7 @@ test.register_coroutine_test(
     test.mock_time.advance_time(2)
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -708,7 +708,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -743,7 +743,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -751,7 +751,7 @@ test.register_coroutine_test(
   "Delay setting COTA cred if another cred is already being set.", function()
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-lock/src/test/test_matter_lock_migration.lua b/drivers/SmartThings/matter-lock/src/test/test_matter_lock_migration.lua
index b94b31e105..8e1f731599 100644
--- a/drivers/SmartThings/matter-lock/src/test/test_matter_lock_migration.lua
+++ b/drivers/SmartThings/matter-lock/src/test/test_matter_lock_migration.lua
@@ -1,143 +1,143 @@
--- Copyright 2026 SmartThings, Inc.
--- Licensed under the Apache License, Version 2.0
-
-local test = require "integration_test"
-local capabilities = require "st.capabilities"
-local t_utils = require "integration_test.utils"
-local clusters = require "st.matter.clusters"
-local DoorLock = clusters.DoorLock
-local lock_utils = require "lock_utils"
-
-local mock_device = test.mock_device.build_test_matter_device({
-  profile = t_utils.get_profile_definition("base-lock.yml"),
-  manufacturer_info = {
-    vendor_id = 0x135D,
-    product_id = 0x00C1,
-  },
-  endpoints = {
-    {
-      endpoint_id = 0,
-      clusters = {
-        { cluster_id = clusters.BasicInformation.ID, cluster_type = "SERVER" },
-      },
-      device_types = {
-        { device_type_id = 0x0016, device_type_revision = 1 } -- RootNode
-      }
-    },
-    {
-      endpoint_id = 1,
-      clusters = {
-        {
-          cluster_id = DoorLock.ID,
-          cluster_type = "SERVER",
-          cluster_revision = 1,
-          feature_map = 0x0101, -- PIN & USR
-        }
-      },
-      device_types = {
-        { device_type_id = 0x000A, device_type_revision = 1 } -- Door Lock
-      }
-    }
-  }
-})
-
-local function test_init()
-  test.disable_startup_messages()
-  test.mock_device.add_test_device(mock_device)
-  -- mock_device:set_field(lock_utils.LOCK_CODES_FOR_MIGRATION, { {1, "ST Remote Operation Code"}, {2, "Guest1"}, {3, "Guest2"} }, {persist=true})
-end
-
-test.set_test_init_function(test_init)
-
-local subscribe_request = DoorLock.attributes.LockState:subscribe(mock_device)
-subscribe_request:merge(DoorLock.attributes.OperatingMode:subscribe(mock_device))
-subscribe_request:merge(DoorLock.attributes.NumberOfTotalUsersSupported:subscribe(mock_device))
-subscribe_request:merge(DoorLock.attributes.NumberOfPINUsersSupported:subscribe(mock_device))
-subscribe_request:merge(DoorLock.attributes.MaxPINCodeLength:subscribe(mock_device))
-subscribe_request:merge(DoorLock.attributes.MinPINCodeLength:subscribe(mock_device))
-subscribe_request:merge(DoorLock.attributes.RequirePINforRemoteOperation:subscribe(mock_device))
-subscribe_request:merge(DoorLock.events.LockOperation:subscribe(mock_device))
-subscribe_request:merge(DoorLock.events.DoorLockAlarm:subscribe(mock_device))
-subscribe_request:merge(DoorLock.events.LockUserChange:subscribe(mock_device))
-
-local enabled_optional_component_capability_pairs = {{
-  "main",
-  {
-    capabilities.lockUsers.ID,
-    capabilities.lockCredentials.ID,
-    capabilities.battery.ID,
-  }
-}}
-
-test.register_coroutine_test(
-  "Migration completed and User and Credential values restored",
-  function()
-    test.wait_for_events()
-    test.socket.capability:__queue_receive(
-      {
-        mock_device.id,
-        {capability = capabilities.lockCodes.ID, command = "migrate", args = {}}
-      }
-    )
-    test.socket.capability:__expect_send(
-      mock_device:generate_test_message("main", capabilities.lockCodes.migrated(true))
-    )
-    -- at this point, refresh is injected in migration.
-
-    test.socket.capability:__expect_send(
-      mock_device:generate_test_message("main", capabilities.lock.supportedLockValues({"locked", "unlocked", "not fully locked"}, {visibility = {displayed = false}}))
-    )
-    test.socket.capability:__expect_send(
-      mock_device:generate_test_message("main", capabilities.lock.supportedLockCommands({"lock", "unlock"}, {visibility = {displayed = false}}))
-    )
-    mock_device:expect_metadata_update({ profile = "lock-modular", optional_component_capabilities = enabled_optional_component_capability_pairs })
-
-
-    test.wait_for_events()
-    -- assume this was set prior
-    mock_device:set_field(lock_utils.LOCK_CODES_FOR_MIGRATION, { {1, "ST Remote Operation Code"}, {2, "Guest1"}, {3, "Guest2"} }, {persist=true})
-    test.socket.device_lifecycle:__queue_receive(mock_device:generate_info_changed(
-      {profile = {id = "00000000-1111-2222-3333-000000000010", components = { main = {capabilities={
-        ["lock"]= {id="lock", version=1}, ["lockAlarm"] = {id="lockAlarm", version=1}, ["remoteControlStatus"] = {id="remoteControlStatus", version=1},
-        ["lockUsers"] = {id="lockUsers", version=1}, ["lockCredentials"] = {id="lockCredentials", version=1}, ["firmwareUpdate"] = {id="firmwareUpdate", version=1},
-        ["refresh"] = {id="refresh", version=1}}}}}}
-    ))
-    test.socket["matter"]:__expect_send({mock_device.id, subscribe_request})
-    test.socket.capability:__expect_send(
-      mock_device:generate_test_message("main", capabilities.lockAlarm.alarm.clear({state_change = true}))
-    )
-    test.socket.capability:__expect_send(
-      mock_device:generate_test_message("main", capabilities.lockAlarm.supportedAlarmValues({"unableToLockTheDoor"}, {visibility = {displayed = false}}))
-    )
-    test.socket.capability:__expect_send(
-      mock_device:generate_test_message(
-        "main",
-        capabilities.lockUsers.users(
-          {
-            {userIndex=1, userName="ST Remote Operation Code", userType="guest"},
-            {userIndex=2, userName="Guest1", userType="guest"},
-            {userIndex=3, userName="Guest2", userType="guest"}
-          },
-          {visibility={displayed=false}})
-      )
-    )
-    test.socket.capability:__expect_send(
-      mock_device:generate_test_message(
-        "main",
-        capabilities.lockCredentials.credentials(
-          {
-            {credentialIndex=1, credentialType="pin", userIndex=1},
-            {credentialIndex=2, credentialType="pin", userIndex=2},
-            {credentialIndex=3, credentialType="pin", userIndex=3}
-          },
-          {visibility={displayed=false}}
-        )
-      )
-    )
-  end,
-  {
-     min_api_version = 17
-  }
-)
-
-test.run_registered_tests()
+-- Copyright 2026 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local test = require "integration_test"
+local capabilities = require "st.capabilities"
+local t_utils = require "integration_test.utils"
+local clusters = require "st.matter.clusters"
+local DoorLock = clusters.DoorLock
+local lock_utils = require "lock_utils"
+
+local mock_device = test.mock_device.build_test_matter_device({
+  profile = t_utils.get_profile_definition("base-lock.yml"),
+  manufacturer_info = {
+    vendor_id = 0x135D,
+    product_id = 0x00C1,
+  },
+  endpoints = {
+    {
+      endpoint_id = 0,
+      clusters = {
+        { cluster_id = clusters.BasicInformation.ID, cluster_type = "SERVER" },
+      },
+      device_types = {
+        { device_type_id = 0x0016, device_type_revision = 1 } -- RootNode
+      }
+    },
+    {
+      endpoint_id = 1,
+      clusters = {
+        {
+          cluster_id = DoorLock.ID,
+          cluster_type = "SERVER",
+          cluster_revision = 1,
+          feature_map = 0x0101, -- PIN & USR
+        }
+      },
+      device_types = {
+        { device_type_id = 0x000A, device_type_revision = 1 } -- Door Lock
+      }
+    }
+  }
+})
+
+local function test_init()
+  test.disable_startup_messages()
+  test.mock_device.add_test_device(mock_device)
+  -- mock_device:set_field(lock_utils.LOCK_CODES_FOR_MIGRATION, { {1, "ST Remote Operation Code"}, {2, "Guest1"}, {3, "Guest2"} }, {persist=true})
+end
+
+test.set_test_init_function(test_init)
+
+local subscribe_request = DoorLock.attributes.LockState:subscribe(mock_device)
+subscribe_request:merge(DoorLock.attributes.OperatingMode:subscribe(mock_device))
+subscribe_request:merge(DoorLock.attributes.NumberOfTotalUsersSupported:subscribe(mock_device))
+subscribe_request:merge(DoorLock.attributes.NumberOfPINUsersSupported:subscribe(mock_device))
+subscribe_request:merge(DoorLock.attributes.MaxPINCodeLength:subscribe(mock_device))
+subscribe_request:merge(DoorLock.attributes.MinPINCodeLength:subscribe(mock_device))
+subscribe_request:merge(DoorLock.attributes.RequirePINforRemoteOperation:subscribe(mock_device))
+subscribe_request:merge(DoorLock.events.LockOperation:subscribe(mock_device))
+subscribe_request:merge(DoorLock.events.DoorLockAlarm:subscribe(mock_device))
+subscribe_request:merge(DoorLock.events.LockUserChange:subscribe(mock_device))
+
+local enabled_optional_component_capability_pairs = {{
+  "main",
+  {
+    capabilities.lockUsers.ID,
+    capabilities.lockCredentials.ID,
+    capabilities.battery.ID,
+  }
+}}
+
+test.register_coroutine_test(
+  "Migration completed and User and Credential values restored",
+  function()
+    test.wait_for_events()
+    test.socket.capability:__queue_receive(
+      {
+        mock_device.id,
+        {capability = capabilities.lockCodes.ID, command = "migrate", args = {}}
+      }
+    )
+    test.socket.capability:__expect_send(
+      mock_device:generate_test_message("main", capabilities.lockCodes.migrated(true))
+    )
+    -- at this point, refresh is injected in migration.
+
+    test.socket.capability:__expect_send(
+      mock_device:generate_test_message("main", capabilities.lock.supportedLockValues({"locked", "unlocked", "not fully locked"}, {visibility = {displayed = false}}))
+    )
+    test.socket.capability:__expect_send(
+      mock_device:generate_test_message("main", capabilities.lock.supportedLockCommands({"lock", "unlock"}, {visibility = {displayed = false}}))
+    )
+    mock_device:expect_metadata_update({ profile = "lock-modular", optional_component_capabilities = enabled_optional_component_capability_pairs })
+
+
+    test.wait_for_events()
+    -- assume this was set prior
+    mock_device:set_field(lock_utils.LOCK_CODES_FOR_MIGRATION, { {1, "ST Remote Operation Code"}, {2, "Guest1"}, {3, "Guest2"} }, {persist=true})
+    test.socket.device_lifecycle:__queue_receive(mock_device:generate_info_changed(
+      {profile = {id = "00000000-1111-2222-3333-000000000010", components = { main = {capabilities={
+        ["lock"]= {id="lock", version=1}, ["lockAlarm"] = {id="lockAlarm", version=1}, ["remoteControlStatus"] = {id="remoteControlStatus", version=1},
+        ["lockUsers"] = {id="lockUsers", version=1}, ["lockCredentials"] = {id="lockCredentials", version=1}, ["firmwareUpdate"] = {id="firmwareUpdate", version=1},
+        ["refresh"] = {id="refresh", version=1}}}}}}
+    ))
+    test.socket["matter"]:__expect_send({mock_device.id, subscribe_request})
+    test.socket.capability:__expect_send(
+      mock_device:generate_test_message("main", capabilities.lockAlarm.alarm.clear({state_change = true}))
+    )
+    test.socket.capability:__expect_send(
+      mock_device:generate_test_message("main", capabilities.lockAlarm.supportedAlarmValues({"unableToLockTheDoor"}, {visibility = {displayed = false}}))
+    )
+    test.socket.capability:__expect_send(
+      mock_device:generate_test_message(
+        "main",
+        capabilities.lockUsers.users(
+          {
+            {userIndex=1, userName="ST Remote Operation Code", userType="guest"},
+            {userIndex=2, userName="Guest1", userType="guest"},
+            {userIndex=3, userName="Guest2", userType="guest"}
+          },
+          {visibility={displayed=false}})
+      )
+    )
+    test.socket.capability:__expect_send(
+      mock_device:generate_test_message(
+        "main",
+        capabilities.lockCredentials.credentials(
+          {
+            {credentialIndex=1, credentialType="pin", userIndex=1},
+            {credentialIndex=2, credentialType="pin", userIndex=2},
+            {credentialIndex=3, credentialType="pin", userIndex=3}
+          },
+          {visibility={displayed=false}}
+        )
+      )
+    )
+  end,
+  {
+     min_api_version = 15
+  }
+)
+
+test.run_registered_tests()
diff --git a/drivers/SmartThings/matter-lock/src/test/test_matter_lock_modular.lua b/drivers/SmartThings/matter-lock/src/test/test_matter_lock_modular.lua
index 745e769f9e..ca1aedfb04 100644
--- a/drivers/SmartThings/matter-lock/src/test/test_matter_lock_modular.lua
+++ b/drivers/SmartThings/matter-lock/src/test/test_matter_lock_modular.lua
@@ -361,7 +361,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ profile = "lock-modular", optional_component_capabilities = {{"main", {"batteryLevel"}}} })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -396,7 +396,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ profile = "lock-modular", optional_component_capabilities = {{"main", {"battery"}}} })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -431,7 +431,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_unlatch,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -467,7 +467,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_unlatch,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -503,7 +503,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_user_pin,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -540,7 +540,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_user_pin_schedule_unlatch,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -574,7 +574,10 @@ test.register_coroutine_test(
     )
     mock_device_modular:expect_metadata_update({ profile = "lock-modular-embedded-unlatch", optional_component_capabilities = {{"main", {"lockUsers", "lockCredentials", "lockSchedules", "battery"}}} })
   end,
-  { test_init = test_init_modular }
+  {
+    test_init = test_init_modular,
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -582,7 +585,10 @@ test.register_coroutine_test(
     -- simulate no actual change
     test.socket.device_lifecycle:__queue_receive(mock_device_modular:generate_info_changed({}))
   end,
-  { test_init = test_init_modular }
+  {
+    test_init = test_init_modular,
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -619,7 +625,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_modular,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -692,7 +698,7 @@ test.register_coroutine_test(
       test.mock_device.add_test_device(mock_nuki_smart_lock_ultra)
       mock_nuki_smart_lock_ultra:set_field(profiling_data.BATTERY_SUPPORT, battery_support.BATTERY_PERCENTAGE, {persist = true}) -- assume this has been set previously
     end,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-lock/src/test/test_matter_lock_unlatch.lua b/drivers/SmartThings/matter-lock/src/test/test_matter_lock_unlatch.lua
index f040c2b26e..3623665f39 100644
--- a/drivers/SmartThings/matter-lock/src/test/test_matter_lock_unlatch.lua
+++ b/drivers/SmartThings/matter-lock/src/test/test_matter_lock_unlatch.lua
@@ -106,7 +106,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -157,7 +157,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -178,7 +178,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -202,7 +202,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -226,7 +226,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -248,7 +248,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -270,7 +270,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -292,7 +292,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -381,7 +381,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 test.run_registered_tests()
diff --git a/drivers/SmartThings/matter-lock/src/test/test_new_matter_lock.lua b/drivers/SmartThings/matter-lock/src/test/test_new_matter_lock.lua
index 35acbfbff6..b868309e91 100644
--- a/drivers/SmartThings/matter-lock/src/test/test_new_matter_lock.lua
+++ b/drivers/SmartThings/matter-lock/src/test/test_new_matter_lock.lua
@@ -96,7 +96,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -133,7 +133,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -184,7 +184,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -204,7 +204,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -224,7 +224,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -244,7 +244,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -264,7 +264,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -284,7 +284,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -304,7 +304,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -375,7 +375,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -456,7 +456,7 @@ function()
   test.wait_for_events()
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -473,7 +473,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -493,7 +493,7 @@ test.register_coroutine_test(
       })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -512,7 +512,7 @@ test.register_coroutine_test(
       })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -533,7 +533,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -557,7 +557,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -579,7 +579,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -601,7 +601,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -623,7 +623,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -649,7 +649,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -748,7 +748,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -975,7 +975,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1044,7 +1044,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1071,7 +1071,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1115,7 +1115,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1164,7 +1164,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1191,7 +1191,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1257,7 +1257,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1284,7 +1284,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1350,7 +1350,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1377,7 +1377,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1442,7 +1442,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1471,7 +1471,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1527,7 +1527,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1590,7 +1590,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1646,7 +1646,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1794,7 +1794,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1823,7 +1823,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1877,7 +1877,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1906,7 +1906,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1978,7 +1978,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2007,7 +2007,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2078,7 +2078,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2107,7 +2107,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2157,7 +2157,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2189,7 +2189,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2257,7 +2257,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2286,7 +2286,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2338,7 +2338,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2370,7 +2370,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2501,7 +2501,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2609,7 +2609,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/matter-lock/src/test/test_new_matter_lock_aliro.lua b/drivers/SmartThings/matter-lock/src/test/test_new_matter_lock_aliro.lua
index 250fcb8af5..573dbf0e62 100644
--- a/drivers/SmartThings/matter-lock/src/test/test_new_matter_lock_aliro.lua
+++ b/drivers/SmartThings/matter-lock/src/test/test_new_matter_lock_aliro.lua
@@ -155,7 +155,10 @@ test.register_coroutine_test(
         capabilities.lockAliro.readerVerificationKey(EXPECTED_PUB_HEX, {visibility = {displayed = false}})
       )
     )
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -176,7 +179,10 @@ test.register_coroutine_test(
         capabilities.lockAliro.readerGroupIdentifier(EXPECTED_GROUP_ID_HEX, {visibility = {displayed = false}})
       )
     )
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -199,7 +205,10 @@ test.register_coroutine_test(
           {visibility = {displayed = false}})
         )
     )
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -222,7 +231,10 @@ test.register_coroutine_test(
           {visibility = {displayed = false}})
         )
     )
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -245,7 +257,10 @@ test.register_coroutine_test(
           {visibility = {displayed = false}})
         )
     )
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -266,7 +281,10 @@ test.register_coroutine_test(
         capabilities.lockAliro.groupResolvingKey(EXPECTED_GROUP_ID_HEX, {visibility = {displayed = false}})
       )
     )
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -289,7 +307,10 @@ test.register_coroutine_test(
           {visibility = {displayed = false}})
         )
     )
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -312,7 +333,10 @@ test.register_coroutine_test(
           {visibility = {displayed = false}})
         )
     )
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -334,7 +358,10 @@ test.register_coroutine_test(
         capabilities.lockAliro.cardId("3icub18c8pr00", {visibility = {displayed = false}})
       )
     )
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -386,7 +413,10 @@ test.register_coroutine_test(
         )
       )
     )
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -546,7 +576,10 @@ test.register_coroutine_test(
         )
       )
     )
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -585,7 +618,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -660,7 +693,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -730,7 +763,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -800,7 +833,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -957,7 +990,10 @@ test.register_coroutine_test(
         )
       )
     )
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -993,7 +1029,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -1066,7 +1102,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -1133,7 +1169,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -1200,7 +1236,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -1229,7 +1265,10 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(
       mock_device:generate_test_message("main", capabilities.lockAlarm.supportedAlarmValues({"unableToLockTheDoor"}, {visibility = {displayed = false}}))
     )
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -1257,7 +1296,10 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(
       mock_device:generate_test_message("main", capabilities.lockAlarm.supportedAlarmValues({"unableToLockTheDoor"}, {visibility = {displayed = false}}))
     )
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.run_registered_tests()
diff --git a/drivers/SmartThings/matter-lock/src/test/test_new_matter_lock_battery.lua b/drivers/SmartThings/matter-lock/src/test/test_new_matter_lock_battery.lua
index 8ec2a2a781..d60f2f4489 100644
--- a/drivers/SmartThings/matter-lock/src/test/test_new_matter_lock_battery.lua
+++ b/drivers/SmartThings/matter-lock/src/test/test_new_matter_lock_battery.lua
@@ -427,7 +427,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ profile = "lock" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -458,7 +458,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ profile = "lock-batteryLevel" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -490,7 +490,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ profile = "lock-battery" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -521,7 +521,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_unlatch,
-    min_api_version = 17
+    
   }
 )
 
@@ -553,7 +553,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_unlatch,
-    min_api_version = 17
+    
   }
 )
 
@@ -586,7 +586,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_unlatch,
-    min_api_version = 17
+    
   }
 )
 
@@ -617,7 +617,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_user_pin,
-    min_api_version = 17
+    
   }
 )
 
@@ -649,7 +649,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_user_pin,
-    min_api_version = 17
+    
   }
 )
 
@@ -682,7 +682,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_user_pin,
-    min_api_version = 17
+    
   }
 )
 
@@ -713,7 +713,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_user_pin_schedule_unlatch,
-    min_api_version = 17
+    
   }
 )
 
@@ -745,7 +745,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_user_pin_schedule_unlatch,
-    min_api_version = 17
+    
   }
 )
 
@@ -778,7 +778,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_user_pin_schedule_unlatch,
-    min_api_version = 17
+    
   }
 )
 
@@ -799,7 +799,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_battery,
-    min_api_version = 17
+    
   }
 )
 
@@ -842,7 +842,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_battery_level,
-    min_api_version = 17
+    
   }
 )
 
diff --git a/drivers/SmartThings/matter-media/src/test/test_matter_media_speaker.lua b/drivers/SmartThings/matter-media/src/test/test_matter_media_speaker.lua
index b795f6438a..85d8d8868b 100644
--- a/drivers/SmartThings/matter-media/src/test/test_matter_media_speaker.lua
+++ b/drivers/SmartThings/matter-media/src/test/test_matter_media_speaker.lua
@@ -126,7 +126,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -167,7 +167,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -213,7 +213,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -335,7 +335,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -366,7 +366,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 test.run_registered_tests()
diff --git a/drivers/SmartThings/matter-media/src/test/test_matter_media_video_player.lua b/drivers/SmartThings/matter-media/src/test/test_matter_media_video_player.lua
index dc3a4e4c08..c94b63275a 100644
--- a/drivers/SmartThings/matter-media/src/test/test_matter_media_video_player.lua
+++ b/drivers/SmartThings/matter-media/src/test/test_matter_media_video_player.lua
@@ -240,7 +240,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -278,7 +278,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -316,7 +316,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -354,7 +354,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -395,7 +395,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -436,7 +436,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -605,7 +605,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -638,7 +638,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -671,7 +671,7 @@ test.register_coroutine_test(
       mock_device_variable_speed:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
diff --git a/drivers/SmartThings/matter-rvc/src/test/test_matter_rvc.lua b/drivers/SmartThings/matter-rvc/src/test/test_matter_rvc.lua
index 626f7fea60..e1c95249a8 100644
--- a/drivers/SmartThings/matter-rvc/src/test/test_matter_rvc.lua
+++ b/drivers/SmartThings/matter-rvc/src/test/test_matter_rvc.lua
@@ -227,7 +227,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -243,7 +243,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -274,7 +274,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -302,7 +302,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -330,7 +330,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -357,7 +357,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -378,7 +378,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -419,7 +419,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -457,7 +457,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -521,7 +521,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -575,7 +575,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -632,7 +632,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -689,7 +689,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -743,7 +743,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -797,7 +797,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -1032,7 +1032,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -1068,7 +1068,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -1094,7 +1094,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -1120,7 +1120,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -1205,7 +1205,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-sensor/src/test/test_matter_air_quality_sensor.lua b/drivers/SmartThings/matter-sensor/src/test/test_matter_air_quality_sensor.lua
index 8d3bd462a5..81267a33e0 100644
--- a/drivers/SmartThings/matter-sensor/src/test/test_matter_air_quality_sensor.lua
+++ b/drivers/SmartThings/matter-sensor/src/test/test_matter_air_quality_sensor.lua
@@ -499,7 +499,7 @@ test.register_coroutine_test(
     test_aqs_device_type_do_configure(mock_device, "aqs-temp-humidity-all-level-all-meas")
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -510,7 +510,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_common,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -521,7 +521,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_level,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -533,7 +533,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_co_co2,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -544,7 +544,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_tvoc,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -568,7 +568,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -590,7 +590,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -625,7 +625,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -695,7 +695,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -720,7 +720,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_common,
-    min_api_version = 17
+    
   }
 )
 
@@ -828,7 +828,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/matter-sensor/src/test/test_matter_air_quality_sensor_modular.lua b/drivers/SmartThings/matter-sensor/src/test/test_matter_air_quality_sensor_modular.lua
index 27921e0dec..b3660c8e24 100644
--- a/drivers/SmartThings/matter-sensor/src/test/test_matter_air_quality_sensor_modular.lua
+++ b/drivers/SmartThings/matter-sensor/src/test/test_matter_air_quality_sensor_modular.lua
@@ -353,6 +353,8 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_modular_fingerprint,
+  
+    min_api_version = 15
   }
 )
 
@@ -409,7 +411,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_all,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -439,7 +441,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_common,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -466,7 +468,10 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device_modular_fingerprint:generate_test_message("main", capabilities.airQualityHealthConcern.supportedAirQualityValues({"unknown", "good", "unhealthy", "moderate", "slightlyUnhealthy"}, {visibility={displayed=false}})))
     test.socket.matter:__expect_send({mock_device_modular_fingerprint.id, subscribe_request_tvoc})
   end,
-  { test_init = test_init_modular_fingerprint }
+  { 
+    test_init = test_init_modular_fingerprint,
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -475,7 +480,10 @@ test.register_coroutine_test(
     -- simulate no actual change
     test.socket.device_lifecycle:__queue_receive(mock_device_modular_fingerprint:generate_info_changed({}))
   end,
-  { test_init = test_init_modular_fingerprint }
+  { 
+    test_init = test_init_modular_fingerprint,
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -501,7 +509,10 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device_modular_fingerprint:generate_test_message("main", capabilities.airQualityHealthConcern.supportedAirQualityValues({"unknown", "good", "unhealthy", "moderate", "slightlyUnhealthy"}, {visibility={displayed=false}})))
     test.socket.matter:__expect_send({mock_device_modular_fingerprint.id, subscribe_request_tvoc})
   end,
-  { test_init = test_init_modular_fingerprint }
+  {
+    test_init = test_init_modular_fingerprint,
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -510,7 +521,10 @@ test.register_coroutine_test(
     -- simulate no actual change
     test.socket.device_lifecycle:__queue_receive(mock_device_modular_fingerprint:generate_info_changed({}))
   end,
-  { test_init = test_init_modular_fingerprint }
+  {
+    test_init = test_init_modular_fingerprint,
+    min_api_version = 15
+  }
 )
 
 -- run tests
diff --git a/drivers/SmartThings/matter-sensor/src/test/test_matter_aqara_fp400.lua b/drivers/SmartThings/matter-sensor/src/test/test_matter_aqara_fp400.lua
index 7f384c744e..7b64216455 100644
--- a/drivers/SmartThings/matter-sensor/src/test/test_matter_aqara_fp400.lua
+++ b/drivers/SmartThings/matter-sensor/src/test/test_matter_aqara_fp400.lua
@@ -61,7 +61,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-    min_api_version = 17
+    
   }
 )
 
@@ -77,7 +77,7 @@ test.register_coroutine_test(
     assert(mock_device.profile.id == current_profile, "Profile should not change on driverSwitched")
   end,
   {
-    min_api_version = 17
+    
   }
 )
 
@@ -112,7 +112,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -134,7 +134,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/matter-sensor/src/test/test_matter_bosch_button_contact.lua b/drivers/SmartThings/matter-sensor/src/test/test_matter_bosch_button_contact.lua
index 644c4088e1..cdc5b0b933 100644
--- a/drivers/SmartThings/matter-sensor/src/test/test_matter_bosch_button_contact.lua
+++ b/drivers/SmartThings/matter-sensor/src/test/test_matter_bosch_button_contact.lua
@@ -82,7 +82,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -120,7 +120,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -168,7 +168,7 @@ test.register_message_test(
             },
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -192,7 +192,7 @@ test.register_message_test(
             },
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -232,7 +232,7 @@ test.register_message_test(
 
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -257,7 +257,7 @@ test.register_message_test(
             },
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -292,7 +292,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
diff --git a/drivers/SmartThings/matter-sensor/src/test/test_matter_flow_sensor.lua b/drivers/SmartThings/matter-sensor/src/test/test_matter_flow_sensor.lua
index dd4eb87252..e58e1d61c8 100644
--- a/drivers/SmartThings/matter-sensor/src/test/test_matter_flow_sensor.lua
+++ b/drivers/SmartThings/matter-sensor/src/test/test_matter_flow_sensor.lua
@@ -71,7 +71,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -101,7 +101,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -133,7 +133,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/matter-sensor/src/test/test_matter_freeze_leak_sensor.lua b/drivers/SmartThings/matter-sensor/src/test/test_matter_freeze_leak_sensor.lua
index 02e5815c06..5cd5e85950 100644
--- a/drivers/SmartThings/matter-sensor/src/test/test_matter_freeze_leak_sensor.lua
+++ b/drivers/SmartThings/matter-sensor/src/test/test_matter_freeze_leak_sensor.lua
@@ -99,7 +99,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -135,7 +135,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -170,7 +170,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -191,7 +191,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -211,7 +211,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -244,7 +244,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-sensor/src/test/test_matter_pressure_sensor.lua b/drivers/SmartThings/matter-sensor/src/test/test_matter_pressure_sensor.lua
index 13bd93ed70..26619de42e 100644
--- a/drivers/SmartThings/matter-sensor/src/test/test_matter_pressure_sensor.lua
+++ b/drivers/SmartThings/matter-sensor/src/test/test_matter_pressure_sensor.lua
@@ -94,7 +94,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -116,7 +116,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -148,7 +148,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 test.run_registered_tests()
diff --git a/drivers/SmartThings/matter-sensor/src/test/test_matter_rain_sensor.lua b/drivers/SmartThings/matter-sensor/src/test/test_matter_rain_sensor.lua
index 2b942c6f0c..6e8c11099d 100644
--- a/drivers/SmartThings/matter-sensor/src/test/test_matter_rain_sensor.lua
+++ b/drivers/SmartThings/matter-sensor/src/test/test_matter_rain_sensor.lua
@@ -96,7 +96,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -131,7 +131,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-sensor/src/test/test_matter_sensor.lua b/drivers/SmartThings/matter-sensor/src/test/test_matter_sensor.lua
index d6024f61be..57829a53e0 100644
--- a/drivers/SmartThings/matter-sensor/src/test/test_matter_sensor.lua
+++ b/drivers/SmartThings/matter-sensor/src/test/test_matter_sensor.lua
@@ -163,7 +163,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -185,7 +185,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -207,7 +207,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -242,7 +242,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -264,7 +264,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -299,7 +299,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -336,7 +336,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -366,7 +366,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -381,7 +381,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_presence_sensor,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-sensor/src/test/test_matter_sensor_battery.lua b/drivers/SmartThings/matter-sensor/src/test/test_matter_sensor_battery.lua
index 0709be6a31..7393937682 100644
--- a/drivers/SmartThings/matter-sensor/src/test/test_matter_sensor_battery.lua
+++ b/drivers/SmartThings/matter-sensor/src/test/test_matter_sensor_battery.lua
@@ -88,7 +88,7 @@ test.register_coroutine_test(
     mock_device_humidity_battery:expect_metadata_update({ profile = "humidity-battery" })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -116,7 +116,7 @@ test.register_coroutine_test(
     mock_device_humidity_battery:expect_metadata_update({ profile = "humidity-batteryLevel" })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -142,7 +142,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-sensor/src/test/test_matter_sensor_featuremap.lua b/drivers/SmartThings/matter-sensor/src/test/test_matter_sensor_featuremap.lua
index 0a02bbb27f..df9ab678cb 100644
--- a/drivers/SmartThings/matter-sensor/src/test/test_matter_sensor_featuremap.lua
+++ b/drivers/SmartThings/matter-sensor/src/test/test_matter_sensor_featuremap.lua
@@ -171,7 +171,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_humidity_battery,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -181,7 +181,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_humidity_no_battery,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -191,7 +191,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_temp_humidity,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-sensor/src/test/test_matter_sensor_rpc.lua b/drivers/SmartThings/matter-sensor/src/test/test_matter_sensor_rpc.lua
index 6ca73351c9..1093c1be76 100644
--- a/drivers/SmartThings/matter-sensor/src/test/test_matter_sensor_rpc.lua
+++ b/drivers/SmartThings/matter-sensor/src/test/test_matter_sensor_rpc.lua
@@ -71,7 +71,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-sensor/src/test/test_matter_smoke_co_alarm.lua b/drivers/SmartThings/matter-sensor/src/test/test_matter_smoke_co_alarm.lua
index aeef7b15f9..2170115366 100644
--- a/drivers/SmartThings/matter-sensor/src/test/test_matter_smoke_co_alarm.lua
+++ b/drivers/SmartThings/matter-sensor/src/test/test_matter_smoke_co_alarm.lua
@@ -124,7 +124,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -172,7 +172,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -220,7 +220,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -281,7 +281,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -342,7 +342,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -390,7 +390,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -435,7 +435,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -470,7 +470,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -492,7 +492,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -527,7 +527,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -578,7 +578,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-sensor/src/test/test_matter_smoke_co_alarm_battery.lua b/drivers/SmartThings/matter-sensor/src/test/test_matter_smoke_co_alarm_battery.lua
index 3c8102064e..1b96842797 100644
--- a/drivers/SmartThings/matter-sensor/src/test/test_matter_smoke_co_alarm_battery.lua
+++ b/drivers/SmartThings/matter-sensor/src/test/test_matter_smoke_co_alarm_battery.lua
@@ -92,7 +92,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ profile = "smoke-co-temp-humidity-comeas-battery" })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -107,7 +107,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -127,7 +127,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-sensor/src/test/test_matter_soil_sensor.lua b/drivers/SmartThings/matter-sensor/src/test/test_matter_soil_sensor.lua
index a5a8042fc0..dbdc25527e 100644
--- a/drivers/SmartThings/matter-sensor/src/test/test_matter_soil_sensor.lua
+++ b/drivers/SmartThings/matter-sensor/src/test/test_matter_soil_sensor.lua
@@ -80,7 +80,10 @@ test.register_coroutine_test(
     test.socket.device_lifecycle:__queue_receive(mock_device:generate_info_changed({ profile = updated_device_profile }))
     test.socket.matter:__expect_send({mock_device.id, subscribe_request})
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test(
   "Relative humidity reports should generate correct messages",
@@ -105,7 +108,10 @@ test.register_coroutine_test(
       mock_device:generate_test_message("main", capabilities.relativeHumidityMeasurement.humidity({ value = 41 }))
     )
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test(
   "Temperature reports should generate correct messages",
@@ -120,7 +126,10 @@ test.register_coroutine_test(
       mock_device:generate_test_message("main", capabilities.temperatureMeasurement.temperature({ value = 40.0, unit = "C" }))
     )
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test(
   "Min and max temperature attributes set capability constraint",
@@ -144,7 +153,10 @@ test.register_coroutine_test(
       )
     )
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test(
   "Soil moisture is reported raw when no limits are set",
@@ -159,7 +171,10 @@ test.register_coroutine_test(
       mock_device:generate_test_message("main", capabilities.relativeHumidityMeasurement.humidity({ value = 55 }))
     )
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 local function build_soil_moisture_limits(min_value, max_value)
   if version.api < 21 then
@@ -194,7 +209,10 @@ test.register_coroutine_test(
       mock_device:generate_test_message("main", capabilities.relativeHumidityMeasurement.humidity({ value = 25 }))
     )
   end
-)
+,
+    {
+      min_api_version = 17
+    })
 
 test.register_coroutine_test(
   "Soil moisture scaling rounds correctly",
@@ -224,6 +242,9 @@ test.register_coroutine_test(
       mock_device:generate_test_message("main", capabilities.relativeHumidityMeasurement.humidity({ value = 90 }))
     )
   end
-)
+,
+    {
+      min_api_version = 17
+    })
 
 test.run_registered_tests()
diff --git a/drivers/SmartThings/matter-switch/src/test/test_aqara_climate_sensor_w100.lua b/drivers/SmartThings/matter-switch/src/test/test_aqara_climate_sensor_w100.lua
index 50713626f2..0e92647a4a 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_aqara_climate_sensor_w100.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_aqara_climate_sensor_w100.lua
@@ -160,7 +160,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -185,7 +185,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -213,7 +213,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -232,7 +232,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -257,7 +257,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -282,7 +282,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -323,7 +323,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(aqara_mock_device:generate_test_message("button2", capabilities.button.button.double({state_change = true})))
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -352,7 +352,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -381,7 +381,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -400,7 +400,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -419,7 +419,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -444,7 +444,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -467,7 +467,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -490,7 +490,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-switch/src/test/test_aqara_cube.lua b/drivers/SmartThings/matter-switch/src/test/test_aqara_cube.lua
index dbda0c35fc..1fee6d27f1 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_aqara_cube.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_aqara_cube.lua
@@ -235,7 +235,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -270,7 +270,7 @@ test.register_coroutine_test(
     end,
     {
       test_init = test_init_exhausted,
-      min_api_version = 17
+      
     }
 )
 
diff --git a/drivers/SmartThings/matter-switch/src/test/test_aqara_light_switch_h2.lua b/drivers/SmartThings/matter-switch/src/test/test_aqara_light_switch_h2.lua
index 468232cbc3..08402cf273 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_aqara_light_switch_h2.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_aqara_light_switch_h2.lua
@@ -263,7 +263,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -343,7 +343,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
diff --git a/drivers/SmartThings/matter-switch/src/test/test_electrical_sensor_set.lua b/drivers/SmartThings/matter-switch/src/test/test_electrical_sensor_set.lua
index 18c44f7b9c..b197bf6ff9 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_electrical_sensor_set.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_electrical_sensor_set.lua
@@ -227,7 +227,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -295,7 +295,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -320,7 +320,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -382,7 +382,7 @@ test.register_coroutine_test(
     end,
     {
       test_init = test_init_periodic,
-      min_api_version = 17
+      
     }
 )
 
@@ -407,7 +407,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init,
-    min_api_version = 17
+    
   }
 )
 
@@ -422,7 +422,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_periodic,
-    min_api_version = 17
+    
   }
 )
 
@@ -553,7 +553,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init,
-    min_api_version = 17
+    
   }
 )
 
@@ -624,7 +624,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_periodic,
-    min_api_version = 17
+    
   }
 )
 
@@ -707,7 +707,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/matter-switch/src/test/test_electrical_sensor_tree.lua b/drivers/SmartThings/matter-switch/src/test/test_electrical_sensor_tree.lua
index 2abfe6e9c5..db4153a283 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_electrical_sensor_tree.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_electrical_sensor_tree.lua
@@ -163,7 +163,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -231,7 +231,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -257,7 +257,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init,
-    min_api_version = 17
+    
   }
 )
 
@@ -340,7 +340,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/matter-switch/src/test/test_eve_energy.lua b/drivers/SmartThings/matter-switch/src/test/test_eve_energy.lua
index e90f5a70da..703a3f0d1b 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_eve_energy.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_eve_energy.lua
@@ -197,7 +197,7 @@ test.register_coroutine_test(
     assert(sub_driver ~= nil, "sub_driver should be returned")
   end,
   {
-    min_api_version = 17
+    
   }
 )
 
@@ -209,7 +209,7 @@ test.register_coroutine_test(
     assert(result == false, "can_handle should return false for device without Eve Private Cluster")
   end,
   {
-    min_api_version = 17
+    
   }
 )
 
@@ -242,7 +242,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -275,7 +275,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -295,7 +295,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -310,7 +310,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -343,7 +343,7 @@ test.register_coroutine_test(
 
       test.timer.__create_and_queue_test_time_advance_timer(60, "interval", "create_poll_schedule")
     end,
-    min_api_version = 17
+    
   }
 )
 
@@ -362,7 +362,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -389,7 +389,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -416,7 +416,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -455,7 +455,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-    min_api_version = 17
+    
   }
 )
 
@@ -483,7 +483,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -510,7 +510,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -546,7 +546,7 @@ test.register_coroutine_test(
       test.timer.__create_and_queue_test_time_advance_timer(60 * 15, "interval", "create_poll_report_schedule")
       test.timer.__create_and_queue_test_time_advance_timer(60, "interval", "create_poll_schedule")
     end,
-    min_api_version = 17
+    
   }
 )
 
@@ -643,7 +643,7 @@ test.register_coroutine_test(
         test.disable_startup_messages()
         test.mock_device.add_test_device(mock_eve_device_using_electrical_sensor)
       end,
-      min_api_version = 17
+      min_api_version = 15
     }
 )
 
diff --git a/drivers/SmartThings/matter-switch/src/test/test_hager_waasys.lua b/drivers/SmartThings/matter-switch/src/test/test_hager_waasys.lua
index 96a684529d..a85137d0e3 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_hager_waasys.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_hager_waasys.lua
@@ -592,7 +592,10 @@ test.register_coroutine_test("Test: 4-Button Device Detection - Profile Changes
     }))
   })
 
-end)
+end,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test("Test: Button Event Handling - Pushed, Double Press, and Held Events on 4-Button Device", function()
   test.socket.matter:__set_channel_ordering("relaxed")
@@ -796,7 +799,10 @@ test.register_coroutine_test("Test: Button Event Handling - Pushed, Double Press
     )
   })
   test.socket.capability:__expect_send(matter_device:generate_test_message("button4", capabilities.button.button.held({ state_change = true })))
-end)
+end,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test("Test: Device Type Handler - Handles Button (Type 15) and OnOff (Type 256) Device Types with Child Creation", function()
   test.socket.matter:__set_channel_ordering("relaxed")
@@ -889,7 +895,10 @@ test.register_coroutine_test("Test: Device Type Handler - Handles Button (Type 1
     parent.id,
     clusters.OnOff.attributes.OnOff:subscribe(parent, nil)
   })
-end)
+end,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test("Test: 2G Relay - Profile Changes Between light-binary and 2-button Based On Endpoint Availability", function()
   test.socket.matter:__set_channel_ordering("relaxed")
@@ -1131,7 +1140,10 @@ test.register_coroutine_test("Test: 2G Relay - Profile Changes Between light-bin
     parent_device_id = parent.id,
     parent_assigned_child_key = "4"
   })
-end)
+end,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test("Test: Dimmer Device - Child Creation for Dimmable Endpoint with Button Support", function()
   test.socket.matter:__set_channel_ordering("relaxed")
@@ -1227,7 +1239,10 @@ test.register_coroutine_test("Test: Dimmer Device - Child Creation for Dimmable
     clusters.LevelControl.server.commands.MoveToLevelWithOnOff(child_dimmer, 3, 51, nil, 0, 0)
   })
 
-end)
+end,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test("Test: 1G Dimmer - Initialization and Profile Update to light-level", function()
   test.socket.matter:__set_channel_ordering("relaxed")
@@ -1236,7 +1251,10 @@ test.register_coroutine_test("Test: 1G Dimmer - Initialization and Profile Updat
   add_matter_device(dimmer, parent, "2-button")
   test.wait_for_events()
   configure_parent(parent)
-end)
+end,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test("Test: 1G Dimmer - Host Commands and Level Control Capabilities", function()
   test.socket.matter:__set_channel_ordering("relaxed")
@@ -1308,7 +1326,10 @@ test.register_coroutine_test("Test: 1G Dimmer - Host Commands and Level Control
     parent_1g.id,
     clusters.LevelControl.server.commands.MoveToLevelWithOnOff(dimmer, 4, 51, nil, 0, 0)
   })
-end)
+end,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test("Test: PIR Device - Initialization with Motion and Illuminance Capabilities", function()
   test.socket.matter:__set_channel_ordering("relaxed")
@@ -1318,7 +1339,10 @@ test.register_coroutine_test("Test: PIR Device - Initialization with Motion and
   test.wait_for_events()
   configure_parent(parent_pir)
 
-end)
+end,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test("Test: PIR Device - Complete Functionality with Motion, Illuminance, and Dimmer Support", function()
   test.socket.matter:__set_channel_ordering("relaxed")
@@ -1472,7 +1496,10 @@ test.register_coroutine_test("Test: PIR Device - Complete Functionality with Mot
   })
   test.socket.capability:__expect_send(child_dimmer:generate_test_message("main", capabilities.switchLevel.level(50)))
   parent_pir.expect_native_attr_handler_registration(parent_pir, "switchLevel", "level")
-end)
+end,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test("Test: Host with Window Covering - 2-Button Profile with Window Covering Child Device", function()
   test.socket.matter:__set_channel_ordering("relaxed")
@@ -1610,7 +1637,10 @@ test.register_coroutine_test("Test: Host with Window Covering - 2-Button Profile
   test.socket.capability:__expect_send(child_wc:generate_test_message("main", capabilities.windowShadeLevel.shadeLevel(0)))
   test.socket.capability:__expect_send(child_wc:generate_test_message("main", capabilities.windowShade.windowShade.closed()))
 
-end)
+end,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test("Test: Window Covering - Preference Changes for Reverse Polarity and Preset Position", function()
   test.socket.matter:__set_channel_ordering("relaxed")
@@ -1775,6 +1805,9 @@ test.register_coroutine_test("Test: Window Covering - Preference Changes for Rev
     parent.id,
     cluster_base.subscribe(parent, nil, clusters.WindowCovering.ID, clusters.WindowCovering.attributes.CurrentPositionLiftPercent100ths.ID, nil)
   })
-end)
+end,
+    {
+      min_api_version = 15
+    })
 
 test.run_registered_tests()
diff --git a/drivers/SmartThings/matter-switch/src/test/test_ikea_scroll.lua b/drivers/SmartThings/matter-switch/src/test/test_ikea_scroll.lua
index be28bd040a..6b0bfe32a1 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_ikea_scroll.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_ikea_scroll.lua
@@ -233,7 +233,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -347,7 +347,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -461,7 +461,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -512,7 +512,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -563,7 +563,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -614,7 +614,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -665,7 +665,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -699,7 +699,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -733,7 +733,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -747,7 +747,10 @@ test.register_coroutine_test(
     test.socket.matter:__expect_send({mock_ikea_scroll.id, read_request})
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 -- Coroutine tests for sensitivity preference logic.
 -- KNOB_SENSITIVITY_FACTORS = {0.5, 1.0, 2.0}, indexed by the preference value.
@@ -797,7 +800,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -845,7 +848,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -893,7 +896,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -941,7 +944,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-switch/src/test/test_light_illuminance_motion.lua b/drivers/SmartThings/matter-switch/src/test/test_light_illuminance_motion.lua
index b22498eaf7..efc80d9e99 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_light_illuminance_motion.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_light_illuminance_motion.lua
@@ -78,7 +78,10 @@ test.register_coroutine_test(
     test.socket.matter:__expect_send({mock_device.id, clusters.ColorControl.attributes.Options:write(mock_device, 1, clusters.ColorControl.types.OptionsBitmap.EXECUTE_IF_OFF)})
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test(
   "init should cause device to subscribe to all appropriate clusters", function()
@@ -109,7 +112,7 @@ test.register_coroutine_test(
     test.socket.matter:__expect_send({mock_device.id, subscribe_request})
    end,
    {
-     min_api_version = 17
+     min_api_version = 15
    }
 )
 
@@ -131,7 +134,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -166,7 +169,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -245,7 +248,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_light_level_motion,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-switch/src/test/test_matter_bridge.lua b/drivers/SmartThings/matter-switch/src/test/test_matter_bridge.lua
index 6cb679796d..eda33fbf5b 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_matter_bridge.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_matter_bridge.lua
@@ -101,7 +101,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_mock_bridge,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-switch/src/test/test_matter_button.lua b/drivers/SmartThings/matter-switch/src/test/test_matter_button.lua
index 061f2e2f47..d49d9f2452 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_matter_button.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_matter_button.lua
@@ -87,7 +87,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_for_lifecycle_tests,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -109,7 +109,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_for_lifecycle_tests,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -132,7 +132,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -170,7 +170,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -209,7 +209,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -257,7 +257,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -281,7 +281,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -305,7 +305,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -329,7 +329,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -368,7 +368,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -407,7 +407,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -482,7 +482,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_battery,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -509,7 +509,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_profile_change_with_battery,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -521,7 +521,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_profile_change_with_battery,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -536,7 +536,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_profile_change_with_battery,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -551,7 +551,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_profile_change_with_battery,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -571,7 +571,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_profile_change_with_battery,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -594,7 +594,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_battery,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-switch/src/test/test_matter_camera.lua b/drivers/SmartThings/matter-switch/src/test/test_matter_camera.lua
index c238bfd2ca..e417b63f4d 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_matter_camera.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_matter_camera.lua
@@ -666,7 +666,7 @@ test.register_coroutine_test(
     test.socket.matter:__expect_send({mock_device.id, clusters.Switch.attributes.MultiPressMax:read(mock_device, DOORBELL_EP)})
   end,
   {
-    min_api_version = 17
+    
   }
 )
 
@@ -732,7 +732,7 @@ test.register_coroutine_test(
     assert(not configure_buttons_called, "configure_buttons should not be called when capability state is unchanged")
   end,
   {
-    min_api_version = 17
+    
   }
 )
 
@@ -759,7 +759,7 @@ test.register_coroutine_test(
     assert(reconcile_called, "reconcile_profile_and_capabilities should be called")
   end,
   {
-    min_api_version = 17
+    
   }
 )
 
@@ -807,7 +807,7 @@ test.register_coroutine_test(
     assert(init_event_count == 0, "cameraPrivacyMode should not be reinitialized for equal values with metatable differences")
   end,
   {
-    min_api_version = 17
+    
   }
 )
 
@@ -857,7 +857,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -900,7 +900,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -929,7 +929,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -973,7 +973,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1004,7 +1004,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1054,7 +1054,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1079,7 +1079,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1132,7 +1132,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1256,7 +1256,7 @@ test.register_coroutine_test(
     emit_supported_resolutions()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1274,7 +1274,7 @@ test.register_coroutine_test(
     emit_supported_resolutions()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1292,7 +1292,7 @@ test.register_coroutine_test(
     emit_supported_resolutions()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1347,7 +1347,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1371,7 +1371,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1389,7 +1389,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1407,7 +1407,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1455,7 +1455,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1493,7 +1493,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1519,7 +1519,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1548,7 +1548,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.sounds.selectedSound(2)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1591,7 +1591,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1632,7 +1632,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1658,7 +1658,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1698,7 +1698,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1734,7 +1734,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1759,7 +1759,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1826,7 +1826,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1934,7 +1934,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1960,7 +1960,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1985,7 +1985,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2017,7 +2017,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2098,7 +2098,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2130,7 +2130,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2155,7 +2155,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2229,7 +2229,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2302,7 +2302,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2378,7 +2378,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2470,7 +2470,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2576,7 +2576,7 @@ test.register_coroutine_test(
     )
   end,
   {
-    min_api_version = 17
+    
   }
 )
 
@@ -2652,7 +2652,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -3263,7 +3263,7 @@ test.register_coroutine_test(
     camera_cfg.reconcile_profile_and_capabilities = original_reconcile
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -3304,7 +3304,7 @@ test.register_coroutine_test(
     test.socket.matter:__expect_send({mock_device.id, clusters.Switch.attributes.MultiPressMax:read(mock_device, DOORBELL_EP)})
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -3316,7 +3316,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_no_per_zone_sensitivity,
-    min_api_version = 17
+    
   }
 )
 
@@ -3328,7 +3328,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_no_user_defined_zone,
-    min_api_version = 17
+    
   }
 )
 
@@ -3347,7 +3347,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_no_user_defined_zone,
-    min_api_version = 17
+    
   }
 )
 
@@ -3364,7 +3364,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_no_user_defined_zone,
-    min_api_version = 17
+    
   }
 )
 
diff --git a/drivers/SmartThings/matter-switch/src/test/test_matter_light_fan.lua b/drivers/SmartThings/matter-switch/src/test/test_matter_light_fan.lua
index 32023a36cb..d3be60f352 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_matter_light_fan.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_matter_light_fan.lua
@@ -157,7 +157,10 @@ test.register_coroutine_test(
     )
     test.socket.matter:__expect_send({mock_device_capabilities_disabled.id, subscribe_request})
   end,
-  { test_init = function() test.mock_device.add_test_device(mock_device_capabilities_disabled) end }
+  {
+    test_init = function() test.mock_device.add_test_device(mock_device_capabilities_disabled) end,
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -165,7 +168,10 @@ test.register_coroutine_test(
     -- simulate no actual change
     test.socket.device_lifecycle:__queue_receive(mock_device_capabilities_disabled:generate_info_changed({}))
   end,
-  { test_init = function() test.mock_device.add_test_device(mock_device_capabilities_disabled) end }
+  {
+    test_init = function() test.mock_device.add_test_device(mock_device_capabilities_disabled) end,
+    min_api_version = 15
+  }
 )
 
 local FanMode = clusters.FanControl.attributes.FanMode
@@ -213,7 +219,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -249,7 +255,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -274,7 +280,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -299,7 +305,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button.lua b/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button.lua
index d7d5efde97..0f4c1e28b1 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button.lua
@@ -278,7 +278,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_battery,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -302,7 +302,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_battery,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -325,7 +325,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -358,7 +358,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -383,7 +383,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("button2", button_attr.held({state_change = true})))
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -408,7 +408,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("button3", button_attr.pushed({state_change = true})))
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -432,7 +432,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -472,7 +472,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("button5", button_attr.double({state_change = true})))
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -500,7 +500,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -528,7 +528,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -566,7 +566,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -605,7 +605,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -653,7 +653,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -677,7 +677,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -701,7 +701,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -725,7 +725,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -764,7 +764,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -803,7 +803,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -827,7 +827,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -871,7 +871,7 @@ test.register_message_test(
     -- no double event
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -929,7 +929,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -951,7 +951,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -972,7 +972,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ profile = "5-button-batteryLevel" })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -993,7 +993,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ profile = "5-button-battery" })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button_motion.lua b/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button_motion.lua
index 44ee11861e..ec2e7ae289 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button_motion.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button_motion.lua
@@ -184,7 +184,7 @@ test.register_message_test(
   }
 },
 {
-   min_api_version = 17
+   min_api_version = 15
 }
 )
 
@@ -217,7 +217,7 @@ test.register_message_test(
   }
 },
 {
-   min_api_version = 17
+  min_api_version = 15
 }
 )
 
@@ -242,7 +242,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("button2", button_attr.held({state_change = true})))
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -267,7 +267,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("button3", button_attr.pushed({state_change = true})))
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -291,7 +291,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -331,7 +331,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("button6", button_attr.double({state_change = true})))
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -359,7 +359,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -378,7 +378,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.motionSensor.motion.inactive()))
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -406,7 +406,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -444,7 +444,7 @@ test.register_message_test(
   }
 },
 {
-   min_api_version = 17
+   min_api_version = 15
 }
 )
 
@@ -483,7 +483,7 @@ test.register_message_test(
   },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -531,7 +531,7 @@ test.register_message_test(
   },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -555,7 +555,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -579,7 +579,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -603,7 +603,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -643,7 +643,7 @@ test.register_message_test(
 
 },
 {
-   min_api_version = 17
+   min_api_version = 15
 }
 )
 
@@ -683,7 +683,7 @@ test.register_message_test(
 
 },
 {
-   min_api_version = 17
+   min_api_version = 15
 }
 )
 
@@ -707,7 +707,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -751,7 +751,7 @@ test.register_message_test(
   -- no double event
 },
 {
-   min_api_version = 17
+   min_api_version = 15
 }
 )
 
@@ -809,7 +809,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 -- run the tests
diff --git a/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button_switch_mcd.lua b/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button_switch_mcd.lua
index 70f9666542..b3390edc29 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button_switch_mcd.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button_switch_mcd.lua
@@ -271,7 +271,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -294,7 +294,7 @@ test.register_message_test(
   }
 },
 {
-   min_api_version = 17
+   min_api_version = 15
 }
 )
 
@@ -327,7 +327,7 @@ test.register_message_test(
   }
 },
 {
-   min_api_version = 17
+   min_api_version = 15
 }
 )
 
@@ -352,7 +352,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("button3", button_attr.pushed({state_change = true})))
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -411,7 +411,7 @@ test.register_coroutine_test(
     end,
   {
     test_init = test_init_mcd_unsupported_switch_device_type,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -432,7 +432,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -450,7 +450,7 @@ test.register_coroutine_test(
     expect_configure_buttons()
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -464,7 +464,7 @@ test.register_coroutine_test(
     expect_configure_buttons()
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -484,7 +484,7 @@ test.register_coroutine_test(
     test.socket.device_lifecycle:__queue_receive({ mock_child.id, "doConfigure" })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-switch/src/test/test_matter_on_off_device_configuration.lua b/drivers/SmartThings/matter-switch/src/test/test_matter_on_off_device_configuration.lua
index d27ee2c383..fc729ed3fa 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_matter_on_off_device_configuration.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_matter_on_off_device_configuration.lua
@@ -50,7 +50,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = function() test.mock_device.add_test_device(mock_device_onoff_switch_as_server) end,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -83,7 +83,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = function() test.mock_device.add_test_device(mock_device_onoff_switch_as_client) end,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -122,7 +122,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = function() test.mock_device.add_test_device(mock_device_dimmer_switch_as_server) end,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -159,7 +159,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = function() test.mock_device.add_test_device(mock_device_plug_with_switch_profile_vendor_override) end,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -196,7 +196,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = function() test.mock_device.add_test_device(mock_device_color_dimmer) end,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -241,7 +241,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = function() test.mock_device.add_test_device(mock_device_mounted_on_off_control) end,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -296,7 +296,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = function() test.mock_device.add_test_device(mock_device_mounted_dimmable_load_control) end,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-switch/src/test/test_matter_on_off_parent_child.lua b/drivers/SmartThings/matter-switch/src/test/test_matter_on_off_parent_child.lua
index 608112d61c..5e4699460a 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_matter_on_off_parent_child.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_matter_on_off_parent_child.lua
@@ -177,7 +177,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_for_lifecycle_tests,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -193,7 +193,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_for_lifecycle_tests,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -207,7 +207,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_for_generate_info_changed_tests,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -238,7 +238,7 @@ test.register_message_test(
     },
   },
   {
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -289,7 +289,7 @@ test.register_message_test(
     }
   },
   {
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -320,6 +320,9 @@ test.register_message_test(
         clusters.ColorControl.server.commands.MoveToColor:build_test_command_response(mock_device, extended_color_ep_id)
       }
     },
+  },
+  {
+    min_api_version = 15
   }
 )
 
@@ -354,7 +357,7 @@ test.register_message_test(
     }
   },
   {
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -460,7 +463,7 @@ test.register_message_test(
     },
   },
   {
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -514,7 +517,7 @@ test.register_message_test(
     },
   },
   {
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -613,7 +616,7 @@ test.register_message_test(
     },
   },
   {
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -692,7 +695,7 @@ test.register_coroutine_test(
     test_init = function()
       test.mock_device.add_test_device(mock_plug)
     end,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -710,7 +713,7 @@ test.register_coroutine_test(
     test_init = function()
       test.mock_device.add_test_device(mock_plug)
     end,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -771,7 +774,7 @@ test.register_coroutine_test(
     test_init = function()
       test.mock_device.add_test_device(mock_plug_profile_override)
     end,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -871,7 +874,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = function() test.mock_device.add_test_device(mock_switch) end,
-    min_api_version = 17
+    
   }
 )
 
diff --git a/drivers/SmartThings/matter-switch/src/test/test_matter_sensor_offset_preferences.lua b/drivers/SmartThings/matter-switch/src/test/test_matter_sensor_offset_preferences.lua
index eabc9246f7..e6d51d1f36 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_matter_sensor_offset_preferences.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_matter_sensor_offset_preferences.lua
@@ -61,7 +61,7 @@ test.register_coroutine_test("Read appropriate attribute values after tempOffset
     })))
 end,
 {
-   min_api_version = 17
+   min_api_version = 15
 }
 )
 
@@ -84,7 +84,7 @@ test.register_coroutine_test("Read appropriate attribute values after humidityOf
     })))
 end,
 {
-   min_api_version = 17
+   min_api_version = 15
 }
 )
 
diff --git a/drivers/SmartThings/matter-switch/src/test/test_matter_switch.lua b/drivers/SmartThings/matter-switch/src/test/test_matter_switch.lua
index e68f1d0101..79fe81b0f2 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_matter_switch.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_matter_switch.lua
@@ -93,7 +93,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-    min_api_version = 17
+    
   }
 )
 
@@ -110,7 +110,7 @@ test.register_coroutine_test(
     test.socket.matter:__expect_send({mock_device.id, subscribe_request})
   end,
   {
-    min_api_version = 17
+    
   }
 )
 
@@ -143,7 +143,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -176,7 +176,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -204,7 +204,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -229,7 +229,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -291,7 +291,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -316,7 +316,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -346,7 +346,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -376,7 +376,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -448,7 +448,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -526,7 +526,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -551,7 +551,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -576,7 +576,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -606,7 +606,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -631,7 +631,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -676,7 +676,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -694,7 +694,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -759,7 +759,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_x_y_color_mode,
-    min_api_version = 17
+    
   }
 )
 
@@ -791,7 +791,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_x_y_color_mode,
-    min_api_version = 17
+    
   }
 )
 
@@ -823,7 +823,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_x_y_color_mode,
-    min_api_version = 17
+    
   }
 )
 
@@ -881,7 +881,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_x_y_color_mode,
-    min_api_version = 17
+    
   }
 )
 
@@ -979,7 +979,7 @@ test.register_message_test(
   },
   {
     test_init = test_init_with_hue_sat_color_mode_set,
-    min_api_version = 17
+    
   }
 )
 
@@ -1065,7 +1065,7 @@ test.register_message_test(
   },
   {
     test_init = test_init_with_hue_sat_color_mode_set,
-    min_api_version = 17
+    
   }
 )
 
@@ -1143,7 +1143,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_no_hue_sat,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -1195,7 +1195,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_color_temp,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -1222,7 +1222,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_color_temp,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-switch/src/test/test_matter_water_valve.lua b/drivers/SmartThings/matter-switch/src/test/test_matter_water_valve.lua
index 788a00d76e..221405a62a 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_matter_water_valve.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_matter_water_valve.lua
@@ -69,7 +69,10 @@ test.register_coroutine_test(
     test.socket.device_lifecycle:__queue_receive({ mock_device.id, "doConfigure" })
     mock_device:expect_metadata_update({ profile = "water-valve-level" })
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_message_test(
@@ -93,7 +96,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -118,7 +121,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -159,7 +162,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -179,8 +182,6 @@ test.register_message_test(
       direction = "send",
       message = mock_device:generate_test_message("main", capabilities.valve.valve.closed())
     },
-  },
-  {
     {
       channel = "matter",
       direction = "receive",
@@ -209,7 +210,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -231,7 +232,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-switch/src/test/test_multi_switch_mcd.lua b/drivers/SmartThings/matter-switch/src/test/test_multi_switch_mcd.lua
index 5b1b569b25..2da5243c97 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_multi_switch_mcd.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_multi_switch_mcd.lua
@@ -200,7 +200,7 @@ test.register_message_test(
   },
   {
     test_init = test_init_mock_3switch,
-    min_api_version = 17
+    
   }
 )
 
@@ -227,7 +227,7 @@ test.register_message_test(
   },
   {
     test_init = test_init_mock_2switch,
-    min_api_version = 17
+    
   }
 )
 
@@ -254,7 +254,7 @@ test.register_message_test(
   },
   {
     test_init = test_init_mock_3switch_non_sequential,
-    min_api_version = 17
+    
   }
 )
 
diff --git a/drivers/SmartThings/matter-switch/src/test/test_stateless_step.lua b/drivers/SmartThings/matter-switch/src/test/test_stateless_step.lua
index a92c547ac7..b8a1c0baa7 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_stateless_step.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_stateless_step.lua
@@ -128,7 +128,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -210,7 +210,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/matter-switch/src/test/test_third_reality_subdrivers.lua b/drivers/SmartThings/matter-switch/src/test/test_third_reality_subdrivers.lua
index a32ce8f8ff..105401373a 100644
--- a/drivers/SmartThings/matter-switch/src/test/test_third_reality_subdrivers.lua
+++ b/drivers/SmartThings/matter-switch/src/test/test_third_reality_subdrivers.lua
@@ -95,6 +95,9 @@ test.register_message_test(
       direction = "send",
       message = mock_device:generate_test_message("main", capabilities.doorControl.door.open())
     }
+  },
+  {
+    min_api_version = 15
   }
 )
 
@@ -114,6 +117,9 @@ test.register_message_test(
       direction = "send",
       message = mock_device:generate_test_message("main", capabilities.doorControl.door.closed())
     }
+  },
+  {
+    min_api_version = 15
   }
 )
 
@@ -143,6 +149,9 @@ test.register_message_test(
         clusters.OnOff.server.commands.On(mock_device, 1)
       }
     }
+  },
+  {
+    min_api_version = 15
   }
 )
 
@@ -170,6 +179,9 @@ test.register_message_test(
         clusters.OnOff.server.commands.Off(mock_device, 1)
       }
     }
+  },
+  {
+    min_api_version = 15
   }
 )
 
@@ -192,6 +204,9 @@ test.register_message_test(
       -- BatPercentRemaining is in units of 0.5%, so 200 = 100%
       message = mock_device:generate_test_message("main", capabilities.battery.battery(100))
     }
+  },
+  {
+    min_api_version = 15
   }
 )
 
@@ -212,6 +227,9 @@ test.register_message_test(
       -- 150 * 0.5 = 75%
       message = mock_device:generate_test_message("main", capabilities.battery.battery(75))
     }
+  },
+  {
+    min_api_version = 15
   }
 )
 
@@ -224,7 +242,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({profile = "garage-door-battery"})
     mock_device:expect_metadata_update({provisioning_state = "PROVISIONED"})
   end,
-  {min_api_version = 17}
+  {min_api_version = 15}
 )
 
 test.register_coroutine_test(
@@ -234,7 +252,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({profile = "garage-door-battery"})
     mock_device:expect_metadata_update({provisioning_state = "PROVISIONED"})
   end,
-  {min_api_version = 17}
+  {min_api_version = 15}
 )
 
 
@@ -298,6 +316,8 @@ test.register_coroutine_test(
   end,
   {
     test_init = function() test.mock_device.add_test_device(mock_device_misprofiled) end,
+  
+    min_api_version = 15
   }
 )
 
@@ -525,7 +545,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_mk1,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_air_purifier.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_air_purifier.lua
index 0a97b12181..630896d25c 100644
--- a/drivers/SmartThings/matter-thermostat/src/test/test_matter_air_purifier.lua
+++ b/drivers/SmartThings/matter-thermostat/src/test/test_matter_air_purifier.lua
@@ -432,7 +432,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_ap_aqs,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -448,7 +448,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_ap_thermo_aqs,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -473,7 +473,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_ap_thermo_aqs_preconfigured,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -530,7 +530,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -574,7 +574,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -612,7 +612,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -660,7 +660,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -721,7 +721,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -777,7 +777,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -799,7 +799,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -870,7 +870,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -888,7 +888,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_ap_thermo_aqs_preconfigured,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -914,7 +914,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_ap_thermo_aqs_preconfigured,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_air_purifier_api9.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_air_purifier_api9.lua
index 8bb8a6c920..4fed28f10f 100644
--- a/drivers/SmartThings/matter-thermostat/src/test/test_matter_air_purifier_api9.lua
+++ b/drivers/SmartThings/matter-thermostat/src/test/test_matter_air_purifier_api9.lua
@@ -6,9 +6,6 @@ local capabilities = require "st.capabilities"
 local clusters = require "st.matter.clusters"
 local SinglePrecisionFloat = require "st.matter.data_types.SinglePrecisionFloat"
 local t_utils = require "integration_test.utils"
-local version = require "version"
-
-version.api = 9
 
 -- include driver-side cluster definitions to test embedded clusters on lower api versions
 clusters.HepaFilterMonitoring = require "embedded_clusters.HepaFilterMonitoring"
@@ -432,7 +429,8 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_ap_aqs,
-    min_api_version = 17
+    min_api_version = 9,
+    max_api_version = 10
   }
 )
 
@@ -448,7 +446,8 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_ap_thermo_aqs,
-    min_api_version = 17
+    min_api_version = 9,
+    max_api_version = 10
   }
 )
 
@@ -473,7 +472,8 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_ap_thermo_aqs_preconfigured,
-    min_api_version = 17
+    min_api_version = 9,
+    max_api_version = 10
   }
 )
 
@@ -530,7 +530,8 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+    min_api_version = 9,
+    max_api_version = 10
   }
 )
 
@@ -574,7 +575,8 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+    min_api_version = 9,
+    max_api_version = 10
   }
 )
 
@@ -612,7 +614,8 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+    min_api_version = 9,
+    max_api_version = 10
   }
 )
 
@@ -660,7 +663,8 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+    min_api_version = 9,
+    max_api_version = 10
   }
 )
 
@@ -721,7 +725,8 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+    min_api_version = 9,
+    max_api_version = 10
   }
 )
 
@@ -778,7 +783,8 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+    min_api_version = 9,
+    max_api_version = 10
   }
 )
 
@@ -800,7 +806,8 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+    min_api_version = 9,
+    max_api_version = 10
   }
 )
 
@@ -872,7 +879,8 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+    min_api_version = 9,
+    max_api_version = 10
   }
 )
 
@@ -890,7 +898,8 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_ap_thermo_aqs_preconfigured,
-    min_api_version = 17
+    min_api_version = 9,
+    max_api_version = 10
   }
 )
 
@@ -916,7 +925,8 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_ap_thermo_aqs_preconfigured,
-    min_api_version = 17
+    min_api_version = 9,
+    max_api_version = 10
   }
 )
 
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_air_purifier_modular.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_air_purifier_modular.lua
index 6aefcb5045..fcc8740458 100644
--- a/drivers/SmartThings/matter-thermostat/src/test/test_matter_air_purifier_modular.lua
+++ b/drivers/SmartThings/matter-thermostat/src/test/test_matter_air_purifier_modular.lua
@@ -317,7 +317,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_basic,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -394,7 +394,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_ap_thermo_aqs_preconfigured,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_fan.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_fan.lua
index 91d3303f78..8d8964acf0 100644
--- a/drivers/SmartThings/matter-thermostat/src/test/test_matter_fan.lua
+++ b/drivers/SmartThings/matter-thermostat/src/test/test_matter_fan.lua
@@ -113,7 +113,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -128,7 +128,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_generic,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_heat_pump.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_heat_pump.lua
index 66c6e593ed..730a5db48a 100644
--- a/drivers/SmartThings/matter-thermostat/src/test/test_matter_heat_pump.lua
+++ b/drivers/SmartThings/matter-thermostat/src/test/test_matter_heat_pump.lua
@@ -148,7 +148,7 @@ test.register_coroutine_test(
     assert(component_to_endpoint_map["thermostatTwo"] == THERMOSTAT_TWO_EP, string.format("Thermostat Two Endpoint must be %d", THERMOSTAT_TWO_EP))
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -193,7 +193,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -238,7 +238,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -279,7 +279,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -320,7 +320,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -387,7 +387,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -475,7 +475,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -546,7 +546,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -613,7 +613,7 @@ test.register_message_test(
   },
   {
     test_init = test_init_auto,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -637,7 +637,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -662,7 +662,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -710,7 +710,7 @@ test.register_coroutine_test(
     test_init = function()
       test_init()
     end,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -763,7 +763,7 @@ test.register_coroutine_test(
     test_init = function()
       test_init()
     end,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_room_ac.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_room_ac.lua
index 2f7085bff2..012fc0ab66 100644
--- a/drivers/SmartThings/matter-thermostat/src/test/test_matter_room_ac.lua
+++ b/drivers/SmartThings/matter-thermostat/src/test/test_matter_room_ac.lua
@@ -296,7 +296,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_configure,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -317,7 +317,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_nostate,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -355,7 +355,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -411,7 +411,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -459,7 +459,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -495,7 +495,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -544,7 +544,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -584,7 +584,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_room_ac_modular.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_room_ac_modular.lua
index aac1ecd4bc..fe15fdb026 100644
--- a/drivers/SmartThings/matter-thermostat/src/test/test_matter_room_ac_modular.lua
+++ b/drivers/SmartThings/matter-thermostat/src/test/test_matter_room_ac_modular.lua
@@ -314,7 +314,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_basic,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -342,7 +342,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_no_state,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 test.run_registered_tests()
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermo_battery.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermo_battery.lua
index 5352a65a9d..0206d949f5 100644
--- a/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermo_battery.lua
+++ b/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermo_battery.lua
@@ -107,7 +107,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ profile = "thermostat-cooling-only-nostate" })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -129,7 +129,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ profile = "thermostat-cooling-only-nostate-batteryLevel" })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -144,7 +144,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermo_featuremap.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermo_featuremap.lua
index 377725fba0..efdeeec6fe 100644
--- a/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermo_featuremap.lua
+++ b/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermo_featuremap.lua
@@ -228,7 +228,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ profile = "thermostat-humidity-fan-heating-only" })
   end,
   {
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -252,7 +252,7 @@ test.register_coroutine_test(
     test.socket.device_lifecycle:__queue_receive(mock_device:generate_info_changed(updates))
 end,
   {
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -277,7 +277,7 @@ test.register_coroutine_test(
     mock_device_simple:expect_metadata_update({ profile = "thermostat-cooling-only-nostate" })
   end,
   {
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -294,7 +294,7 @@ test.register_coroutine_test(
     mock_device_no_battery:expect_metadata_update({ profile = "thermostat-cooling-only-nostate-nobattery" })
   end,
   {
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermo_multiple_device_types.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermo_multiple_device_types.lua
index 4e7704feb1..ac72e56018 100644
--- a/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermo_multiple_device_types.lua
+++ b/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermo_multiple_device_types.lua
@@ -240,7 +240,7 @@ test.register_coroutine_test(
       get_subscribe_request(mock_device, new_cluster_subscribe_list))
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -252,7 +252,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init_disorder_endpoints,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -286,7 +286,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermo_setpoint_limits.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermo_setpoint_limits.lua
index 1d772fb2f1..ae5dcc10af 100644
--- a/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermo_setpoint_limits.lua
+++ b/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermo_setpoint_limits.lua
@@ -150,7 +150,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -179,7 +179,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -208,7 +208,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -237,7 +237,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -259,7 +259,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -281,7 +281,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -297,7 +297,7 @@ test.register_coroutine_test(
     assert(min_setpoint_deadband_checked == true, "min_setpoint_deadband_checked is True")
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -327,7 +327,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -357,7 +357,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -387,7 +387,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermo_setpoint_limits_rpc.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermo_setpoint_limits_rpc.lua
index 3dd153d270..13702d015d 100644
--- a/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermo_setpoint_limits_rpc.lua
+++ b/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermo_setpoint_limits_rpc.lua
@@ -101,7 +101,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -126,7 +126,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -151,7 +151,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermostat.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermostat.lua
index d1373c036d..c7ab7d646f 100644
--- a/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermostat.lua
+++ b/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermostat.lua
@@ -169,7 +169,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -191,7 +191,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -213,7 +213,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -240,7 +240,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -267,7 +267,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -289,7 +289,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -311,7 +311,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -333,7 +333,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -355,7 +355,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -392,7 +392,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -441,7 +441,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -490,7 +490,7 @@ test.register_message_test(
   },
   {
     test_init = test_init_auto,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -530,7 +530,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -571,7 +571,7 @@ test.register_message_test(
   },
   {
     test_init = test_init_auto,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -623,7 +623,7 @@ test.register_message_test(
   },
   {
     test_init = test_init_auto,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -680,7 +680,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -716,7 +716,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -741,7 +741,7 @@ test.register_message_test(
 		}
 	},
 	{
-	   min_api_version = 17
+	   min_api_version = 15
 	}
 )
 
@@ -766,7 +766,7 @@ test.register_message_test(
 		}
 	},
 	{
-	   min_api_version = 17
+	   min_api_version = 15
 	}
 )
 
@@ -791,7 +791,7 @@ test.register_message_test(
 		}
 	},
 	{
-	   min_api_version = 17
+	   min_api_version = 15
 	}
 )
 
@@ -832,7 +832,7 @@ test.register_message_test(
     },
 	},
 	{
-	   min_api_version = 17
+	   min_api_version = 15
 	}
 )
 
@@ -857,7 +857,7 @@ test.register_message_test(
 		}
 	},
 	{
-	   min_api_version = 17
+	   min_api_version = 15
 	}
 )
 
@@ -878,7 +878,7 @@ test.register_coroutine_test("Battery percent reports should generate correct me
   test.wait_for_events()
 end,
 {
-   min_api_version = 17
+   min_api_version = 15
 }
 )
 
@@ -933,7 +933,7 @@ test.register_message_test(
 		}
 	},
 	{
-	   min_api_version = 17
+	   min_api_version = 15
 	}
 )
 
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermostat_composed_bridged.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermostat_composed_bridged.lua
index af44bf73f6..07e9e94604 100644
--- a/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermostat_composed_bridged.lua
+++ b/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermostat_composed_bridged.lua
@@ -98,7 +98,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -121,7 +121,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -144,7 +144,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -173,7 +173,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -202,7 +202,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -225,7 +225,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -248,7 +248,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -271,7 +271,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -294,7 +294,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -329,7 +329,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -382,7 +382,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -424,7 +424,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -474,7 +474,7 @@ test.register_message_test(
 
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -512,7 +512,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -537,7 +537,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -562,7 +562,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -587,7 +587,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -628,7 +628,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -653,7 +653,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -674,7 +674,7 @@ test.register_coroutine_test("Battery percent reports should generate correct me
   test.wait_for_events()
 end,
 {
-   min_api_version = 17
+   min_api_version = 15
 }
 )
 
@@ -729,7 +729,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermostat_modular.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermostat_modular.lua
index a678e85499..1e2a01bd42 100644
--- a/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermostat_modular.lua
+++ b/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermostat_modular.lua
@@ -179,7 +179,7 @@ test.register_coroutine_test(
   end,
   {
     test_init = test_init,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -245,7 +245,10 @@ test.register_coroutine_test(
     test.socket.device_lifecycle:__queue_receive(mock_device_modular:generate_info_changed({ profile = updated_device_profile }))
     test.socket.matter:__expect_send({mock_device_modular.id, subscribe_request})
   end,
-  { test_init = test_init_modular_fingerprint }
+  { 
+    test_init = test_init_modular_fingerprint,
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -253,7 +256,10 @@ test.register_coroutine_test(
     -- simulate no actual change
     test.socket.device_lifecycle:__queue_receive(mock_device_modular:generate_info_changed({}))
   end,
-  { test_init = function() test.mock_device.add_test_device(mock_device_modular) end }
+  { 
+    test_init = function() test.mock_device.add_test_device(mock_device_modular) end,
+    min_api_version = 15
+  }
 )
 
 local function initialize_subscribe_request(mock_device, subscribed_attributes)
@@ -318,7 +324,10 @@ test.register_coroutine_test(
     test.socket.device_lifecycle:__queue_receive(mock_device_modular:generate_info_changed({ profile = updated_device_profile }))
     test.socket.matter:__expect_send({mock_device_modular.id, subscribe_request})
   end,
-  { test_init = test_init_modular_fingerprint }
+  {
+    test_init = test_init_modular_fingerprint,
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -326,7 +335,10 @@ test.register_coroutine_test(
     -- simulate no actual change
     test.socket.device_lifecycle:__queue_receive(mock_device_modular:generate_info_changed({}))
   end,
-  { test_init = function() test.mock_device.add_test_device(mock_device_modular) end }
+  {
+    test_init = function() test.mock_device.add_test_device(mock_device_modular) end,
+    min_api_version = 15
+  }
 )
 
 -- run tests
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermostat_rpc5.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermostat_rpc5.lua
index f7078703ac..6c05f671e5 100644
--- a/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermostat_rpc5.lua
+++ b/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermostat_rpc5.lua
@@ -137,7 +137,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_water_heater.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_water_heater.lua
index b4336beeb4..7c279a68c0 100644
--- a/drivers/SmartThings/matter-thermostat/src/test/test_matter_water_heater.lua
+++ b/drivers/SmartThings/matter-thermostat/src/test/test_matter_water_heater.lua
@@ -117,7 +117,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -142,7 +142,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -204,7 +204,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -236,7 +236,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -261,7 +261,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -331,7 +331,7 @@ test.register_coroutine_test(
     test_init = function()
       test_init()
     end,
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -433,7 +433,7 @@ test.register_message_test(
     }
   },
   {
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/matter-window-covering/src/test/test_matter_closure.lua b/drivers/SmartThings/matter-window-covering/src/test/test_matter_closure.lua
index e39cb428c8..1c61a6c96a 100644
--- a/drivers/SmartThings/matter-window-covering/src/test/test_matter_closure.lua
+++ b/drivers/SmartThings/matter-window-covering/src/test/test_matter_closure.lua
@@ -300,7 +300,10 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(
       mock_device:generate_test_message("main", capabilities.windowShade.windowShade.closing())
     )
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -323,7 +326,10 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(
       mock_device:generate_test_message("main", capabilities.windowShade.windowShade.opening())
     )
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -343,7 +349,10 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(
       mock_device:generate_test_message("main", capabilities.windowShade.windowShade.closed())
     )
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -363,7 +372,10 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(
       mock_device:generate_test_message("main", capabilities.windowShade.windowShade.open())
     )
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -383,7 +395,10 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(
       mock_device:generate_test_message("main", capabilities.windowShade.windowShade.partially_open())
     )
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -427,7 +442,10 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(
       mock_device:generate_test_message("main", capabilities.windowShade.windowShade.closed())
     )
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -442,7 +460,10 @@ test.register_coroutine_test(
         mock_device, 10, clusters.ClosureControl.types.TargetPositionEnum.MOVE_TO_FULLY_CLOSED
       )
     })
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -457,7 +478,10 @@ test.register_coroutine_test(
         mock_device, 10, clusters.ClosureControl.types.TargetPositionEnum.MOVE_TO_FULLY_OPEN
       )
     })
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -470,7 +494,10 @@ test.register_coroutine_test(
       mock_device.id,
       clusters.ClosureControl.server.commands.Stop(mock_device, 10)
     })
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -484,7 +511,10 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(
       mock_device:generate_test_message("main", capabilities.battery.battery(math.floor(150 / 2.0 + 0.5)))
     )
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -499,7 +529,10 @@ test.register_coroutine_test(
       mock_device.id,
       clusters.ClosureDimension.server.commands.SetTarget(mock_device, 11, 75 * 100)
     })
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -514,7 +547,10 @@ test.register_coroutine_test(
       mock_device.id,
       clusters.ClosureDimension.server.commands.SetTarget(mock_device, 12, 40 * 100)
     })
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -534,7 +570,10 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(
       mock_device:generate_test_message("windowShade1", capabilities.windowShadeLevel.shadeLevel(60))
     )
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -554,7 +593,10 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(
       mock_device:generate_test_message("windowShade2", capabilities.windowShadeLevel.shadeLevel(25))
     )
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -574,7 +616,10 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(
       mock_device:generate_test_message("windowShade1", capabilities.windowShadeLevel.shadeLevel(0))
     )
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -594,7 +639,10 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(
       mock_device:generate_test_message("windowShade1", capabilities.windowShadeLevel.shadeLevel(100))
     )
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 -- ---------------------------------------------------------------------------
@@ -622,7 +670,10 @@ test.register_coroutine_test(
       mock_door_device:generate_test_message("main", capabilities.doorControl.door.closing())
     )
   end,
-  {test_init = test_init_door}
+  {
+    test_init = test_init_door,
+    min_api_version = 17
+  }
 )
 
 test.register_coroutine_test(
@@ -646,7 +697,10 @@ test.register_coroutine_test(
       mock_door_device:generate_test_message("main", capabilities.doorControl.door.opening())
     )
   end,
-  {test_init = test_init_door}
+  {
+    test_init = test_init_door,
+    min_api_version = 17
+  }
 )
 
 test.register_coroutine_test(
@@ -667,9 +721,13 @@ test.register_coroutine_test(
       mock_door_device:generate_test_message("main", capabilities.doorControl.door.closed())
     )
   end,
-  {test_init = test_init_door}
+  {
+    test_init = test_init_door,
+    min_api_version = 17
+  }
 )
 
+
 test.register_coroutine_test(
   "doorControl open following OverallCurrentState FULLY_OPENED", function()
     update_profile_door()
@@ -688,7 +746,10 @@ test.register_coroutine_test(
       mock_door_device:generate_test_message("main", capabilities.doorControl.door.open())
     )
   end,
-  {test_init = test_init_door}
+  {
+    test_init = test_init_door,
+    min_api_version = 17
+  }
 )
 
 test.register_coroutine_test(
@@ -710,7 +771,10 @@ test.register_coroutine_test(
       mock_door_device:generate_test_message("main", capabilities.doorControl.door.open())
     )
   end,
-  {test_init = test_init_door}
+  {
+    test_init = test_init_door,
+    min_api_version = 17
+  }
 )
 
 test.register_coroutine_test(
@@ -726,7 +790,10 @@ test.register_coroutine_test(
       )
     })
   end,
-  {test_init = test_init_door}
+  {
+    test_init = test_init_door,
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -742,9 +809,11 @@ test.register_coroutine_test(
       )
     })
   end,
-  {test_init = test_init_door}
+  {
+    test_init = test_init_door,
+    min_api_version = 15
+  }
 )
-
 test.register_coroutine_test(
   "ClosureDimension CurrentState on endpoint 11 emits level on door1 for door device", function()
     update_profile_door()
@@ -763,7 +832,10 @@ test.register_coroutine_test(
       mock_door_device:generate_test_message("door1", capabilities.level.level(75))
     )
   end,
-  {test_init = test_init_door}
+  {
+    test_init = test_init_door,
+    min_api_version = 17
+  }
 )
 
 test.register_coroutine_test(
@@ -784,7 +856,10 @@ test.register_coroutine_test(
       mock_door_device:generate_test_message("door2", capabilities.level.level(30))
     )
   end,
-  {test_init = test_init_door}
+  {
+    test_init = test_init_door,
+    min_api_version = 17
+  }
 )
 
 test.run_registered_tests()
diff --git a/drivers/SmartThings/matter-window-covering/src/test/test_matter_window_covering.lua b/drivers/SmartThings/matter-window-covering/src/test/test_matter_window_covering.lua
index 8376e3a6d4..7199e3704d 100644
--- a/drivers/SmartThings/matter-window-covering/src/test/test_matter_window_covering.lua
+++ b/drivers/SmartThings/matter-window-covering/src/test/test_matter_window_covering.lua
@@ -520,7 +520,10 @@ test.register_coroutine_test(
         "main", capabilities.windowShade.windowShade.partially_open()
       )
     )
-  end
+  end,
+  {
+    min_api_version = 17
+  }
 )
 
 test.register_coroutine_test(
diff --git a/drivers/SmartThings/virtual-switch/src/test/test_virtual_switch.lua b/drivers/SmartThings/virtual-switch/src/test/test_virtual_switch.lua
index 5c284b1e6b..0c1c919171 100644
--- a/drivers/SmartThings/virtual-switch/src/test/test_virtual_switch.lua
+++ b/drivers/SmartThings/virtual-switch/src/test/test_virtual_switch.lua
@@ -46,7 +46,7 @@ test.register_message_test(
      }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -65,7 +65,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -84,7 +84,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -104,7 +104,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -123,7 +123,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -148,7 +148,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -169,7 +169,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_simple_device:generate_test_message("main", capabilities.switch.switch.on()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-air-quality-detector/src/test/test_MultiIR_air_quality_detector.lua b/drivers/SmartThings/zigbee-air-quality-detector/src/test/test_MultiIR_air_quality_detector.lua
index 606b716dff..90f63e6037 100644
--- a/drivers/SmartThings/zigbee-air-quality-detector/src/test/test_MultiIR_air_quality_detector.lua
+++ b/drivers/SmartThings/zigbee-air-quality-detector/src/test/test_MultiIR_air_quality_detector.lua
@@ -73,7 +73,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({mock_device.id, read_AQI_messge})
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -95,7 +95,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -117,7 +117,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -137,7 +137,7 @@ test.register_coroutine_test(
       capabilities.carbonDioxideHealthConcern.carbonDioxideHealthConcern({value = "good"})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -157,7 +157,7 @@ test.register_coroutine_test(
       capabilities.fineDustHealthConcern.fineDustHealthConcern.good()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -177,7 +177,7 @@ test.register_coroutine_test(
       capabilities.veryFineDustHealthConcern.veryFineDustHealthConcern.good()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -197,7 +197,7 @@ test.register_coroutine_test(
      capabilities.dustHealthConcern.dustHealthConcern.good()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -215,7 +215,7 @@ test.register_coroutine_test(
       capabilities.formaldehydeMeasurement.formaldehydeLevel({value = 1000.0, unit = "mg/m^3"})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -235,7 +235,7 @@ test.register_coroutine_test(
       capabilities.tvocHealthConcern.tvocHealthConcern({value = "unhealthy"})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -253,7 +253,7 @@ test.register_coroutine_test(
       capabilities.airQualityHealthConcern.airQualityHealthConcern({value = "good"})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -271,7 +271,7 @@ test.register_coroutine_test(
       capabilities.airQualityHealthConcern.airQualityHealthConcern({value = "moderate"})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -289,7 +289,7 @@ test.register_coroutine_test(
       capabilities.airQualityHealthConcern.airQualityHealthConcern({value = "slightlyUnhealthy"})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -307,7 +307,7 @@ test.register_coroutine_test(
       capabilities.airQualityHealthConcern.airQualityHealthConcern({value = "unhealthy"})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -325,7 +325,7 @@ test.register_coroutine_test(
       capabilities.airQualityHealthConcern.airQualityHealthConcern({value = "veryUnhealthy"})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -343,7 +343,7 @@ test.register_coroutine_test(
       capabilities.airQualityHealthConcern.airQualityHealthConcern({value = "hazardous"})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -363,7 +363,7 @@ test.register_coroutine_test(
       capabilities.carbonDioxideHealthConcern.carbonDioxideHealthConcern({value = "moderate"})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -383,7 +383,7 @@ test.register_coroutine_test(
       capabilities.carbonDioxideHealthConcern.carbonDioxideHealthConcern({value = "unhealthy"})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -403,7 +403,7 @@ test.register_coroutine_test(
       capabilities.fineDustHealthConcern.fineDustHealthConcern({value = "moderate"})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -423,7 +423,7 @@ test.register_coroutine_test(
       capabilities.fineDustHealthConcern.fineDustHealthConcern({value = "unhealthy"})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -443,7 +443,7 @@ test.register_coroutine_test(
       capabilities.veryFineDustHealthConcern.veryFineDustHealthConcern({value = "unhealthy"})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -463,7 +463,7 @@ test.register_coroutine_test(
       capabilities.dustHealthConcern.dustHealthConcern({value = "unhealthy"})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -483,7 +483,7 @@ test.register_coroutine_test(
       capabilities.tvocHealthConcern.tvocHealthConcern({value = "good"})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-bed/src/test/test_shus_mattress.lua b/drivers/SmartThings/zigbee-bed/src/test/test_shus_mattress.lua
index 2b02b5ec73..04b8dd7c70 100644
--- a/drivers/SmartThings/zigbee-bed/src/test/test_shus_mattress.lua
+++ b/drivers/SmartThings/zigbee-bed/src/test/test_shus_mattress.lua
@@ -86,7 +86,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({mock_device.id, read_0x0011_messge})
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -131,7 +131,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({mock_device.id, read_0x0011_messge})
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -149,7 +149,7 @@ test.register_coroutine_test(
       custom_capabilities.left_control.leftback.idle({ visibility = { displayed = false }})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -167,7 +167,7 @@ test.register_coroutine_test(
       custom_capabilities.left_control.leftback.idle({ visibility = { displayed = false }})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -185,7 +185,7 @@ test.register_coroutine_test(
       custom_capabilities.left_control.leftwaist.idle({ visibility = { displayed = false }})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -203,7 +203,7 @@ test.register_coroutine_test(
       custom_capabilities.left_control.leftwaist.idle({ visibility = { displayed = false }})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -221,7 +221,7 @@ test.register_coroutine_test(
       custom_capabilities.left_control.lefthip.idle({ visibility = { displayed = false }})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -239,7 +239,7 @@ test.register_coroutine_test(
       custom_capabilities.left_control.lefthip.idle({ visibility = { displayed = false }})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -257,7 +257,7 @@ test.register_coroutine_test(
       custom_capabilities.right_control.rightback.idle({ visibility = { displayed = false }})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -275,7 +275,7 @@ test.register_coroutine_test(
       custom_capabilities.right_control.rightback.idle({ visibility = { displayed = false }})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -293,7 +293,7 @@ test.register_coroutine_test(
       custom_capabilities.right_control.rightwaist.idle({ visibility = { displayed = false }})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -311,7 +311,7 @@ test.register_coroutine_test(
       custom_capabilities.right_control.rightwaist.idle({ visibility = { displayed = false }})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -329,7 +329,7 @@ test.register_coroutine_test(
       custom_capabilities.right_control.righthip.idle({ visibility = { displayed = false }})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -347,7 +347,7 @@ test.register_coroutine_test(
       custom_capabilities.right_control.righthip.idle({ visibility = { displayed = false }})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -365,7 +365,7 @@ test.register_coroutine_test(
       custom_capabilities.mattressHardness.leftBackHardness(1)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -383,7 +383,7 @@ test.register_coroutine_test(
       custom_capabilities.mattressHardness.leftWaistHardness(1)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -401,7 +401,7 @@ test.register_coroutine_test(
       custom_capabilities.mattressHardness.leftHipHardness(1)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -419,7 +419,7 @@ test.register_coroutine_test(
       custom_capabilities.mattressHardness.rightBackHardness(1)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -437,7 +437,7 @@ test.register_coroutine_test(
       custom_capabilities.mattressHardness.rightWaistHardness(1)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -455,7 +455,7 @@ test.register_coroutine_test(
       custom_capabilities.mattressHardness.rightHipHardness(1)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -473,7 +473,7 @@ test.register_coroutine_test(
       custom_capabilities.yoga.state.both()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -491,7 +491,7 @@ test.register_coroutine_test(
       custom_capabilities.yoga.state.right()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -509,7 +509,7 @@ test.register_coroutine_test(
       custom_capabilities.yoga.state.left()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -527,7 +527,7 @@ test.register_coroutine_test(
       custom_capabilities.yoga.state.stop()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -545,7 +545,7 @@ test.register_coroutine_test(
       custom_capabilities.ai_mode.left.off()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -563,7 +563,7 @@ test.register_coroutine_test(
       custom_capabilities.ai_mode.left.on()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -581,7 +581,7 @@ test.register_coroutine_test(
       custom_capabilities.ai_mode.right.on()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -599,7 +599,7 @@ test.register_coroutine_test(
       custom_capabilities.ai_mode.right.off()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -617,7 +617,7 @@ test.register_coroutine_test(
       custom_capabilities.auto_inflation.inflationState.off()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -635,7 +635,7 @@ test.register_coroutine_test(
       custom_capabilities.auto_inflation.inflationState.on()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -653,7 +653,7 @@ test.register_coroutine_test(
       custom_capabilities.strong_exp_mode.expState.off()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -671,7 +671,7 @@ test.register_coroutine_test(
       custom_capabilities.strong_exp_mode.expState.on()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -689,7 +689,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -706,7 +706,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -723,7 +723,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -740,7 +740,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -757,7 +757,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -774,7 +774,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -791,7 +791,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -808,7 +808,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -827,7 +827,7 @@ test.register_coroutine_test(
       custom_capabilities.left_control.leftback.soft()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -846,7 +846,7 @@ test.register_coroutine_test(
       custom_capabilities.left_control.leftwaist.soft()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -865,7 +865,7 @@ test.register_coroutine_test(
       custom_capabilities.left_control.lefthip.soft()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -884,7 +884,7 @@ test.register_coroutine_test(
       custom_capabilities.left_control.leftback.hard()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -903,7 +903,7 @@ test.register_coroutine_test(
       custom_capabilities.left_control.leftwaist.hard()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -922,7 +922,7 @@ test.register_coroutine_test(
       custom_capabilities.left_control.lefthip.hard()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -941,7 +941,7 @@ test.register_coroutine_test(
       custom_capabilities.right_control.rightback.soft()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -960,7 +960,7 @@ test.register_coroutine_test(
       custom_capabilities.right_control.rightwaist.soft()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -979,7 +979,7 @@ test.register_coroutine_test(
       custom_capabilities.right_control.righthip.soft()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -998,7 +998,7 @@ test.register_coroutine_test(
       custom_capabilities.right_control.rightback.hard()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1017,7 +1017,7 @@ test.register_coroutine_test(
       custom_capabilities.right_control.rightwaist.hard()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1036,7 +1036,7 @@ test.register_coroutine_test(
       custom_capabilities.right_control.righthip.hard()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1053,7 +1053,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1070,7 +1070,7 @@ test.register_coroutine_test(
       })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1087,7 +1087,7 @@ test.register_coroutine_test(
       })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1112,7 +1112,7 @@ test.register_coroutine_test(
       custom_capabilities.left_control.leftback("idle", { visibility = { displayed = false }})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_SLED_button.lua b/drivers/SmartThings/zigbee-button/src/test/test_SLED_button.lua
index 342a62a5c7..3760394ef6 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_SLED_button.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_SLED_button.lua
@@ -50,7 +50,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -74,7 +74,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -89,7 +89,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_aduro_button.lua b/drivers/SmartThings/zigbee-button/src/test/test_aduro_button.lua
index 808eb0a764..4528a6feb2 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_aduro_button.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_aduro_button.lua
@@ -93,7 +93,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -131,7 +131,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -179,7 +179,7 @@ test.register_coroutine_test(
     test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_aqara_button.lua b/drivers/SmartThings/zigbee-button/src/test/test_aqara_button.lua
index 49883cd275..0346431256 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_aqara_button.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_aqara_button.lua
@@ -99,7 +99,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -131,7 +131,7 @@ test.register_coroutine_test(
     mock_device_e1:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -166,7 +166,7 @@ test.register_coroutine_test(
     mock_device_h1_double_rocker:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -187,7 +187,7 @@ test.register_coroutine_test(
       capabilities.button.button.pushed({ state_change = true })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -208,7 +208,7 @@ test.register_coroutine_test(
       capabilities.button.button.double({ state_change = true })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -229,7 +229,7 @@ test.register_coroutine_test(
       capabilities.button.button.held({ state_change = true })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -248,7 +248,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 test.register_message_test(
@@ -266,7 +266,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 test.register_message_test(
@@ -284,7 +284,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -328,7 +328,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -350,7 +350,7 @@ test.register_coroutine_test(
       capabilities.batteryLevel.quantity(1)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_centralite_button.lua b/drivers/SmartThings/zigbee-button/src/test/test_centralite_button.lua
index be95f76cce..443600e30f 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_centralite_button.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_centralite_button.lua
@@ -95,7 +95,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -152,7 +152,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -191,7 +191,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -205,7 +205,7 @@ test.register_coroutine_test(
       })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -253,7 +253,7 @@ test.register_coroutine_test(
     test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_dimming_remote.lua b/drivers/SmartThings/zigbee-button/src/test/test_dimming_remote.lua
index db9bad6ea9..67fb813899 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_dimming_remote.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_dimming_remote.lua
@@ -55,7 +55,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -86,7 +86,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -117,7 +117,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -159,7 +159,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -173,7 +173,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -275,7 +275,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_ewelink_button.lua b/drivers/SmartThings/zigbee-button/src/test/test_ewelink_button.lua
index 773021ac20..c433b7ccad 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_ewelink_button.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_ewelink_button.lua
@@ -64,7 +64,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -79,7 +79,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -95,7 +95,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -111,7 +111,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -151,7 +151,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_ezviz_button.lua b/drivers/SmartThings/zigbee-button/src/test/test_ezviz_button.lua
index 07652b0e0e..c61836a746 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_ezviz_button.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_ezviz_button.lua
@@ -55,7 +55,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -99,7 +99,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -118,7 +118,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -137,7 +137,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -173,7 +173,7 @@ test.register_coroutine_test(
       test.socket.zigbee:__expect_send({ mock_device_ezviz_button.id, ZoneStatusAttribute:read(mock_device_ezviz_button) })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -199,7 +199,7 @@ test.register_coroutine_test(
 
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_frient_button.lua b/drivers/SmartThings/zigbee-button/src/test/test_frient_button.lua
index 40d74e503c..211da426cf 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_frient_button.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_frient_button.lua
@@ -88,7 +88,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -113,7 +113,7 @@ test.register_message_test("Refresh should read all necessary attributes", {
     },
 },
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -149,7 +149,7 @@ test.register_coroutine_test("panicAlarm should be triggered and cleared", funct
 
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -184,7 +184,7 @@ test.register_coroutine_test(
         test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -226,7 +226,7 @@ test.register_coroutine_test(
         mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -253,7 +253,7 @@ function()
     test.socket.zigbee:__expect_send({mock_device.id, buttonDelay_msg})
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -286,7 +286,7 @@ test.register_coroutine_test(" Configuration and Switching to button-profile-pan
     --test.socket.capability:__expect_send({mock_device.id, capabilities.panicAlarm.panicAlarm.clear({state_change = true})})
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -302,7 +302,7 @@ test.register_coroutine_test("Switching from button-profile-panic-frient to butt
     test.socket.zigbee:__expect_send({mock_device_panic.id, cluster_base.write_manufacturer_specific_attribute(mock_device_panic,BasicInput.ID,0x8000,DEVELCO_MANUFACTURER_CODE,data_types.Uint16,0xFFFF)})
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -324,7 +324,7 @@ test.register_coroutine_test("New preferences after switching the profile should
     test.socket.zigbee:__expect_send({mock_device_panic.id, cluster_base.write_manufacturer_specific_attribute(mock_device_panic, IASZone.ID,0x8005,DEVELCO_MANUFACTURER_CODE,data_types.Enum8, 1)})
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_heiman_button.lua b/drivers/SmartThings/zigbee-button/src/test/test_heiman_button.lua
index 7e9448ed7e..b44f51d8a0 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_heiman_button.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_heiman_button.lua
@@ -92,7 +92,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -127,7 +127,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -174,7 +174,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -198,7 +198,7 @@ test.register_coroutine_test(
       mock_device_hs6ssb:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -279,7 +279,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -313,7 +313,7 @@ test.register_coroutine_test(
       mock_device_hs6ssb:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -361,7 +361,7 @@ test.register_coroutine_test(
     test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -409,7 +409,7 @@ test.register_coroutine_test(
     test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_ikea_on_off.lua b/drivers/SmartThings/zigbee-button/src/test/test_ikea_on_off.lua
index 4a772c5ab0..5c1f63eee3 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_ikea_on_off.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_ikea_on_off.lua
@@ -75,7 +75,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -119,7 +119,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -143,7 +143,7 @@ test.register_coroutine_test(
       test.socket.zigbee:__expect_add_hub_to_group(0xB9F2)
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -205,7 +205,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -304,7 +304,7 @@ test.register_coroutine_test(
     test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_ikea_open_close.lua b/drivers/SmartThings/zigbee-button/src/test/test_ikea_open_close.lua
index d350567294..d439429f03 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_ikea_open_close.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_ikea_open_close.lua
@@ -55,7 +55,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -100,7 +100,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -124,7 +124,7 @@ test.register_coroutine_test(
       test.socket.zigbee:__expect_add_hub_to_group(0xB9F2)
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -149,7 +149,7 @@ test.register_coroutine_test(
       test.socket.zigbee:__expect_send({mock_device.id, Groups.commands.AddGroup(mock_device, 0x0000) })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -247,7 +247,7 @@ test.register_coroutine_test(
     test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_ikea_remote_control.lua b/drivers/SmartThings/zigbee-button/src/test/test_ikea_remote_control.lua
index 1fc0e9d8e6..126a427335 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_ikea_remote_control.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_ikea_remote_control.lua
@@ -109,7 +109,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -154,7 +154,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -179,7 +179,7 @@ test.register_coroutine_test(
       test.socket.zigbee:__expect_add_hub_to_group(0xB9F2)
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -286,7 +286,7 @@ test.register_coroutine_test(
     test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -305,7 +305,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_iris_button.lua b/drivers/SmartThings/zigbee-button/src/test/test_iris_button.lua
index 81e68a52da..8916635044 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_iris_button.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_iris_button.lua
@@ -47,7 +47,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -63,7 +63,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -105,7 +105,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -123,7 +123,7 @@ test.register_coroutine_test(
       })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -177,7 +177,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -198,7 +198,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -219,7 +219,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -240,7 +240,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -261,7 +261,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_linxura_aura_smart_button.lua b/drivers/SmartThings/zigbee-button/src/test/test_linxura_aura_smart_button.lua
index a70d3b52a2..da81cb2362 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_linxura_aura_smart_button.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_linxura_aura_smart_button.lua
@@ -57,7 +57,7 @@ test.register_coroutine_test(
     test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -76,7 +76,7 @@ test.register_coroutine_test(
       end
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -95,7 +95,7 @@ test.register_coroutine_test(
         end
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -115,7 +115,7 @@ test.register_coroutine_test(
         end
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_linxura_smart_controller_4x_button.lua b/drivers/SmartThings/zigbee-button/src/test/test_linxura_smart_controller_4x_button.lua
index 35ad7aae08..c7e6257da1 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_linxura_smart_controller_4x_button.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_linxura_smart_controller_4x_button.lua
@@ -57,7 +57,7 @@ test.register_coroutine_test(
     test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -76,7 +76,7 @@ test.register_coroutine_test(
       end
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -95,7 +95,7 @@ test.register_coroutine_test(
         end
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -115,7 +115,7 @@ test.register_coroutine_test(
         end
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_push_only_button.lua b/drivers/SmartThings/zigbee-button/src/test/test_push_only_button.lua
index 2f6deceb70..4ce70ae423 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_push_only_button.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_push_only_button.lua
@@ -48,7 +48,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 test.register_message_test(
@@ -61,7 +61,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -80,7 +80,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -99,7 +99,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -164,7 +164,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -219,7 +219,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_robb_4x_button.lua b/drivers/SmartThings/zigbee-button/src/test/test_robb_4x_button.lua
index bbe5cbaf86..4985828ef1 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_robb_4x_button.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_robb_4x_button.lua
@@ -81,7 +81,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -124,7 +124,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -169,7 +169,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -212,7 +212,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -326,7 +326,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -368,7 +368,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -386,7 +386,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_robb_8x_button.lua b/drivers/SmartThings/zigbee-button/src/test/test_robb_8x_button.lua
index 8c291f8483..a9684dfa50 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_robb_8x_button.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_robb_8x_button.lua
@@ -126,7 +126,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -203,7 +203,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -284,7 +284,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -329,7 +329,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -444,7 +444,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -486,7 +486,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -504,7 +504,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_samjin_button.lua b/drivers/SmartThings/zigbee-button/src/test/test_samjin_button.lua
index 72bcd2009c..45d576490b 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_samjin_button.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_samjin_button.lua
@@ -90,7 +90,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -140,7 +140,7 @@ test.register_coroutine_test(
     -- })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_shinasystem_button.lua b/drivers/SmartThings/zigbee-button/src/test/test_shinasystem_button.lua
index d5eed5d55f..9ac823caa2 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_shinasystem_button.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_shinasystem_button.lua
@@ -85,7 +85,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -142,7 +142,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -199,7 +199,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -239,7 +239,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -287,7 +287,7 @@ test.register_coroutine_test(
     test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_somfy_situo_1_button.lua b/drivers/SmartThings/zigbee-button/src/test/test_somfy_situo_1_button.lua
index 2793a6de1b..f77893d5ec 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_somfy_situo_1_button.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_somfy_situo_1_button.lua
@@ -65,7 +65,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -116,7 +116,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -140,7 +140,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_add_hub_to_group(0xB9F2)
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -202,7 +202,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -250,7 +250,7 @@ test.register_coroutine_test(
     test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_somfy_situo_4_button.lua b/drivers/SmartThings/zigbee-button/src/test/test_somfy_situo_4_button.lua
index 9e209541ff..1dc73fc6e3 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_somfy_situo_4_button.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_somfy_situo_4_button.lua
@@ -94,7 +94,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -163,7 +163,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -187,7 +187,7 @@ test.register_coroutine_test(
       test.socket.zigbee:__expect_add_hub_to_group(0xB9F2)
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -235,7 +235,7 @@ test.register_coroutine_test(
     test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_sonoff_button.lua b/drivers/SmartThings/zigbee-button/src/test/test_sonoff_button.lua
index 22f76bc383..2b42c49d86 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_sonoff_button.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_sonoff_button.lua
@@ -161,7 +161,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-    min_api_version = 17
+    
   }
 )
 
@@ -180,7 +180,7 @@ test.register_coroutine_test(
     )
   end,
   {
-    min_api_version = 17
+    
   }
 )
 
@@ -199,7 +199,7 @@ test.register_coroutine_test(
     )
   end,
   {
-    min_api_version = 17
+    
   }
 )
 
@@ -218,7 +218,7 @@ test.register_coroutine_test(
     )
   end,
   {
-    min_api_version = 17
+    
   }
 )
 
@@ -237,7 +237,7 @@ test.register_coroutine_test(
     )
   end,
   {
-    min_api_version = 17
+    
   }
 )
 
@@ -256,7 +256,7 @@ test.register_coroutine_test(
     )
   end,
   {
-    min_api_version = 17
+    
   }
 )
 
@@ -271,7 +271,7 @@ test.register_coroutine_test(
     )
   end,
   {
-    min_api_version = 17
+    
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_thirdreality_button.lua b/drivers/SmartThings/zigbee-button/src/test/test_thirdreality_button.lua
index f4ee2e0aed..627d764f49 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_thirdreality_button.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_thirdreality_button.lua
@@ -48,7 +48,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -65,7 +65,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.button.button.pushed({ state_change = true })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -82,7 +82,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.button.button.double({ state_change = true })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -99,7 +99,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.button.button.held({ state_change = true })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_vimar_button.lua b/drivers/SmartThings/zigbee-button/src/test/test_vimar_button.lua
index c76d080a01..2613a69491 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_vimar_button.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_vimar_button.lua
@@ -77,7 +77,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -95,7 +95,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -113,7 +113,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -139,7 +139,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -165,7 +165,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -213,7 +213,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_wallhero_button.lua b/drivers/SmartThings/zigbee-button/src/test/test_wallhero_button.lua
index 93c6d26139..f1156345e4 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_wallhero_button.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_wallhero_button.lua
@@ -306,7 +306,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -347,7 +347,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_zigbee_button.lua b/drivers/SmartThings/zigbee-button/src/test/test_zigbee_button.lua
index db4f6b9a43..f486d7180b 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_zigbee_button.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_zigbee_button.lua
@@ -39,7 +39,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -58,7 +58,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -77,7 +77,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -91,7 +91,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -110,7 +110,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -129,7 +129,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -148,7 +148,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -167,7 +167,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -187,7 +187,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -213,7 +213,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -296,7 +296,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -373,7 +373,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_zigbee_ecosmart_button.lua b/drivers/SmartThings/zigbee-button/src/test/test_zigbee_ecosmart_button.lua
index 1b3078f637..ea3d685bbc 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_zigbee_ecosmart_button.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_zigbee_ecosmart_button.lua
@@ -50,7 +50,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -98,7 +98,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -123,7 +123,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -141,7 +141,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -167,7 +167,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -212,7 +212,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -261,7 +261,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-button/src/test/test_zunzunbee_8_button.lua b/drivers/SmartThings/zigbee-button/src/test/test_zunzunbee_8_button.lua
index 13479d4e8b..5774484d6a 100644
--- a/drivers/SmartThings/zigbee-button/src/test/test_zunzunbee_8_button.lua
+++ b/drivers/SmartThings/zigbee-button/src/test/test_zunzunbee_8_button.lua
@@ -81,7 +81,7 @@ test.register_coroutine_test(
     test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -142,7 +142,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -170,7 +170,7 @@ test.register_coroutine_test(
       end
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -199,7 +199,7 @@ test.register_coroutine_test(
         end
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-carbon-monoxide-detector/src/test/test_climax_technology_carbon_monoxide.lua b/drivers/SmartThings/zigbee-carbon-monoxide-detector/src/test/test_climax_technology_carbon_monoxide.lua
index b0df2ffaa4..c873527630 100644
--- a/drivers/SmartThings/zigbee-carbon-monoxide-detector/src/test/test_climax_technology_carbon_monoxide.lua
+++ b/drivers/SmartThings/zigbee-carbon-monoxide-detector/src/test/test_climax_technology_carbon_monoxide.lua
@@ -42,7 +42,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-carbon-monoxide-detector/src/test/test_frient_co_smoke_temperature_battery.lua b/drivers/SmartThings/zigbee-carbon-monoxide-detector/src/test/test_frient_co_smoke_temperature_battery.lua
index 16625fdf92..36bad5633a 100644
--- a/drivers/SmartThings/zigbee-carbon-monoxide-detector/src/test/test_frient_co_smoke_temperature_battery.lua
+++ b/drivers/SmartThings/zigbee-carbon-monoxide-detector/src/test/test_frient_co_smoke_temperature_battery.lua
@@ -447,7 +447,10 @@ test.register_coroutine_test(
 			)
 		})
 	end
-)
+,
+    {
+      min_api_version = 17
+    })
 
 test.register_coroutine_test(
 	"Alarm off command should send StartWarning stop",
@@ -474,7 +477,10 @@ test.register_coroutine_test(
 			)
 		})
 	end
-)
+,
+    {
+      min_api_version = 17
+    })
 
 test.register_coroutine_test(
 	"Default response to StartWarning should emit alarm events",
@@ -500,7 +506,10 @@ test.register_coroutine_test(
 		)
 		test.wait_for_events()
 	end
-)
+,
+    {
+      min_api_version = 17
+    })
 
 test.run_registered_tests()
 
diff --git a/drivers/SmartThings/zigbee-carbon-monoxide-detector/src/test/test_zigbee_carbon_monoxide.lua b/drivers/SmartThings/zigbee-carbon-monoxide-detector/src/test/test_zigbee_carbon_monoxide.lua
index 1b67dc8ee6..9d1acc74b4 100644
--- a/drivers/SmartThings/zigbee-carbon-monoxide-detector/src/test/test_zigbee_carbon_monoxide.lua
+++ b/drivers/SmartThings/zigbee-carbon-monoxide-detector/src/test/test_zigbee_carbon_monoxide.lua
@@ -44,7 +44,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -71,7 +71,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -99,7 +99,7 @@ test.register_message_test(
 
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -126,7 +126,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -145,7 +145,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -216,7 +216,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-contact/src/test/test_aqara_contact_sensor.lua b/drivers/SmartThings/zigbee-contact/src/test/test_aqara_contact_sensor.lua
index 8f6c5ecfdd..0ab601f518 100644
--- a/drivers/SmartThings/zigbee-contact/src/test/test_aqara_contact_sensor.lua
+++ b/drivers/SmartThings/zigbee-contact/src/test/test_aqara_contact_sensor.lua
@@ -66,7 +66,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -90,7 +90,7 @@ test.register_coroutine_test(
       capabilities.batteryLevel.battery("normal")))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -108,7 +108,7 @@ test.register_coroutine_test(
     capabilities.batteryLevel.battery("normal")))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -126,7 +126,7 @@ test.register_coroutine_test(
     capabilities.batteryLevel.battery("critical")))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -144,7 +144,7 @@ test.register_coroutine_test(
     capabilities.batteryLevel.battery("normal")))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -162,7 +162,7 @@ test.register_coroutine_test(
     capabilities.batteryLevel.battery("warning")))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -180,7 +180,7 @@ test.register_coroutine_test(
     capabilities.batteryLevel.battery("critical")))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -198,7 +198,7 @@ test.register_coroutine_test(
       capabilities.contactSensor.contact.closed()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -216,7 +216,7 @@ test.register_coroutine_test(
       capabilities.contactSensor.contact.open()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-contact/src/test/test_aurora_contact_sensor.lua b/drivers/SmartThings/zigbee-contact/src/test/test_aurora_contact_sensor.lua
index a2bcfdf612..fde1bdedd8 100644
--- a/drivers/SmartThings/zigbee-contact/src/test/test_aurora_contact_sensor.lua
+++ b/drivers/SmartThings/zigbee-contact/src/test/test_aurora_contact_sensor.lua
@@ -44,7 +44,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, PowerConfiguration.attributes.BatteryVoltage:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -95,7 +95,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-contact/src/test/test_centralite_multi_sensor.lua b/drivers/SmartThings/zigbee-contact/src/test/test_centralite_multi_sensor.lua
index b13d48fc2e..7d42304bc2 100644
--- a/drivers/SmartThings/zigbee-contact/src/test/test_centralite_multi_sensor.lua
+++ b/drivers/SmartThings/zigbee-contact/src/test/test_centralite_multi_sensor.lua
@@ -108,7 +108,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send( mock_device:generate_test_message("main", capabilities.threeAxis.threeAxis({300, 200, 100})) )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -134,7 +134,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send( mock_device:generate_test_message("main", capabilities.accelerationSensor.acceleration.inactive()) )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -170,7 +170,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send( mock_device:generate_test_message("main", capabilities.contactSensor.contact.open()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -197,7 +197,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -221,7 +221,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -282,7 +282,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -307,7 +307,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -333,7 +333,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-contact/src/test/test_contact_temperature_sensor.lua b/drivers/SmartThings/zigbee-contact/src/test/test_contact_temperature_sensor.lua
index 62e0eee71b..32780a8112 100644
--- a/drivers/SmartThings/zigbee-contact/src/test/test_contact_temperature_sensor.lua
+++ b/drivers/SmartThings/zigbee-contact/src/test/test_contact_temperature_sensor.lua
@@ -46,7 +46,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, TemperatureMeasurement.attributes.MeasuredValue:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -108,7 +108,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -127,7 +127,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -146,7 +146,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-contact/src/test/test_ecolink_contact.lua b/drivers/SmartThings/zigbee-contact/src/test/test_ecolink_contact.lua
index e092666737..15d5595bb2 100644
--- a/drivers/SmartThings/zigbee-contact/src/test/test_ecolink_contact.lua
+++ b/drivers/SmartThings/zigbee-contact/src/test/test_ecolink_contact.lua
@@ -47,7 +47,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, TemperatureMeasurement.attributes.MeasuredValue:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -117,7 +117,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -136,7 +136,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -155,7 +155,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-contact/src/test/test_ewelink_heiman_sensor.lua b/drivers/SmartThings/zigbee-contact/src/test/test_ewelink_heiman_sensor.lua
index f3b94929b6..ebb024605d 100644
--- a/drivers/SmartThings/zigbee-contact/src/test/test_ewelink_heiman_sensor.lua
+++ b/drivers/SmartThings/zigbee-contact/src/test/test_ewelink_heiman_sensor.lua
@@ -45,7 +45,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, PowerConfiguration.attributes.BatteryPercentageRemaining:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -96,7 +96,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-contact/src/test/test_frient_contact_sensor.lua b/drivers/SmartThings/zigbee-contact/src/test/test_frient_contact_sensor.lua
index 8be3dd430a..a212fea6b6 100644
--- a/drivers/SmartThings/zigbee-contact/src/test/test_frient_contact_sensor.lua
+++ b/drivers/SmartThings/zigbee-contact/src/test/test_frient_contact_sensor.lua
@@ -48,7 +48,7 @@ test.register_coroutine_test(
             test.socket.zigbee:__expect_send({ mock_device.id, PowerConfiguration.attributes.BatteryVoltage:read(mock_device) })
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -135,7 +135,7 @@ test.register_coroutine_test(
             mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -154,7 +154,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -173,7 +173,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -207,7 +207,7 @@ test.register_message_test(
         },
         {
             inner_block_ordering = "relaxed",
-            min_api_version = 17
+            
         }
 )
 
@@ -226,7 +226,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -245,7 +245,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -264,7 +264,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -283,7 +283,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
diff --git a/drivers/SmartThings/zigbee-contact/src/test/test_frient_contact_sensor_2_pro.lua b/drivers/SmartThings/zigbee-contact/src/test/test_frient_contact_sensor_2_pro.lua
index f6a2e0ebd9..b5cfe65f4c 100644
--- a/drivers/SmartThings/zigbee-contact/src/test/test_frient_contact_sensor_2_pro.lua
+++ b/drivers/SmartThings/zigbee-contact/src/test/test_frient_contact_sensor_2_pro.lua
@@ -56,7 +56,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, TemperatureMeasurement.attributes.MeasuredValue:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -178,7 +178,7 @@ test.register_coroutine_test(
             mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -205,7 +205,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           min_api_version = 15
         }
 )
 
@@ -224,7 +224,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -243,7 +243,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -322,7 +322,7 @@ test.register_message_test(
         },
         {
             inner_block_ordering = "relaxed",
-            min_api_version = 17
+            
         }
 )
 
@@ -341,7 +341,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -360,7 +360,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -379,7 +379,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -398,7 +398,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -426,7 +426,7 @@ test.register_coroutine_test(
             })
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
diff --git a/drivers/SmartThings/zigbee-contact/src/test/test_frient_contact_sensor_pro.lua b/drivers/SmartThings/zigbee-contact/src/test/test_frient_contact_sensor_pro.lua
index 66881f9f0b..3dea81ad2b 100644
--- a/drivers/SmartThings/zigbee-contact/src/test/test_frient_contact_sensor_pro.lua
+++ b/drivers/SmartThings/zigbee-contact/src/test/test_frient_contact_sensor_pro.lua
@@ -56,7 +56,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, TemperatureMeasurement.attributes.MeasuredValue:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -178,7 +178,7 @@ test.register_coroutine_test(
             mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -205,7 +205,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           min_api_version = 15
         }
 )
 
@@ -224,7 +224,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -243,7 +243,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -322,7 +322,7 @@ test.register_message_test(
         },
         {
             inner_block_ordering = "relaxed",
-            min_api_version = 17
+            
         }
 )
 
@@ -346,7 +346,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -370,7 +370,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -394,7 +394,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -418,7 +418,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -446,7 +446,7 @@ test.register_coroutine_test(
             })
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
diff --git a/drivers/SmartThings/zigbee-contact/src/test/test_frient_vibration_sensor.lua b/drivers/SmartThings/zigbee-contact/src/test/test_frient_vibration_sensor.lua
index 7829e32736..50081840b6 100644
--- a/drivers/SmartThings/zigbee-contact/src/test/test_frient_vibration_sensor.lua
+++ b/drivers/SmartThings/zigbee-contact/src/test/test_frient_vibration_sensor.lua
@@ -300,7 +300,7 @@ test.register_coroutine_test(
             mock_device_contact:expect_metadata_update({ provisioning_state = "PROVISIONED" })
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -328,7 +328,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -347,7 +347,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -366,7 +366,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -407,7 +407,7 @@ function()
     })
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -431,7 +431,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -455,7 +455,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -477,7 +477,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -505,7 +505,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -533,7 +533,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-contact/src/test/test_orvibo_contact_sensor.lua b/drivers/SmartThings/zigbee-contact/src/test/test_orvibo_contact_sensor.lua
index 6ebb00d45e..28d3d0d5fa 100644
--- a/drivers/SmartThings/zigbee-contact/src/test/test_orvibo_contact_sensor.lua
+++ b/drivers/SmartThings/zigbee-contact/src/test/test_orvibo_contact_sensor.lua
@@ -44,7 +44,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, PowerConfiguration.attributes.BatteryPercentageRemaining:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -95,7 +95,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-contact/src/test/test_samjin_multi_sensor.lua b/drivers/SmartThings/zigbee-contact/src/test/test_samjin_multi_sensor.lua
index d4082723c7..522e227ec8 100644
--- a/drivers/SmartThings/zigbee-contact/src/test/test_samjin_multi_sensor.lua
+++ b/drivers/SmartThings/zigbee-contact/src/test/test_samjin_multi_sensor.lua
@@ -95,7 +95,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -119,7 +119,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -180,7 +180,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -222,7 +222,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-contact/src/test/test_sengled_contact_sensor.lua b/drivers/SmartThings/zigbee-contact/src/test/test_sengled_contact_sensor.lua
index fc48ab8eaa..69d3a73ffd 100644
--- a/drivers/SmartThings/zigbee-contact/src/test/test_sengled_contact_sensor.lua
+++ b/drivers/SmartThings/zigbee-contact/src/test/test_sengled_contact_sensor.lua
@@ -44,7 +44,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, PowerConfiguration.attributes.BatteryVoltage:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -95,7 +95,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-contact/src/test/test_smartsense_multi.lua b/drivers/SmartThings/zigbee-contact/src/test/test_smartsense_multi.lua
index 4713e6eb41..d072b85501 100644
--- a/drivers/SmartThings/zigbee-contact/src/test/test_smartsense_multi.lua
+++ b/drivers/SmartThings/zigbee-contact/src/test/test_smartsense_multi.lua
@@ -116,7 +116,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.accelerationSensor.acceleration.active()))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -134,7 +134,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.battery.battery(60)))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -152,7 +152,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.battery.battery(60)))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -170,7 +170,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.battery.battery(60)))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -188,7 +188,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.battery.battery(60)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -206,7 +206,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.battery.battery(60)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -224,7 +224,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.battery.battery(60)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -242,7 +242,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.battery.battery(60)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -260,7 +260,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.battery.battery(60)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -278,7 +278,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.battery.battery(97)))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -296,7 +296,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.battery.battery(60)))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -314,7 +314,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.battery.battery(60)))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -332,7 +332,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.battery.battery(0)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -350,7 +350,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.battery.battery(0)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -368,7 +368,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.battery.battery(0)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -383,7 +383,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.threeAxis.threeAxis({1050, 3, 9})) )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -398,7 +398,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.threeAxis.threeAxis({-1050, -3, -9})) )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -413,7 +413,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.threeAxis.threeAxis({10, 1020, 7})) )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -428,7 +428,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.threeAxis.threeAxis({-10, -1020, -7})) )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -443,7 +443,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.threeAxis.threeAxis({116, 4, 1003})) )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -458,7 +458,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.threeAxis.threeAxis({-116, -4, -1003})) )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -491,7 +491,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send( mock_device:generate_test_message("main", capabilities.contactSensor.contact.open()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -510,7 +510,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -529,7 +529,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -548,7 +548,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -567,7 +567,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-contact/src/test/test_smartthings_multi_sensor.lua b/drivers/SmartThings/zigbee-contact/src/test/test_smartthings_multi_sensor.lua
index da87c0aee2..2d06cd0eb7 100644
--- a/drivers/SmartThings/zigbee-contact/src/test/test_smartthings_multi_sensor.lua
+++ b/drivers/SmartThings/zigbee-contact/src/test/test_smartthings_multi_sensor.lua
@@ -89,7 +89,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -108,7 +108,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -134,7 +134,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send( mock_device:generate_test_message("main", capabilities.accelerationSensor.acceleration.inactive()) )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -151,7 +151,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send( mock_device:generate_test_message("main", capabilities.accelerationSensor.acceleration.active()) )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -170,7 +170,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send( mock_device:generate_test_message("main", capabilities.threeAxis.threeAxis({300, 100, -200})) )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -206,7 +206,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send( mock_device:generate_test_message("main", capabilities.contactSensor.contact.open()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -236,7 +236,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -255,7 +255,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -274,7 +274,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -301,7 +301,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -325,7 +325,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -390,7 +390,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -434,7 +434,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-contact/src/test/test_third_reality_contact.lua b/drivers/SmartThings/zigbee-contact/src/test/test_third_reality_contact.lua
index c03ab49dde..c78269b196 100644
--- a/drivers/SmartThings/zigbee-contact/src/test/test_third_reality_contact.lua
+++ b/drivers/SmartThings/zigbee-contact/src/test/test_third_reality_contact.lua
@@ -44,7 +44,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, PowerConfiguration.attributes.BatteryPercentageRemaining:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -95,7 +95,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-contact/src/test/test_thirdreality_multi_sensor.lua b/drivers/SmartThings/zigbee-contact/src/test/test_thirdreality_multi_sensor.lua
index 92f7274365..2e7462311e 100644
--- a/drivers/SmartThings/zigbee-contact/src/test/test_thirdreality_multi_sensor.lua
+++ b/drivers/SmartThings/zigbee-contact/src/test/test_thirdreality_multi_sensor.lua
@@ -54,7 +54,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send( mock_device:generate_test_message("main", capabilities.accelerationSensor.acceleration.inactive()) )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -71,7 +71,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send( mock_device:generate_test_message("main", capabilities.accelerationSensor.acceleration.active()) )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -90,7 +90,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send( mock_device:generate_test_message("main", capabilities.threeAxis.threeAxis({200, 100, 300})) )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-contact/src/test/test_zigbee_contact.lua b/drivers/SmartThings/zigbee-contact/src/test/test_zigbee_contact.lua
index f27743d4ee..fc93a2add8 100644
--- a/drivers/SmartThings/zigbee-contact/src/test/test_zigbee_contact.lua
+++ b/drivers/SmartThings/zigbee-contact/src/test/test_zigbee_contact.lua
@@ -46,7 +46,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -73,7 +73,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -102,7 +102,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -131,7 +131,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -159,7 +159,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -185,7 +185,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -205,7 +205,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -250,7 +250,7 @@ test.register_coroutine_test(
       test.socket.zigbee:__expect_send({ mock_device.id, IASZone.attributes.ZoneStatus:read(mock_device) })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -344,7 +344,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-contact/src/test/test_zigbee_contact_battery.lua b/drivers/SmartThings/zigbee-contact/src/test/test_zigbee_contact_battery.lua
index d908aedba6..b96a27aef6 100644
--- a/drivers/SmartThings/zigbee-contact/src/test/test_zigbee_contact_battery.lua
+++ b/drivers/SmartThings/zigbee-contact/src/test/test_zigbee_contact_battery.lua
@@ -88,7 +88,7 @@ test.register_coroutine_test(
       end
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -108,7 +108,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -128,7 +128,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-contact/src/test/test_zigbee_contact_tyco.lua b/drivers/SmartThings/zigbee-contact/src/test/test_zigbee_contact_tyco.lua
index 6b482996de..a1899b6a43 100644
--- a/drivers/SmartThings/zigbee-contact/src/test/test_zigbee_contact_tyco.lua
+++ b/drivers/SmartThings/zigbee-contact/src/test/test_zigbee_contact_tyco.lua
@@ -56,7 +56,7 @@ test.register_coroutine_test(
         end
       end,
       {
-         min_api_version = 17
+         
       }
 
   )
@@ -84,7 +84,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -105,7 +105,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 
   )
diff --git a/drivers/SmartThings/zigbee-fan/src/test/test_fan_light.lua b/drivers/SmartThings/zigbee-fan/src/test/test_fan_light.lua
index b305bb8a9d..f079da4ea3 100644
--- a/drivers/SmartThings/zigbee-fan/src/test/test_fan_light.lua
+++ b/drivers/SmartThings/zigbee-fan/src/test/test_fan_light.lua
@@ -50,7 +50,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -71,7 +71,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -92,7 +92,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -113,7 +113,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -138,7 +138,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -163,7 +163,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -183,7 +183,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -203,7 +203,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -223,7 +223,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -243,7 +243,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -263,7 +263,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -287,7 +287,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -311,7 +311,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -335,7 +335,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -365,7 +365,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -395,7 +395,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -425,7 +425,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -455,7 +455,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -485,7 +485,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -509,7 +509,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -533,7 +533,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_aqara_sensor.lua b/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_aqara_sensor.lua
index 762c1f4431..6078e7b69d 100644
--- a/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_aqara_sensor.lua
+++ b/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_aqara_sensor.lua
@@ -96,7 +96,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -119,7 +119,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -142,7 +142,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -165,7 +165,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -196,7 +196,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -219,7 +219,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -241,7 +241,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -263,7 +263,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -285,7 +285,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -307,7 +307,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_centralite_sensor.lua b/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_centralite_sensor.lua
index b35c590b91..b6fc95473b 100644
--- a/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_centralite_sensor.lua
+++ b/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_centralite_sensor.lua
@@ -95,7 +95,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -186,7 +186,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -231,7 +231,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_ewelink_sensor.lua b/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_ewelink_sensor.lua
index aefbd3c350..0dbc35ac77 100644
--- a/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_ewelink_sensor.lua
+++ b/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_ewelink_sensor.lua
@@ -66,7 +66,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -114,7 +114,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_frient_air_quality_sensor.lua b/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_frient_air_quality_sensor.lua
index 06e836a007..a201c46173 100644
--- a/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_frient_air_quality_sensor.lua
+++ b/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_frient_air_quality_sensor.lua
@@ -85,7 +85,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -104,7 +104,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -123,7 +123,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -221,7 +221,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -243,7 +243,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -262,7 +262,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -298,7 +298,7 @@ test.register_coroutine_test(
         test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -328,7 +328,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -345,7 +345,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_frient_sensor.lua b/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_frient_sensor.lua
index 81bc408f32..90107a4a45 100644
--- a/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_frient_sensor.lua
+++ b/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_frient_sensor.lua
@@ -67,7 +67,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -86,7 +86,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -105,7 +105,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -167,7 +167,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -189,7 +189,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -216,7 +216,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -268,7 +268,7 @@ test.register_coroutine_test(
         test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_heiman_sensor.lua b/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_heiman_sensor.lua
index c75326503d..84a01c02bc 100644
--- a/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_heiman_sensor.lua
+++ b/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_heiman_sensor.lua
@@ -66,7 +66,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -125,7 +125,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_humidity_battery_sensor.lua b/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_humidity_battery_sensor.lua
index 3d9e24e2eb..362ca6c2ce 100644
--- a/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_humidity_battery_sensor.lua
+++ b/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_humidity_battery_sensor.lua
@@ -48,7 +48,7 @@ test.register_message_test(
      }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -70,7 +70,7 @@ test.register_message_test(
      }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -92,7 +92,7 @@ test.register_message_test(
      }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -119,7 +119,7 @@ test.register_coroutine_test(
       end
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_humidity_plaid_systems.lua b/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_humidity_plaid_systems.lua
index c8aa3a6191..d3dd59eac4 100644
--- a/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_humidity_plaid_systems.lua
+++ b/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_humidity_plaid_systems.lua
@@ -51,7 +51,7 @@ test.register_message_test(
      }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -73,7 +73,7 @@ test.register_message_test(
      }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -95,7 +95,7 @@ test.register_message_test(
      }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -125,7 +125,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -151,7 +151,7 @@ test.register_coroutine_test(
       end
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -172,7 +172,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -210,7 +210,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -250,7 +250,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -287,7 +287,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_humidity_temperature.lua b/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_humidity_temperature.lua
index e821dd3d56..82ca643781 100644
--- a/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_humidity_temperature.lua
+++ b/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_humidity_temperature.lua
@@ -48,7 +48,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -78,7 +78,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -100,7 +100,7 @@ test.register_message_test(
      }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -137,7 +137,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -171,7 +171,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.relativeHumidityMeasurement.humidity({ value = 79 })))
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_humidity_temperature_battery.lua b/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_humidity_temperature_battery.lua
index b03f27d59d..d5c7a89d58 100644
--- a/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_humidity_temperature_battery.lua
+++ b/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_humidity_temperature_battery.lua
@@ -60,7 +60,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -90,7 +90,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -112,7 +112,7 @@ test.register_message_test(
      }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -157,7 +157,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -191,7 +191,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.relativeHumidityMeasurement.humidity({ value = 79 })))
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_humidity_temperature_sensor.lua b/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_humidity_temperature_sensor.lua
index f01b9534bb..bf0725f8b6 100644
--- a/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_humidity_temperature_sensor.lua
+++ b/drivers/SmartThings/zigbee-humidity-sensor/src/test/test_humidity_temperature_sensor.lua
@@ -55,7 +55,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -85,7 +85,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -107,7 +107,7 @@ test.register_message_test(
      }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -144,7 +144,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-illuminance-sensor/src/test/test_illuminance_sensor.lua b/drivers/SmartThings/zigbee-illuminance-sensor/src/test/test_illuminance_sensor.lua
index fb97045c03..f981ceed0e 100644
--- a/drivers/SmartThings/zigbee-illuminance-sensor/src/test/test_illuminance_sensor.lua
+++ b/drivers/SmartThings/zigbee-illuminance-sensor/src/test/test_illuminance_sensor.lua
@@ -46,7 +46,7 @@ test.register_message_test(
      }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -68,7 +68,7 @@ test.register_message_test(
      }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -106,7 +106,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, PowerConfiguration.attributes.BatteryPercentageRemaining:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-illuminance-sensor/src/test/test_illuminance_sensor_aqara.lua b/drivers/SmartThings/zigbee-illuminance-sensor/src/test/test_illuminance_sensor_aqara.lua
index 32ee9eae11..f12a49fa8b 100644
--- a/drivers/SmartThings/zigbee-illuminance-sensor/src/test/test_illuminance_sensor_aqara.lua
+++ b/drivers/SmartThings/zigbee-illuminance-sensor/src/test/test_illuminance_sensor_aqara.lua
@@ -59,7 +59,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.battery.battery(100)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -100,7 +100,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -123,7 +123,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -145,7 +145,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -183,7 +183,7 @@ test.register_coroutine_test(
         MFG_CODE, data_types.Uint16, frequency) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -197,7 +197,7 @@ test.register_coroutine_test(
       detectionFrequency.detectionFrequency(FREQUENCY_DEFAULT_VALUE, { visibility = { displayed = false } })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-lock/src/test/test_bad_battery_reporter.lua b/drivers/SmartThings/zigbee-lock/src/test/test_bad_battery_reporter.lua
index 61fb28ce8d..0f8f282369 100644
--- a/drivers/SmartThings/zigbee-lock/src/test/test_bad_battery_reporter.lua
+++ b/drivers/SmartThings/zigbee-lock/src/test/test_bad_battery_reporter.lua
@@ -46,7 +46,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -84,7 +84,7 @@ test.register_message_test(
     },
     {
       test_init = test_init_yrd,
-      min_api_version = 17
+      
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-lock/src/test/test_c2o_lock.lua b/drivers/SmartThings/zigbee-lock/src/test/test_c2o_lock.lua
index 4bde45ec1a..07d8fa9fa6 100644
--- a/drivers/SmartThings/zigbee-lock/src/test/test_c2o_lock.lua
+++ b/drivers/SmartThings/zigbee-lock/src/test/test_c2o_lock.lua
@@ -41,7 +41,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, DoorLock.attributes.LockState:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -75,7 +75,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -88,7 +88,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, DoorLock.attributes.LockState:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -101,7 +101,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, PowerConfiguration.attributes.BatteryPercentageRemaining:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -114,7 +114,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, PowerConfiguration.attributes.BatteryPercentageRemaining:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -129,7 +129,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, DoorLock.attributes.LockState:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -144,7 +144,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, DoorLock.attributes.LockState:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -154,7 +154,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__queue_receive({ mock_device.id, DoorLock.attributes.NumberOfPINUsersSupported:build_test_attr_report(mock_device, 8)})
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-lock/src/test/test_generic_fingerprint_profile_update.lua b/drivers/SmartThings/zigbee-lock/src/test/test_generic_fingerprint_profile_update.lua
index e6d6a22b78..eae4ef18ff 100644
--- a/drivers/SmartThings/zigbee-lock/src/test/test_generic_fingerprint_profile_update.lua
+++ b/drivers/SmartThings/zigbee-lock/src/test/test_generic_fingerprint_profile_update.lua
@@ -46,7 +46,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, DoorLock.attributes.NumberOfPINUsersSupported:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-lock/src/test/test_zigbee_lock_legacy.lua b/drivers/SmartThings/zigbee-lock/src/test/test_zigbee_lock_legacy.lua
index c3b316f486..3c905fa7c9 100644
--- a/drivers/SmartThings/zigbee-lock/src/test/test_zigbee_lock_legacy.lua
+++ b/drivers/SmartThings/zigbee-lock/src/test/test_zigbee_lock_legacy.lua
@@ -81,7 +81,7 @@ test.register_coroutine_test(
 
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -96,7 +96,7 @@ test.register_coroutine_test(
       test.socket.zigbee:__expect_send({mock_device.id, Alarm.attributes.AlarmCount:read(mock_device)})
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -116,7 +116,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -136,7 +136,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -163,7 +163,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -196,7 +196,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -215,7 +215,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -234,7 +234,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -253,7 +253,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -273,7 +273,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -284,7 +284,7 @@ test.register_coroutine_test(
       expect_reload_all_codes_messages()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -303,7 +303,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -345,7 +345,7 @@ test.register_coroutine_test(
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -395,7 +395,7 @@ test.register_coroutine_test(
         capabilities.lockCodes.lockCodes(json.encode({["1"] = "test"}), { visibility = { displayed = false } })))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -453,7 +453,7 @@ test.register_coroutine_test(
         capabilities.lockCodes.lockCodes(json.encode({["1"] = "foo"}), { visibility = { displayed = false } })))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -471,7 +471,7 @@ test.register_coroutine_test(
       capabilities.lockCodes.lockCodes(json.encode({["1"] = "foo"}), { visibility = { displayed = false } })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -545,7 +545,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -580,7 +580,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -615,7 +615,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -654,7 +654,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -689,7 +689,7 @@ test.register_coroutine_test(
           capabilities.lockCodes.lockCodes(json.encode({}), { visibility = { displayed = false } })))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -746,7 +746,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -777,7 +777,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -843,7 +843,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -862,7 +862,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -881,7 +881,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -909,7 +909,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -939,7 +939,7 @@ test.register_coroutine_test(
         capabilities.lockCodes.lockCodes(json.encode({["1"] = "Code 1"}), { visibility = { displayed = false } })))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-lock/src/test/test_zigbee_lock_v10.lua b/drivers/SmartThings/zigbee-lock/src/test/test_zigbee_lock_v10.lua
index 9ce880efe6..1c3c7fdbef 100644
--- a/drivers/SmartThings/zigbee-lock/src/test/test_zigbee_lock_v10.lua
+++ b/drivers/SmartThings/zigbee-lock/src/test/test_zigbee_lock_v10.lua
@@ -81,7 +81,7 @@ test.register_coroutine_test(
 
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -96,7 +96,7 @@ test.register_coroutine_test(
       test.socket.zigbee:__expect_send({mock_device.id, Alarm.attributes.AlarmCount:read(mock_device)})
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -116,7 +116,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -136,7 +136,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -163,7 +163,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -196,7 +196,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -215,7 +215,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -234,7 +234,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -253,7 +253,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -273,7 +273,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -284,7 +284,7 @@ test.register_coroutine_test(
       expect_reload_all_codes_messages()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -303,7 +303,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -345,7 +345,7 @@ test.register_coroutine_test(
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -395,7 +395,7 @@ test.register_coroutine_test(
         capabilities.lockCodes.lockCodes(json.encode({["1"] = "test"}), { visibility = { displayed = false } })))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -453,7 +453,7 @@ test.register_coroutine_test(
         capabilities.lockCodes.lockCodes(json.encode({["1"] = "foo"}), { visibility = { displayed = false } })))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -471,7 +471,7 @@ test.register_coroutine_test(
       capabilities.lockCodes.lockCodes(json.encode({["1"] = "foo"}), { visibility = { displayed = false } })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -545,7 +545,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -580,7 +580,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -615,7 +615,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -654,7 +654,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -689,7 +689,7 @@ test.register_coroutine_test(
           capabilities.lockCodes.lockCodes(json.encode({}), { visibility = { displayed = false } })))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -746,7 +746,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -777,7 +777,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -843,7 +843,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-lock/src/test/test_zigbee_yale_fingerprint-lock.lua b/drivers/SmartThings/zigbee-lock/src/test/test_zigbee_yale_fingerprint-lock.lua
index b0f4d1ffcf..11fcd30a8f 100644
--- a/drivers/SmartThings/zigbee-lock/src/test/test_zigbee_yale_fingerprint-lock.lua
+++ b/drivers/SmartThings/zigbee-lock/src/test/test_zigbee_yale_fingerprint-lock.lua
@@ -48,7 +48,7 @@ test.register_message_test(
     },
     {
        test_init = test_init,
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-lock/src/test/test_zigbee_yale_legacy.lua b/drivers/SmartThings/zigbee-lock/src/test/test_zigbee_yale_legacy.lua
index 95d496e786..52345e4b03 100644
--- a/drivers/SmartThings/zigbee-lock/src/test/test_zigbee_yale_legacy.lua
+++ b/drivers/SmartThings/zigbee-lock/src/test/test_zigbee_yale_legacy.lua
@@ -47,7 +47,7 @@ test.register_coroutine_test(
       expect_reload_all_codes_messages()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -89,7 +89,7 @@ test.register_coroutine_test(
 
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -139,7 +139,7 @@ test.register_coroutine_test(
         capabilities.lockCodes.lockCodes(json.encode({["1"] = "test"}), { visibility = { displayed = false }})))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -189,7 +189,7 @@ test.register_coroutine_test(
         capabilities.lockCodes.lockCodes(json.encode({["0"] = "test"}), { visibility = { displayed = false }})))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -218,7 +218,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -276,7 +276,7 @@ test.register_coroutine_test(
         capabilities.lockCodes.lockCodes(json.encode({["1"] = "foo"}), { visibility = { displayed = false }})))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -321,7 +321,7 @@ test.register_coroutine_test(
       capabilities.lockCodes.codeChanged("1 failed", { state_change = true  })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -339,7 +339,7 @@ test.register_coroutine_test(
       capabilities.lockCodes.lockCodes(json.encode({["1"] = "foo"}), { visibility = { displayed = false }})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -382,7 +382,7 @@ test.register_coroutine_test(
           capabilities.lockCodes.codeChanged("1 is not set", { state_change = true })))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -412,7 +412,7 @@ test.register_coroutine_test(
         capabilities.lockCodes.lockCodes(json.encode({["1"] = "initialName"}), { visibility = { displayed = false }})))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -442,7 +442,7 @@ test.register_coroutine_test(
         capabilities.lockCodes.lockCodes(json.encode({}), { visibility = { displayed = false }})))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_all_capabilities_zigbee_motion.lua b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_all_capabilities_zigbee_motion.lua
index 72fbeb168b..923eac61da 100644
--- a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_all_capabilities_zigbee_motion.lua
+++ b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_all_capabilities_zigbee_motion.lua
@@ -48,7 +48,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -75,7 +75,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -102,7 +102,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -129,7 +129,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -156,7 +156,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -182,7 +182,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -201,7 +201,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -220,7 +220,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -329,7 +329,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -416,7 +416,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -437,7 +437,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -457,7 +457,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_aqara_high_precision.lua b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_aqara_high_precision.lua
index 5e961e37ec..b61c728a5f 100644
--- a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_aqara_high_precision.lua
+++ b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_aqara_high_precision.lua
@@ -73,7 +73,7 @@ test.register_coroutine_test(
       capabilities.battery.battery(100)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -96,7 +96,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -120,7 +120,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -145,7 +145,7 @@ test.register_coroutine_test(
       capabilities.motionSensor.motion.inactive()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -188,7 +188,7 @@ test.register_coroutine_test(
     detectionFrequency.detectionFrequency(value, {visibility = {displayed = false}})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -205,7 +205,7 @@ test.register_coroutine_test(
       sensitivityAdjustment.sensitivityAdjustment.High()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -222,7 +222,7 @@ test.register_coroutine_test(
       sensitivityAdjustment.sensitivityAdjustment.Medium()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -239,7 +239,7 @@ test.register_coroutine_test(
       sensitivityAdjustment.sensitivityAdjustment.Low()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -277,7 +277,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_aqara_motion_illuminance.lua b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_aqara_motion_illuminance.lua
index a75033bef8..b8800365ed 100644
--- a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_aqara_motion_illuminance.lua
+++ b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_aqara_motion_illuminance.lua
@@ -88,7 +88,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.battery.battery(100)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -111,7 +111,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -139,7 +139,7 @@ test.register_coroutine_test(
       capabilities.motionSensor.motion.inactive()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -158,7 +158,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -202,7 +202,7 @@ test.register_coroutine_test(
       capabilities.motionSensor.motion.inactive()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -219,7 +219,7 @@ test.register_coroutine_test(
       detectionFrequency.detectionFrequency(PREF_FREQUENCY_VALUE_DEFAULT, {visibility = {displayed = false}})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_aurora_motion.lua b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_aurora_motion.lua
index 4ae03f0354..f6f9cada91 100644
--- a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_aurora_motion.lua
+++ b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_aurora_motion.lua
@@ -56,7 +56,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -83,7 +83,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -110,7 +110,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -137,7 +137,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -176,7 +176,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -220,7 +220,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_battery_voltage_motion.lua b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_battery_voltage_motion.lua
index 1bb1e359bb..83290d0261 100644
--- a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_battery_voltage_motion.lua
+++ b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_battery_voltage_motion.lua
@@ -52,7 +52,7 @@ test.register_coroutine_test(
       end
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
diff --git a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_centralite_motion.lua b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_centralite_motion.lua
index fd1222b0cc..d338bb2bc3 100644
--- a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_centralite_motion.lua
+++ b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_centralite_motion.lua
@@ -71,7 +71,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -97,7 +97,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_compacta_motion.lua b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_compacta_motion.lua
index ec85954568..3ca6e212b5 100644
--- a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_compacta_motion.lua
+++ b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_compacta_motion.lua
@@ -77,7 +77,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -101,7 +101,7 @@ test.register_coroutine_test(
       })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_frient_motion_sensor.lua b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_frient_motion_sensor.lua
index a7b3828958..bc567c0d76 100644
--- a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_frient_motion_sensor.lua
+++ b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_frient_motion_sensor.lua
@@ -71,7 +71,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -84,7 +84,7 @@ test.register_coroutine_test(
             test.socket.zigbee:__expect_send({ mock_device.id, OccupancySensing.attributes.Occupancy:read(mock_device):to_endpoint(OCCUPANCY_ENDPOINT)})
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -214,7 +214,7 @@ test.register_coroutine_test(
             })
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -233,7 +233,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -252,7 +252,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -284,7 +284,7 @@ test.register_coroutine_test(
             })
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
diff --git a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_frient_motion_sensor2_pet.lua b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_frient_motion_sensor2_pet.lua
index 4dc67338d5..55fa37b0f9 100644
--- a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_frient_motion_sensor2_pet.lua
+++ b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_frient_motion_sensor2_pet.lua
@@ -79,7 +79,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -98,7 +98,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -125,7 +125,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           min_api_version = 15
         }
 )
 
@@ -147,7 +147,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -201,7 +201,7 @@ test.register_coroutine_test(
             test.socket.zigbee:__expect_send({mock_device.id, IlluminanceMeasurement.attributes.MeasuredValue:read(mock_device):to_endpoint(ILLUMINANCE_ENDPOINT)})
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -359,7 +359,7 @@ test.register_coroutine_test(
             mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -402,7 +402,7 @@ test.register_coroutine_test(
             })
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
diff --git a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_frient_motion_sensor_pro.lua b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_frient_motion_sensor_pro.lua
index fe633e089a..733e1f1a53 100644
--- a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_frient_motion_sensor_pro.lua
+++ b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_frient_motion_sensor_pro.lua
@@ -82,7 +82,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -101,7 +101,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -121,7 +121,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -141,7 +141,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -168,7 +168,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           min_api_version = 15
         }
 )
 
@@ -190,7 +190,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -206,7 +206,7 @@ test.register_coroutine_test(
             test.socket.zigbee:__expect_send({mock_device.id, IlluminanceMeasurement.attributes.MeasuredValue:read(mock_device):to_endpoint(ILLUMINANCE_ENDPOINT)})
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -367,7 +367,7 @@ test.register_coroutine_test(
             mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -410,7 +410,7 @@ test.register_coroutine_test(
             })
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -430,7 +430,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -450,7 +450,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
diff --git a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_gator_motion.lua b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_gator_motion.lua
index ad129ddc2b..e5487ec3cd 100644
--- a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_gator_motion.lua
+++ b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_gator_motion.lua
@@ -46,7 +46,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.motionSensor.motion.inactive()))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -65,7 +65,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.presenceSensor.presence.not_present()))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -81,7 +81,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.contactSensor.contact.open()))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -97,7 +97,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.contactSensor.contact.closed()))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -113,7 +113,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.battery.battery(100)))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -129,7 +129,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.battery.battery(0)))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -145,7 +145,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.battery.battery(10)))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -163,7 +163,7 @@ test.register_coroutine_test(
       test.socket.device_lifecycle:__queue_receive({ mock_device.id, "doConfigure" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -182,7 +182,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.motionSensor.motion.inactive()))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_ikea_motion.lua b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_ikea_motion.lua
index f922439c22..49f467b00d 100644
--- a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_ikea_motion.lua
+++ b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_ikea_motion.lua
@@ -60,7 +60,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -102,7 +102,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -125,7 +125,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.motionSensor.motion.inactive()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -149,7 +149,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_add_hub_to_group(0xB9F2)
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -211,7 +211,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -237,7 +237,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -265,7 +265,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.motionSensor.motion.inactive()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_samjin_sensor.lua b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_samjin_sensor.lua
index 95c24f5f8e..9182b0c4f7 100644
--- a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_samjin_sensor.lua
+++ b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_samjin_sensor.lua
@@ -95,7 +95,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -120,7 +120,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_sengled_motion.lua b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_sengled_motion.lua
index 4ca87d6358..2d1c36c027 100644
--- a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_sengled_motion.lua
+++ b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_sengled_motion.lua
@@ -46,7 +46,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, IASZone.attributes.ZoneStatus:configure_reporting(mock_device, 0xFFFF, 0x0000, 0) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -98,7 +98,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_smartsense_motion_sensor.lua b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_smartsense_motion_sensor.lua
index b8b8fc4c62..dba2e42e59 100644
--- a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_smartsense_motion_sensor.lua
+++ b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_smartsense_motion_sensor.lua
@@ -69,7 +69,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.signalStrength.rssi({ value = -50, unit = "dBm" })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -86,7 +86,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.signalStrength.rssi({ value = -50, unit = "dBm" })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -103,7 +103,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.signalStrength.rssi({ value = -50, unit = "dBm" })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -120,7 +120,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.signalStrength.rssi({ value = -50, unit = "dBm" })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -136,7 +136,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.signalStrength.rssi({ value = -50, unit = "dBm" })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -152,7 +152,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.signalStrength.rssi({ value = -50, unit = "dBm" })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -169,7 +169,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.signalStrength.rssi({ value = -50, unit = "dBm" })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -182,7 +182,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.signalStrength.rssi({value = -100, unit = 'dBm'})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_smartthings_motion.lua b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_smartthings_motion.lua
index 83c8f3c36d..f06f038d45 100644
--- a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_smartthings_motion.lua
+++ b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_smartthings_motion.lua
@@ -55,7 +55,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_thirdreality_sensor.lua b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_thirdreality_sensor.lua
index cae6559187..6e141f3755 100644
--- a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_thirdreality_sensor.lua
+++ b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_thirdreality_sensor.lua
@@ -70,7 +70,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -96,7 +96,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -122,7 +122,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -148,7 +148,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -170,7 +170,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_zigbee_motion_iris.lua b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_zigbee_motion_iris.lua
index 7808c5184a..041eac71bd 100644
--- a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_zigbee_motion_iris.lua
+++ b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_zigbee_motion_iris.lua
@@ -56,7 +56,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -143,7 +143,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_zigbee_motion_nyce.lua b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_zigbee_motion_nyce.lua
index 9dca781210..3768804119 100644
--- a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_zigbee_motion_nyce.lua
+++ b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_zigbee_motion_nyce.lua
@@ -46,7 +46,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -65,7 +65,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -94,7 +94,7 @@ test.register_coroutine_test(
       end
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
diff --git a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_zigbee_motion_orvibo.lua b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_zigbee_motion_orvibo.lua
index c9172d8b8f..3fa763f117 100644
--- a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_zigbee_motion_orvibo.lua
+++ b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_zigbee_motion_orvibo.lua
@@ -46,7 +46,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -65,7 +65,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -84,7 +84,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -103,7 +103,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -130,7 +130,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -157,7 +157,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_zigbee_plugin_motion_sensor.lua b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_zigbee_plugin_motion_sensor.lua
index 3bc0f85f0c..e504d5897a 100644
--- a/drivers/SmartThings/zigbee-motion-sensor/src/test/test_zigbee_plugin_motion_sensor.lua
+++ b/drivers/SmartThings/zigbee-motion-sensor/src/test/test_zigbee_plugin_motion_sensor.lua
@@ -49,7 +49,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -68,7 +68,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -115,7 +115,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -139,7 +139,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-power-meter/src/test/test_frient_power_energy_battery_consumption_report.lua b/drivers/SmartThings/zigbee-power-meter/src/test/test_frient_power_energy_battery_consumption_report.lua
index 6a312c1906..d752ccd553 100644
--- a/drivers/SmartThings/zigbee-power-meter/src/test/test_frient_power_energy_battery_consumption_report.lua
+++ b/drivers/SmartThings/zigbee-power-meter/src/test/test_frient_power_energy_battery_consumption_report.lua
@@ -155,7 +155,10 @@ test.register_coroutine_test(
 
             mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
         end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.register_message_test(
         "Refresh should read all necessary attributes",
diff --git a/drivers/SmartThings/zigbee-power-meter/src/test/test_frient_power_energy_consumption_report.lua b/drivers/SmartThings/zigbee-power-meter/src/test/test_frient_power_energy_consumption_report.lua
index 2679329fd3..ae8ad437d9 100644
--- a/drivers/SmartThings/zigbee-power-meter/src/test/test_frient_power_energy_consumption_report.lua
+++ b/drivers/SmartThings/zigbee-power-meter/src/test/test_frient_power_energy_consumption_report.lua
@@ -140,7 +140,10 @@ test.register_coroutine_test(
 
             mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
         end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.register_message_test(
         "Refresh should read all necessary attributes",
diff --git a/drivers/SmartThings/zigbee-power-meter/src/test/test_frient_power_energy_current_voltage.lua b/drivers/SmartThings/zigbee-power-meter/src/test/test_frient_power_energy_current_voltage.lua
index 75f9da6961..a6edbf71bd 100644
--- a/drivers/SmartThings/zigbee-power-meter/src/test/test_frient_power_energy_current_voltage.lua
+++ b/drivers/SmartThings/zigbee-power-meter/src/test/test_frient_power_energy_current_voltage.lua
@@ -356,6 +356,9 @@ test.register_coroutine_test(
 
             mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
         end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.run_registered_tests()
diff --git a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter.lua b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter.lua
index 571764d8f2..d743b80310 100644
--- a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter.lua
+++ b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter.lua
@@ -91,7 +91,7 @@ test.register_coroutine_test(
       test_init = function()
         -- no op to override auto device add on startup
       end,
-      min_api_version = 17
+      
     }
 )
 
@@ -118,7 +118,7 @@ test.register_coroutine_test(
       test_init = function()
         -- no op to override auto device add on startup
       end,
-      min_api_version = 17
+      
     }
 )
 
@@ -144,7 +144,7 @@ test.register_coroutine_test(
       test_init = function()
         -- no op to override auto device add on startup
       end,
-      min_api_version = 17
+      
     }
 )
 
@@ -170,7 +170,7 @@ test.register_coroutine_test(
       test_init = function()
         -- no op to override auto device add on startup
       end,
-      min_api_version = 17
+      
     }
 )
 
@@ -195,7 +195,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -219,7 +219,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -291,7 +291,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_1p.lua b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_1p.lua
index f82864cc06..bd938dea33 100644
--- a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_1p.lua
+++ b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_1p.lua
@@ -76,7 +76,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -96,7 +96,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -116,7 +116,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -136,7 +136,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -156,7 +156,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -240,7 +240,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -259,7 +259,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -305,7 +305,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -324,7 +324,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -347,7 +347,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_1p_ZM.lua b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_1p_ZM.lua
index ef82322125..530281a13b 100644
--- a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_1p_ZM.lua
+++ b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_1p_ZM.lua
@@ -206,6 +206,9 @@ test.register_coroutine_test(
     })
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.run_registered_tests()
diff --git a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_2p.lua b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_2p.lua
index 37edda6bd9..1755465b6a 100644
--- a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_2p.lua
+++ b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_2p.lua
@@ -73,7 +73,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -93,7 +93,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -113,7 +113,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -133,7 +133,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -153,7 +153,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -173,7 +173,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -193,7 +193,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -301,7 +301,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_2p_ZM.lua b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_2p_ZM.lua
index 5b959e7c61..ffb31f4b64 100644
--- a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_2p_ZM.lua
+++ b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_2p_ZM.lua
@@ -279,6 +279,9 @@ test.register_coroutine_test(
     })
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.run_registered_tests()
diff --git a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_3p.lua b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_3p.lua
index ed606d096e..555edde2db 100644
--- a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_3p.lua
+++ b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_3p.lua
@@ -72,7 +72,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -92,7 +92,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -112,7 +112,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -132,7 +132,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -152,7 +152,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -172,7 +172,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -192,7 +192,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -212,7 +212,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -232,7 +232,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -252,7 +252,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -384,7 +384,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_3p_ZM.lua b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_3p_ZM.lua
index c4d24f35ba..8aba874223 100644
--- a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_3p_ZM.lua
+++ b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_3p_ZM.lua
@@ -353,6 +353,9 @@ test.register_coroutine_test(
     })
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.run_registered_tests()
diff --git a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_consumption_report_sihas.lua b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_consumption_report_sihas.lua
index ece6587f2f..868b78c764 100644
--- a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_consumption_report_sihas.lua
+++ b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_consumption_report_sihas.lua
@@ -100,7 +100,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -145,7 +145,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -209,7 +209,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -236,7 +236,7 @@ test.register_coroutine_test(
       test_init = function()
         -- no op to override auto device add on startup
       end,
-      min_api_version = 17
+      
     }
 )
 test.register_coroutine_test(
@@ -254,7 +254,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -277,7 +277,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_ezex.lua b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_ezex.lua
index afb5adda69..7db772f848 100644
--- a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_ezex.lua
+++ b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_ezex.lua
@@ -93,7 +93,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -132,7 +132,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -166,7 +166,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -193,7 +193,7 @@ test.register_coroutine_test(
       test_init = function()
         -- no op to override auto device add on startup
       end,
-      min_api_version = 17
+      
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_frient.lua b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_frient.lua
index f6cf172d7f..2a4b2db86a 100644
--- a/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_frient.lua
+++ b/drivers/SmartThings/zigbee-power-meter/src/test/test_zigbee_power_meter_frient.lua
@@ -193,7 +193,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-presence-sensor/src/test/test_aqara_presence_sensor_fp1.lua b/drivers/SmartThings/zigbee-presence-sensor/src/test/test_aqara_presence_sensor_fp1.lua
index 557519996e..8310387850 100644
--- a/drivers/SmartThings/zigbee-presence-sensor/src/test/test_aqara_presence_sensor_fp1.lua
+++ b/drivers/SmartThings/zigbee-presence-sensor/src/test/test_aqara_presence_sensor_fp1.lua
@@ -63,7 +63,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -91,7 +91,7 @@ test.register_coroutine_test(
         data_types.Uint8, updates.preferences["stse.sensitivity"]) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -119,7 +119,7 @@ test.register_coroutine_test(
         data_types.Uint8, 0x01) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -147,7 +147,7 @@ test.register_coroutine_test(
         data_types.Uint8, updates.preferences["stse.approachDistance"]) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -165,7 +165,7 @@ test.register_coroutine_test(
       PresenceSensor.presence("present")))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -183,7 +183,7 @@ test.register_coroutine_test(
       PresenceSensor.presence("not present")))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -206,7 +206,7 @@ test.register_coroutine_test(
       MovementSensor.movement("noMovement")))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -229,7 +229,7 @@ test.register_coroutine_test(
       MovementSensor.movement("noMovement")))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -252,7 +252,7 @@ test.register_coroutine_test(
       MovementSensor.movement("noMovement")))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -275,7 +275,7 @@ test.register_coroutine_test(
       MovementSensor.movement("noMovement")))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-presence-sensor/src/test/test_st_arrival_sensor_v1.lua b/drivers/SmartThings/zigbee-presence-sensor/src/test/test_st_arrival_sensor_v1.lua
index 9124534739..c5d12149ce 100644
--- a/drivers/SmartThings/zigbee-presence-sensor/src/test/test_st_arrival_sensor_v1.lua
+++ b/drivers/SmartThings/zigbee-presence-sensor/src/test/test_st_arrival_sensor_v1.lua
@@ -98,7 +98,7 @@ test.register_coroutine_test(
       end
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -118,7 +118,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -129,7 +129,7 @@ test.register_coroutine_test(
       add_device_after_switch_over()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -144,7 +144,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_simple_device:generate_test_message("main", capabilities.presenceSensor.presence("present")))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -160,7 +160,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_simple_device:generate_test_message("main", capabilities.presenceSensor.presence("present")))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -176,7 +176,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_simple_device:generate_test_message("main", capabilities.presenceSensor.presence("present")))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -192,7 +192,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_simple_device:generate_test_message("main", capabilities.presenceSensor.presence("present")))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -207,7 +207,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send( mock_simple_device:generate_test_message("main", capabilities.presenceSensor.presence("not present")) )
     end,
     {
-      test_init = function()      end,      min_api_version = 17
+      test_init = function()      end,      
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-presence-sensor/src/test/test_zigbee_presence_sensor.lua b/drivers/SmartThings/zigbee-presence-sensor/src/test/test_zigbee_presence_sensor.lua
index 53843e0014..ea082913f2 100644
--- a/drivers/SmartThings/zigbee-presence-sensor/src/test/test_zigbee_presence_sensor.lua
+++ b/drivers/SmartThings/zigbee-presence-sensor/src/test/test_zigbee_presence_sensor.lua
@@ -79,7 +79,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -98,7 +98,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -152,7 +152,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -188,7 +188,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -199,7 +199,7 @@ test.register_coroutine_test(
       add_device_after_switch_over()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -214,7 +214,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send( mock_simple_device:generate_test_message("main", capabilities.presenceSensor.presence("not present")) )
     end,
     {
-      test_init = function()      end,      min_api_version = 17
+      test_init = function()      end,      
     }
 )
 
@@ -245,7 +245,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send( mock_simple_device:generate_test_message("main", capabilities.presenceSensor.presence("not present")) )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -280,7 +280,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -313,7 +313,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -334,7 +334,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -349,7 +349,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -397,7 +397,7 @@ test.register_coroutine_test(
       mock_device_str_interval:generate_test_message("main", capabilities.presenceSensor.presence("not present"))
     )
   end,
-  { test_init = function() end, min_api_version = 17
+  { test_init = function() end, 
   }
 )
 
@@ -413,7 +413,7 @@ test.register_coroutine_test(
       mock_device_nil_interval:generate_test_message("main", capabilities.presenceSensor.presence("not present"))
     )
   end,
-  { test_init = function() end, min_api_version = 17
+  { test_init = function() end, 
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-range-extender/src/test/test_frient_zigbee_range_extender.lua b/drivers/SmartThings/zigbee-range-extender/src/test/test_frient_zigbee_range_extender.lua
index 30a6270b8a..4cf8bcbfde 100644
--- a/drivers/SmartThings/zigbee-range-extender/src/test/test_frient_zigbee_range_extender.lua
+++ b/drivers/SmartThings/zigbee-range-extender/src/test/test_frient_zigbee_range_extender.lua
@@ -52,7 +52,7 @@ test.register_coroutine_test(
             )
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -96,7 +96,7 @@ test.register_coroutine_test(
 
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -115,7 +115,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -134,7 +134,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -153,7 +153,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -172,7 +172,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -191,7 +191,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -210,7 +210,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -229,7 +229,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-range-extender/src/test/test_zigbee_extend.lua b/drivers/SmartThings/zigbee-range-extender/src/test/test_zigbee_extend.lua
index 59156dd798..e06dab2558 100644
--- a/drivers/SmartThings/zigbee-range-extender/src/test/test_zigbee_extend.lua
+++ b/drivers/SmartThings/zigbee-range-extender/src/test/test_zigbee_extend.lua
@@ -30,7 +30,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-sensor/src/test/test_zigbee_sensor.lua b/drivers/SmartThings/zigbee-sensor/src/test/test_zigbee_sensor.lua
index 32d4762d4b..d10fbe4e98 100644
--- a/drivers/SmartThings/zigbee-sensor/src/test/test_zigbee_sensor.lua
+++ b/drivers/SmartThings/zigbee-sensor/src/test/test_zigbee_sensor.lua
@@ -121,7 +121,7 @@ test.register_coroutine_test(
       mock_device_generic_sensor:expect_metadata_update({profile = ZIGBEE_GENERIC_CONTACT_SENSOR_PROFILE})
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -133,7 +133,7 @@ test.register_coroutine_test(
       mock_device_generic_sensor:expect_metadata_update({profile = ZIGBEE_GENERIC_MOTION_SENSOR_PROFILE})
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -144,7 +144,7 @@ test.register_coroutine_test(
       mock_device_motion_illuminance:expect_metadata_update({profile = ZIGBEE_GENERIC_MOTION_ILLUMINANCE_PROFILE})
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -155,7 +155,7 @@ test.register_coroutine_test(
       mock_device_generic_sensor:expect_metadata_update({profile = ZIGBEE_GENERIC_WATERLEAK_SENSOR_PROFILE})
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -174,7 +174,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -193,7 +193,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -212,7 +212,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -231,7 +231,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -250,7 +250,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -269,7 +269,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -290,7 +290,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -311,7 +311,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -330,7 +330,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -349,7 +349,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -368,7 +368,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -387,7 +387,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -406,7 +406,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -425,7 +425,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -447,7 +447,7 @@ test.register_message_test(
      }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -466,7 +466,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -485,7 +485,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -504,7 +504,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -523,7 +523,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -542,7 +542,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -561,7 +561,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -674,7 +674,7 @@ test.register_coroutine_test(
 
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -694,7 +694,7 @@ test.register_coroutine_test(
       test.socket.zigbee:__expect_send({ mock_device_motion_sensor.id, ZoneStatusAttribute:read(mock_device_motion_sensor) })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -714,7 +714,7 @@ test.register_coroutine_test(
       test.socket.zigbee:__expect_send({ mock_device_motion_illuminance.id, ZoneStatusAttribute:read(mock_device_motion_illuminance) })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -734,7 +734,7 @@ test.register_coroutine_test(
       test.socket.zigbee:__expect_send({ mock_device_waterleak_sensor.id, ZoneStatusAttribute:read(mock_device_waterleak_sensor) })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -808,7 +808,7 @@ test.register_coroutine_test(
       mock_device_contact_sensor:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -874,7 +874,7 @@ test.register_coroutine_test(
       mock_device_motion_sensor:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -940,7 +940,7 @@ test.register_coroutine_test(
       mock_device_motion_illuminance:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1007,7 +1007,7 @@ test.register_coroutine_test(
       mock_device_waterleak_sensor:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-siren/src/test/test_frient_siren.lua b/drivers/SmartThings/zigbee-siren/src/test/test_frient_siren.lua
index 4d0486c6fd..e114e06f85 100644
--- a/drivers/SmartThings/zigbee-siren/src/test/test_frient_siren.lua
+++ b/drivers/SmartThings/zigbee-siren/src/test/test_frient_siren.lua
@@ -259,7 +259,7 @@ test.register_coroutine_test(
 
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -379,7 +379,7 @@ test.register_coroutine_test(
             )
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -410,7 +410,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -440,7 +440,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -456,7 +456,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -516,7 +516,7 @@ test.register_coroutine_test(
             get_siren_OFF_commands()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -602,7 +602,7 @@ test.register_coroutine_test(
             get_siren_OFF_commands()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -681,7 +681,7 @@ test.register_coroutine_test(
             get_siren_OFF_commands(expectedWarningDuration)
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -708,7 +708,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -734,7 +734,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -779,7 +779,7 @@ test.register_coroutine_test(
             get_squawk_command_new_fw(SquawkMode.SOUND_FOR_SYSTEM_IS_DISARMED, IaswdLevel.MEDIUM_LEVEL)
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -824,7 +824,7 @@ test.register_coroutine_test(
             get_squawk_command_older_fw(SquawkMode.SOUND_FOR_SYSTEM_IS_DISARMED, IaswdLevel.MEDIUM_LEVEL)
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -881,7 +881,7 @@ test.register_coroutine_test(
             get_squawk_command_new_fw(SquawkMode.SOUND_FOR_SYSTEM_IS_DISARMED, IaswdLevel.MEDIUM_LEVEL)
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -915,7 +915,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -962,7 +962,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -981,7 +981,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -1000,7 +1000,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -1019,7 +1019,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -1038,7 +1038,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -1057,7 +1057,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -1103,7 +1103,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -1121,7 +1121,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -1182,7 +1182,7 @@ test.register_coroutine_test(
             mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
diff --git a/drivers/SmartThings/zigbee-siren/src/test/test_frient_siren_tamper.lua b/drivers/SmartThings/zigbee-siren/src/test/test_frient_siren_tamper.lua
index 70854ca7e7..291c850e26 100644
--- a/drivers/SmartThings/zigbee-siren/src/test/test_frient_siren_tamper.lua
+++ b/drivers/SmartThings/zigbee-siren/src/test/test_frient_siren_tamper.lua
@@ -277,7 +277,7 @@ test.register_coroutine_test(
 
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -404,7 +404,7 @@ test.register_coroutine_test(
             )
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -435,7 +435,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -465,7 +465,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -481,7 +481,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -542,7 +542,7 @@ test.register_coroutine_test(
             get_siren_OFF_commands()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -628,7 +628,7 @@ test.register_coroutine_test(
             get_siren_OFF_commands()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -707,7 +707,7 @@ test.register_coroutine_test(
             get_siren_OFF_commands(expectedWarningDuration)
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -733,7 +733,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -759,7 +759,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -804,7 +804,7 @@ test.register_coroutine_test(
             get_squawk_command_new_fw(SquawkMode.SOUND_FOR_SYSTEM_IS_DISARMED, IaswdLevel.MEDIUM_LEVEL)
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -849,7 +849,7 @@ test.register_coroutine_test(
             get_squawk_command_older_fw(SquawkMode.SOUND_FOR_SYSTEM_IS_DISARMED, IaswdLevel.MEDIUM_LEVEL)
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -906,7 +906,7 @@ test.register_coroutine_test(
             get_squawk_command_new_fw(SquawkMode.SOUND_FOR_SYSTEM_IS_DISARMED, IaswdLevel.MEDIUM_LEVEL)
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -940,7 +940,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -989,7 +989,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -1014,7 +1014,7 @@ test.register_message_test(
         },
         {
             inner_block_ordering = "relaxed",
-            min_api_version = 17
+            
         }
 )
 
@@ -1039,7 +1039,7 @@ test.register_message_test(
         },
         {
             inner_block_ordering = "relaxed",
-            min_api_version = 17
+            
         }
 )
 
@@ -1058,7 +1058,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -1077,7 +1077,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -1096,7 +1096,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -1134,7 +1134,7 @@ test.register_coroutine_test(
         { test_init = function()
             test.mock_device.add_test_device(mock_device_112)
         end,
-        min_api_version = 17
+        
         }
 )
 
diff --git a/drivers/SmartThings/zigbee-siren/src/test/test_ozom_siren.lua b/drivers/SmartThings/zigbee-siren/src/test/test_ozom_siren.lua
index f7b13d4895..c4925a360e 100644
--- a/drivers/SmartThings/zigbee-siren/src/test/test_ozom_siren.lua
+++ b/drivers/SmartThings/zigbee-siren/src/test/test_ozom_siren.lua
@@ -62,7 +62,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -99,7 +99,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -125,7 +125,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-smoke-detector/src/test/test_aqara_gas_detector.lua b/drivers/SmartThings/zigbee-smoke-detector/src/test/test_aqara_gas_detector.lua
index c15b0e4d62..e134ebcf0c 100644
--- a/drivers/SmartThings/zigbee-smoke-detector/src/test/test_aqara_gas_detector.lua
+++ b/drivers/SmartThings/zigbee-smoke-detector/src/test/test_aqara_gas_detector.lua
@@ -65,7 +65,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", lifeTimeReport.lifeTimeState.normal()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -86,7 +86,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -105,7 +105,7 @@ test.register_coroutine_test(
       capabilities.gasDetector.gas.detected()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -123,7 +123,7 @@ test.register_coroutine_test(
       capabilities.gasDetector.gas.clear()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -141,7 +141,7 @@ test.register_coroutine_test(
       capabilities.audioMute.mute.muted()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -159,7 +159,7 @@ test.register_coroutine_test(
       capabilities.audioMute.mute.unmuted()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -173,7 +173,7 @@ test.register_coroutine_test(
       PRIVATE_MUTE_ATTRIBUTE_ID, MFG_CODE, data_types.Uint8, 1) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -186,7 +186,7 @@ test.register_coroutine_test(
       capabilities.audioMute.mute.muted()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -206,7 +206,7 @@ test.register_coroutine_test(
       selfCheck.selfCheckState.selfCheckCompleted()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -223,7 +223,7 @@ test.register_coroutine_test(
       PRIVATE_SELF_CHECK_ATTRIBUTE_ID, MFG_CODE, data_types.Boolean, true) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -243,7 +243,7 @@ test.register_coroutine_test(
       lifeTimeReport.lifeTimeState.endOfLife()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -261,7 +261,7 @@ test.register_coroutine_test(
       lifeTimeReport.lifeTimeState.normal()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -279,7 +279,7 @@ test.register_coroutine_test(
       sensitivityAdjustment.sensitivityAdjustment.Low()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -297,7 +297,7 @@ test.register_coroutine_test(
       selfCheck.selfCheckState.idle()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -315,7 +315,7 @@ test.register_coroutine_test(
       sensitivityAdjustment.sensitivityAdjustment.High()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -349,7 +349,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -384,7 +384,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-smoke-detector/src/test/test_aqara_smoke_detector.lua b/drivers/SmartThings/zigbee-smoke-detector/src/test/test_aqara_smoke_detector.lua
index eaee68d41e..34a7179535 100644
--- a/drivers/SmartThings/zigbee-smoke-detector/src/test/test_aqara_smoke_detector.lua
+++ b/drivers/SmartThings/zigbee-smoke-detector/src/test/test_aqara_smoke_detector.lua
@@ -51,7 +51,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.battery.battery(100)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -82,7 +82,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -100,7 +100,7 @@ test.register_coroutine_test(
     capabilities.smokeDetector.smoke.detected()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -118,7 +118,7 @@ test.register_coroutine_test(
       capabilities.audioMute.mute.muted()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -132,7 +132,7 @@ test.register_coroutine_test(
       PRIVATE_MUTE_ATTRIBUTE_ID, MFG_CODE, data_types.Uint8, 1) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -150,7 +150,7 @@ test.register_coroutine_test(
     selfCheck.selfCheckState.selfCheckCompleted()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -165,7 +165,7 @@ test.register_coroutine_test(
       PRIVATE_SELF_CHECK_ATTRIBUTE_ID, MFG_CODE, data_types.Boolean, true) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -183,7 +183,7 @@ test.register_coroutine_test(
       capabilities.smokeDetector.smoke.clear()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -201,7 +201,7 @@ test.register_coroutine_test(
       capabilities.audioMute.mute.unmuted()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -219,7 +219,7 @@ test.register_coroutine_test(
       selfCheck.selfCheckState.idle()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -238,7 +238,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-smoke-detector/src/test/test_frient_heat_detector.lua b/drivers/SmartThings/zigbee-smoke-detector/src/test/test_frient_heat_detector.lua
index 7f1a7e5f3a..4d08f2dd57 100644
--- a/drivers/SmartThings/zigbee-smoke-detector/src/test/test_frient_heat_detector.lua
+++ b/drivers/SmartThings/zigbee-smoke-detector/src/test/test_frient_heat_detector.lua
@@ -76,7 +76,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -198,7 +198,7 @@ test.register_coroutine_test(
             mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -217,7 +217,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -236,7 +236,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -255,7 +255,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -276,7 +276,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -303,7 +303,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           min_api_version = 15
         }
 )
 
@@ -345,7 +345,7 @@ test.register_message_test(
         },
         {
             inner_block_ordering = "relaxed",
-            min_api_version = 17
+            
         }
 )
 
@@ -382,7 +382,7 @@ test.register_coroutine_test(
 
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -418,7 +418,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -455,7 +455,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -491,7 +491,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -528,7 +528,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -605,7 +605,7 @@ test.register_coroutine_test(
             end
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -624,7 +624,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -643,7 +643,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
diff --git a/drivers/SmartThings/zigbee-smoke-detector/src/test/test_frient_smoke_detector.lua b/drivers/SmartThings/zigbee-smoke-detector/src/test/test_frient_smoke_detector.lua
index 7596148a66..2fd64b6a5c 100644
--- a/drivers/SmartThings/zigbee-smoke-detector/src/test/test_frient_smoke_detector.lua
+++ b/drivers/SmartThings/zigbee-smoke-detector/src/test/test_frient_smoke_detector.lua
@@ -83,7 +83,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -205,7 +205,7 @@ test.register_coroutine_test(
             mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -224,7 +224,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -244,7 +244,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -264,7 +264,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -285,7 +285,7 @@ test.register_coroutine_test(
             test.wait_for_events()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -312,7 +312,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           min_api_version = 15
         }
 )
 
@@ -391,7 +391,7 @@ test.register_message_test(
         },
         {
             inner_block_ordering = "relaxed",
-            min_api_version = 17
+            
         }
 )
 
@@ -428,7 +428,7 @@ test.register_coroutine_test(
 
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -464,7 +464,7 @@ test.register_coroutine_test(
         test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -501,7 +501,7 @@ test.register_coroutine_test(
         test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -537,7 +537,7 @@ test.register_coroutine_test(
         test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -574,7 +574,7 @@ test.register_coroutine_test(
         test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -651,7 +651,7 @@ test.register_coroutine_test(
         end
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -693,7 +693,7 @@ test.register_message_test(
         }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -712,7 +712,7 @@ test.register_coroutine_test(
         test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -731,7 +731,7 @@ test.register_coroutine_test(
         test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -747,7 +747,7 @@ test.register_coroutine_test(
         test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-smoke-detector/src/test/test_zigbee_smoke_detector.lua b/drivers/SmartThings/zigbee-smoke-detector/src/test/test_zigbee_smoke_detector.lua
index f0f9b8259e..da4b69ee03 100644
--- a/drivers/SmartThings/zigbee-smoke-detector/src/test/test_zigbee_smoke_detector.lua
+++ b/drivers/SmartThings/zigbee-smoke-detector/src/test/test_zigbee_smoke_detector.lua
@@ -45,7 +45,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -72,7 +72,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -99,7 +99,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -126,7 +126,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -145,7 +145,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -245,7 +245,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -284,7 +284,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-sound-sensor/src/test/test_zigbee_sound_sensor.lua b/drivers/SmartThings/zigbee-sound-sensor/src/test/test_zigbee_sound_sensor.lua
index 11a251b1d7..6ca9d39d53 100644
--- a/drivers/SmartThings/zigbee-sound-sensor/src/test/test_zigbee_sound_sensor.lua
+++ b/drivers/SmartThings/zigbee-sound-sensor/src/test/test_zigbee_sound_sensor.lua
@@ -123,7 +123,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -191,7 +191,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -210,7 +210,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -229,7 +229,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -248,7 +248,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -267,7 +267,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -294,7 +294,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -318,7 +318,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_all_capability_zigbee_bulb.lua b/drivers/SmartThings/zigbee-switch/src/test/test_all_capability_zigbee_bulb.lua
index 8826ca535d..08d116253c 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_all_capability_zigbee_bulb.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_all_capability_zigbee_bulb.lua
@@ -103,7 +103,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -131,7 +131,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -159,7 +159,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -188,7 +188,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -216,7 +216,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -236,7 +236,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -593,7 +593,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17,
+       min_api_version = 15,
        max_api_version = 19
     }
 )
@@ -790,7 +790,7 @@ test.register_coroutine_test(
       test_init = function()
         -- no op to override auto device add on startup
       end,
-      min_api_version = 17
+      
     }
 )
 
@@ -818,7 +818,7 @@ test.register_coroutine_test(
       test_init = function()
         -- no op to override auto device add on startup
       end,
-      min_api_version = 17
+      
     }
 )
 
@@ -845,7 +845,7 @@ test.register_coroutine_test(
       test_init = function()
         -- no op to override auto device add on startup
       end,
-      min_api_version = 17
+      
     }
 )
 
@@ -872,7 +872,7 @@ test.register_coroutine_test(
       test_init = function()
         -- no op to override auto device add on startup
       end,
-      min_api_version = 17
+      
     }
 )
 
@@ -909,7 +909,7 @@ test.register_coroutine_test(
       test.socket.zigbee:__expect_send({mock_device.id, ColorControl.attributes.CurrentSaturation:read(mock_device)})
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -928,7 +928,7 @@ test.register_coroutine_test(
     mock_device:expect_native_attr_handler_registration("colorTemperature", "colorTemperature")
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -962,7 +962,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.energyMeter.energy({ value = 14.0, unit = "kWh" })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_aqara_led_bulb.lua b/drivers/SmartThings/zigbee-switch/src/test/test_aqara_led_bulb.lua
index cc3e86d218..8b379bb7cd 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_aqara_led_bulb.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_aqara_led_bulb.lua
@@ -54,7 +54,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.colorTemperature.colorTemperatureRange({ minimum = 2700, maximum = 6000 })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -109,7 +109,6 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17,
      max_api_version = 19
   }
 )
@@ -204,7 +203,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -219,7 +218,7 @@ test.register_coroutine_test(
         RESTORE_POWER_STATE_ATTRIBUTE_ID, MFG_CODE, data_types.Boolean, true) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_aqara_light.lua b/drivers/SmartThings/zigbee-switch/src/test/test_aqara_light.lua
index a80bf1dcfc..bbebb1c46c 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_aqara_light.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_aqara_light.lua
@@ -56,7 +56,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.colorTemperature.colorTemperatureRange({ minimum = 2700, maximum = 6000 })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -183,7 +183,6 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17,
      max_api_version = 19
   }
 )
@@ -211,7 +210,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -226,7 +225,7 @@ test.register_coroutine_test(
         RESTORE_POWER_STATE_ATTRIBUTE_ID, MFG_CODE, data_types.Boolean, true) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -241,7 +240,7 @@ test.register_coroutine_test(
         TURN_OFF_INDICATOR_ATTRIBUTE_ID, MFG_CODE, data_types.Boolean, true) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -254,7 +253,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.OnTransitionTime:write(mock_device, 10) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -267,7 +266,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.OffTransitionTime:write(mock_device, 10) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -302,7 +301,7 @@ test.register_coroutine_test(
     test_init = function()
       test.mock_device.add_test_device(mock_device_cwacn1)
     end,
-    min_api_version = 17
+    
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_aqara_smart_plug.lua b/drivers/SmartThings/zigbee-switch/src/test/test_aqara_smart_plug.lua
index 6e8ddba455..966cf19288 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_aqara_smart_plug.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_aqara_smart_plug.lua
@@ -78,7 +78,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -120,7 +120,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -139,7 +139,7 @@ test.register_coroutine_test(
       AnalogInput.attributes.PresentValue:read(mock_device):to_endpoint(ENERGY_METER_ENDPOINT) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -156,7 +156,7 @@ test.register_coroutine_test(
       AnalogInput.attributes.PresentValue:read(mock_device):to_endpoint(POWER_METER_ENDPOINT) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -173,7 +173,7 @@ test.register_coroutine_test(
       AnalogInput.attributes.PresentValue:read(mock_device):to_endpoint(POWER_METER_ENDPOINT) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -187,7 +187,7 @@ test.register_coroutine_test(
       OnOff.server.commands.On(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -201,7 +201,7 @@ test.register_coroutine_test(
       OnOff.server.commands.Off(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -223,7 +223,7 @@ test.register_coroutine_test(
       AnalogInput.attributes.PresentValue:read(mock_device):to_endpoint(ENERGY_METER_ENDPOINT) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -258,7 +258,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -273,7 +273,7 @@ test.register_coroutine_test(
         RESTORE_POWER_STATE_ATTRIBUTE_ID, MFG_CODE, data_types.Boolean, true) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -288,7 +288,7 @@ test.register_coroutine_test(
         MFG_CODE, data_types.SinglePrecisionFloat, SinglePrecisionFloat(0, 6, 0.5625)) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -317,7 +317,7 @@ test.register_coroutine_test(
       SimpleMetering.attributes.CurrentSummationDelivered:read(mock_standard) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -343,7 +343,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -368,7 +368,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_aqara_smart_plug_t1.lua b/drivers/SmartThings/zigbee-switch/src/test/test_aqara_smart_plug_t1.lua
index 9476f41345..3743057729 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_aqara_smart_plug_t1.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_aqara_smart_plug_t1.lua
@@ -79,7 +79,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -121,7 +121,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -140,7 +140,7 @@ test.register_coroutine_test(
       AnalogInput.attributes.PresentValue:read(mock_device):to_endpoint(ENERGY_METER_ENDPOINT) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -157,7 +157,7 @@ test.register_coroutine_test(
       AnalogInput.attributes.PresentValue:read(mock_device):to_endpoint(POWER_METER_ENDPOINT) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -174,7 +174,7 @@ test.register_coroutine_test(
       AnalogInput.attributes.PresentValue:read(mock_device):to_endpoint(POWER_METER_ENDPOINT) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -188,7 +188,7 @@ test.register_coroutine_test(
       OnOff.server.commands.On(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -202,7 +202,7 @@ test.register_coroutine_test(
       OnOff.server.commands.Off(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -224,7 +224,7 @@ test.register_coroutine_test(
       AnalogInput.attributes.PresentValue:read(mock_device):to_endpoint(ENERGY_METER_ENDPOINT) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -259,7 +259,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -274,7 +274,7 @@ test.register_coroutine_test(
         RESTORE_POWER_STATE_ATTRIBUTE_ID, MFG_CODE, data_types.Boolean, true) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -289,7 +289,7 @@ test.register_coroutine_test(
         MFG_CODE, data_types.SinglePrecisionFloat, SinglePrecisionFloat(0, 6, 0.5625)) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -304,7 +304,7 @@ test.register_coroutine_test(
       RESTORE_TURN_OFF_INDICATOR_LIGHT_ATTRIBUTE_ID, MFG_CODE, data_types.Boolean, true) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -333,7 +333,7 @@ test.register_coroutine_test(
       SimpleMetering.attributes.CurrentSummationDelivered:read(mock_standard) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -359,7 +359,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -384,7 +384,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_aqara_switch_module.lua b/drivers/SmartThings/zigbee-switch/src/test/test_aqara_switch_module.lua
index 4779073041..9a01e3ff47 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_aqara_switch_module.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_aqara_switch_module.lua
@@ -56,7 +56,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -73,7 +73,7 @@ test.register_coroutine_test(
       AnalogInput.attributes.PresentValue:read(mock_device):to_endpoint(POWER_METER_ENDPOINT) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -90,7 +90,7 @@ test.register_coroutine_test(
       AnalogInput.attributes.PresentValue:read(mock_device):to_endpoint(POWER_METER_ENDPOINT) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -104,7 +104,7 @@ test.register_coroutine_test(
       OnOff.server.commands.On(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -118,7 +118,7 @@ test.register_coroutine_test(
       OnOff.server.commands.Off(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -140,7 +140,7 @@ test.register_coroutine_test(
       AnalogInput.attributes.PresentValue:read(mock_device):to_endpoint(ENERGY_METER_ENDPOINT) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -167,7 +167,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -182,7 +182,7 @@ test.register_coroutine_test(
         RESTORE_POWER_STATE_ATTRIBUTE_ID, MFG_CODE, data_types.Boolean, true) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -197,7 +197,7 @@ test.register_coroutine_test(
         ELECTRIC_SWITCH_TYPE_ATTRIBUTE_ID, MFG_CODE, data_types.Uint8, 1) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_aqara_switch_module_no_power.lua b/drivers/SmartThings/zigbee-switch/src/test/test_aqara_switch_module_no_power.lua
index 8d3135b463..c815c13d28 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_aqara_switch_module_no_power.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_aqara_switch_module_no_power.lua
@@ -48,7 +48,7 @@ test.register_coroutine_test(
     test.socket.device_lifecycle:__queue_receive({ mock_device.id, "added" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -62,7 +62,7 @@ test.register_coroutine_test(
       OnOff.attributes.OnOff:read(mock_device) })
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -75,7 +75,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.switch.switch.on()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -88,7 +88,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.switch.switch.off()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -102,7 +102,7 @@ test.register_coroutine_test(
       OnOff.server.commands.On(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -116,7 +116,7 @@ test.register_coroutine_test(
       OnOff.server.commands.Off(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -131,7 +131,7 @@ test.register_coroutine_test(
         RESTORE_POWER_STATE_ATTRIBUTE_ID, MFG_CODE, data_types.Boolean, true) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -146,7 +146,7 @@ test.register_coroutine_test(
         ELECTRIC_SWITCH_TYPE_ATTRIBUTE_ID, MFG_CODE, data_types.Uint8, 1) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_aqara_switch_no_power.lua b/drivers/SmartThings/zigbee-switch/src/test/test_aqara_switch_no_power.lua
index 4e7ffaa38a..453f360596 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_aqara_switch_no_power.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_aqara_switch_no_power.lua
@@ -99,7 +99,7 @@ test.register_coroutine_test(
     { visibility = { displayed = false } })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -123,7 +123,7 @@ test.register_coroutine_test(
     { visibility = { displayed = false } })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -150,7 +150,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_base_device:generate_test_message("main", capabilities.button.button.pushed({ state_change = false })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -164,7 +164,7 @@ test.register_coroutine_test(
       OnOff.attributes.OnOff:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -177,7 +177,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.switch.switch.on()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -190,7 +190,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_child:generate_test_message("main", capabilities.switch.switch.on()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -203,7 +203,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.switch.switch.off()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -216,7 +216,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_child:generate_test_message("main", capabilities.switch.switch.off()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -230,7 +230,7 @@ test.register_coroutine_test(
       OnOff.server.commands.On(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -244,7 +244,7 @@ test.register_coroutine_test(
       OnOff.server.commands.On(mock_device):to_endpoint(0x02) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -258,7 +258,7 @@ test.register_coroutine_test(
       OnOff.server.commands.Off(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -272,7 +272,7 @@ test.register_coroutine_test(
       OnOff.server.commands.Off(mock_device):to_endpoint(0x02) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -289,7 +289,7 @@ test.register_coroutine_test(
       capabilities.button.button.pushed({ state_change = true })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -306,7 +306,7 @@ test.register_coroutine_test(
       capabilities.button.button.pushed({ state_change = true })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -323,7 +323,7 @@ test.register_coroutine_test(
         RESTORE_POWER_STATE_ATTRIBUTE_ID, MFG_CODE, data_types.Boolean, true) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -338,7 +338,7 @@ test.register_coroutine_test(
         CHANGE_TO_WIRELESS_SWITCH_ATTRIBUTE_ID, MFG_CODE, data_types.Uint8, 0) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_aqara_switch_power.lua b/drivers/SmartThings/zigbee-switch/src/test/test_aqara_switch_power.lua
index b6eb4a320e..7378bfd2f9 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_aqara_switch_power.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_aqara_switch_power.lua
@@ -86,7 +86,7 @@ test.register_coroutine_test(
 
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -102,7 +102,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_child:generate_test_message("main", capabilities.button.button.pushed({ state_change = false })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -121,7 +121,7 @@ test.register_coroutine_test(
       AnalogInput.attributes.PresentValue:read(mock_device):to_endpoint(ENERGY_METER_ENDPOINT) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -138,7 +138,7 @@ test.register_coroutine_test(
       AnalogInput.attributes.PresentValue:read(mock_device):to_endpoint(POWER_METER_ENDPOINT) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -155,7 +155,7 @@ test.register_coroutine_test(
       AnalogInput.attributes.PresentValue:read(mock_device):to_endpoint(POWER_METER_ENDPOINT) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -172,7 +172,7 @@ test.register_coroutine_test(
       AnalogInput.attributes.PresentValue:read(mock_device):to_endpoint(POWER_METER_ENDPOINT) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -189,7 +189,7 @@ test.register_coroutine_test(
       AnalogInput.attributes.PresentValue:read(mock_device):to_endpoint(POWER_METER_ENDPOINT) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -203,7 +203,7 @@ test.register_coroutine_test(
       OnOff.server.commands.On(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -217,7 +217,7 @@ test.register_coroutine_test(
       OnOff.server.commands.On(mock_device):to_endpoint(0x02) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -231,7 +231,7 @@ test.register_coroutine_test(
       OnOff.server.commands.Off(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -245,7 +245,7 @@ test.register_coroutine_test(
       OnOff.server.commands.Off(mock_device):to_endpoint(0x02) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -262,7 +262,7 @@ test.register_coroutine_test(
       capabilities.button.button.pushed({ state_change = true })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -279,7 +279,7 @@ test.register_coroutine_test(
       capabilities.button.button.pushed({ state_change = true })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -301,7 +301,7 @@ test.register_coroutine_test(
       AnalogInput.attributes.PresentValue:read(mock_device):to_endpoint(ENERGY_METER_ENDPOINT) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -328,7 +328,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -343,7 +343,7 @@ test.register_coroutine_test(
         RESTORE_POWER_STATE_ATTRIBUTE_ID, MFG_CODE, data_types.Boolean, true) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -358,7 +358,7 @@ test.register_coroutine_test(
         CHANGE_TO_WIRELESS_SWITCH_ATTRIBUTE_ID, MFG_CODE, data_types.Uint8, 0) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_aqara_wall_switch.lua b/drivers/SmartThings/zigbee-switch/src/test/test_aqara_wall_switch.lua
index a0a7e9b924..e6a0d4db79 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_aqara_wall_switch.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_aqara_wall_switch.lua
@@ -60,7 +60,7 @@ test.register_coroutine_test(
     mock_device:expect_native_attr_handler_registration("switch", "switch")
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -73,7 +73,7 @@ test.register_coroutine_test(
     mock_device:expect_native_attr_handler_registration("switch", "switch")
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -86,7 +86,7 @@ test.register_coroutine_test(
     mock_device:expect_native_attr_handler_registration("switch", "switch")
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -99,7 +99,7 @@ test.register_coroutine_test(
     mock_device:expect_native_attr_handler_registration("switch", "switch")
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -113,7 +113,7 @@ test.register_coroutine_test(
       OnOff.server.commands.On(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -127,7 +127,7 @@ test.register_coroutine_test(
       OnOff.server.commands.On(mock_device):to_endpoint(0x02) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -141,7 +141,7 @@ test.register_coroutine_test(
       OnOff.server.commands.Off(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -155,7 +155,7 @@ test.register_coroutine_test(
       OnOff.server.commands.Off(mock_device):to_endpoint(0x02) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -172,7 +172,7 @@ test.register_coroutine_test(
       capabilities.button.button.pushed({ state_change = true })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -189,7 +189,7 @@ test.register_coroutine_test(
       capabilities.button.button.pushed({ state_change = true })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -204,7 +204,7 @@ test.register_coroutine_test(
         CHANGE_TO_WIRELESS_SWITCH_ATTRIBUTE_ID, MFG_CODE, data_types.Uint8, 0) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_aurora_relay.lua b/drivers/SmartThings/zigbee-switch/src/test/test_aurora_relay.lua
index 3adf489318..d84cd26634 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_aurora_relay.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_aurora_relay.lua
@@ -42,7 +42,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, SimpleMetering.attributes.InstantaneousDemand:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -69,7 +69,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -96,7 +96,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -123,7 +123,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_bad_data_type.lua b/drivers/SmartThings/zigbee-switch/src/test/test_bad_data_type.lua
index 36ac4d5fa0..aaadb77373 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_bad_data_type.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_bad_data_type.lua
@@ -43,7 +43,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_bad_device_kind.lua b/drivers/SmartThings/zigbee-switch/src/test/test_bad_device_kind.lua
index 189f64715a..991bf984aa 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_bad_device_kind.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_bad_device_kind.lua
@@ -33,7 +33,7 @@ test.register_coroutine_test("zwave_device_handled", function()
     test.wait_for_events()
   end,
   {
-    min_api_version = 17
+    
   }
 )
 
@@ -45,7 +45,7 @@ test.register_message_test(
         message = { mock_device.id, { capability = "switch", component = "main", command = "on", args = { } } }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_cree_bulb.lua b/drivers/SmartThings/zigbee-switch/src/test/test_cree_bulb.lua
index 66af249b0c..75dcfc3997 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_cree_bulb.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_cree_bulb.lua
@@ -66,7 +66,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -77,7 +77,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",capabilities.switchLevel.level(100)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -90,7 +90,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -104,7 +104,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_duragreen_color_temp_bulb.lua b/drivers/SmartThings/zigbee-switch/src/test/test_duragreen_color_temp_bulb.lua
index d1bebb68d5..e1d2fd3ab2 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_duragreen_color_temp_bulb.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_duragreen_color_temp_bulb.lua
@@ -143,7 +143,6 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-    min_api_version = 17,
     max_api_version = 19
   }
 )
@@ -238,7 +237,6 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17,
     max_api_version = 19
   }
 )
@@ -269,7 +267,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({mock_device.id, ColorControl.attributes.ColorTemperatureMireds:read(mock_device)})
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -291,7 +289,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_enbrighten_metering_dimmer.lua b/drivers/SmartThings/zigbee-switch/src/test/test_enbrighten_metering_dimmer.lua
index f28bb56e37..36b6376140 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_enbrighten_metering_dimmer.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_enbrighten_metering_dimmer.lua
@@ -130,7 +130,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -157,7 +157,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -184,7 +184,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -214,7 +214,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -244,7 +244,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -263,7 +263,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -282,7 +282,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_frient_IO_module.lua b/drivers/SmartThings/zigbee-switch/src/test/test_frient_IO_module.lua
index b410872075..23dbbb19d7 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_frient_IO_module.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_frient_IO_module.lua
@@ -522,7 +522,7 @@ test.register_coroutine_test(
 		assert(parent_native, "expected parent device to register native switch handler for input 3")
 	end,
 	{
-	   min_api_version = 17
+	   
 	}
 )
 
@@ -556,7 +556,7 @@ test.register_coroutine_test(
 		test.wait_for_events()
 	end,
 	{
-	   min_api_version = 17
+	   
 	}
 )
 
@@ -616,7 +616,7 @@ test.register_coroutine_test(
 		test.wait_for_events()
 	end,
 	{
-	   min_api_version = 17
+	   
 	}
 )
 
@@ -640,7 +640,7 @@ test.register_coroutine_test(
 		test.wait_for_events()
 	end,
 	{
-	   min_api_version = 17
+	   
 	}
 )
 
@@ -691,7 +691,7 @@ test.register_coroutine_test(
 		test.wait_for_events()
 	end,
 	{
-	   min_api_version = 17
+	   
 	}
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_frient_switch.lua b/drivers/SmartThings/zigbee-switch/src/test/test_frient_switch.lua
index 2a86e1ed19..8edcb20c7c 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_frient_switch.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_frient_switch.lua
@@ -81,7 +81,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -118,7 +118,7 @@ test.register_message_test("Current divisor, multiplier, summation should be han
             },
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -153,7 +153,7 @@ test.register_coroutine_test("Refresh command should read all necessary attribut
     )
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -180,7 +180,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -207,7 +207,7 @@ test.register_message_test(
       },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -239,7 +239,7 @@ test.register_message_test(
         }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -264,7 +264,7 @@ test.register_message_test(
         }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -277,7 +277,7 @@ test.register_coroutine_test(
             test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.powerSource.powerSource.mains()))
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -341,7 +341,7 @@ test.register_coroutine_test("doConfigure should send bind request, read attribu
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -357,7 +357,7 @@ test.register_coroutine_test(
             test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.powerSource.powerSource.unknown()))
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_ge_link_bulb.lua b/drivers/SmartThings/zigbee-switch/src/test/test_ge_link_bulb.lua
index d35bbf4f35..cb9ea54280 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_ge_link_bulb.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_ge_link_bulb.lua
@@ -47,7 +47,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -64,7 +64,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.OnOffTransitionTime:write(mock_device, 50) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -79,7 +79,7 @@ test.register_coroutine_test(
     test.socket.device_lifecycle:__queue_receive(mock_device:generate_info_changed(updates))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -112,7 +112,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -149,7 +149,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -169,7 +169,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.OnOffTransitionTime:write(mock_device, 0) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -189,7 +189,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.OnOffTransitionTime:write(mock_device, 50) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_hanssem_switch.lua b/drivers/SmartThings/zigbee-switch/src/test/test_hanssem_switch.lua
index 7982403b8c..ad0ac2d744 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_hanssem_switch.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_hanssem_switch.lua
@@ -128,7 +128,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -161,7 +161,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -194,7 +194,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -227,7 +227,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -260,7 +260,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -293,7 +293,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -326,7 +326,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -359,7 +359,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -392,7 +392,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -425,7 +425,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -458,7 +458,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -491,7 +491,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -523,7 +523,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -550,7 +550,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -577,7 +577,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -604,7 +604,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -631,7 +631,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -658,7 +658,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -685,7 +685,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -712,7 +712,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -739,7 +739,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -766,7 +766,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -793,7 +793,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -820,7 +820,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -870,7 +870,7 @@ test.register_coroutine_test(
       })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm30_sn.lua b/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm30_sn.lua
index b2b7019dd0..a3a0097acb 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm30_sn.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm30_sn.lua
@@ -105,7 +105,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -144,7 +144,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -168,7 +168,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -192,7 +192,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -219,7 +219,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -289,7 +289,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -321,7 +321,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -359,7 +359,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -382,7 +382,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -405,7 +405,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -427,7 +427,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -448,7 +448,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -497,7 +497,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -556,7 +556,7 @@ test.register_coroutine_test(
     mock_inovelli_vzm30_sn:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm30_sn_child.lua b/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm30_sn_child.lua
index 3c839f571f..08074e317a 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm30_sn_child.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm30_sn_child.lua
@@ -91,7 +91,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -146,7 +146,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -180,7 +180,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -239,7 +239,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -302,7 +302,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -365,7 +365,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm30_sn_preferences.lua b/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm30_sn_preferences.lua
index 6c6d633d70..79daa1330c 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm30_sn_preferences.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm30_sn_preferences.lua
@@ -63,7 +63,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -88,7 +88,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -112,7 +112,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -136,7 +136,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -160,7 +160,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -184,7 +184,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -208,7 +208,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -227,7 +227,7 @@ test.register_coroutine_test(
     test.socket.device_lifecycle:__queue_receive(mock_inovelli_vzm30_sn:generate_info_changed({preferences = {notificationChild = true}}))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm31_sn.lua b/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm31_sn.lua
index 6c0da0b158..6ee741f55f 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm31_sn.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm31_sn.lua
@@ -73,7 +73,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -97,7 +97,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -121,7 +121,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -148,7 +148,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -218,7 +218,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -250,7 +250,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -288,7 +288,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -310,7 +310,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -332,7 +332,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -381,7 +381,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -433,7 +433,7 @@ test.register_coroutine_test(
     mock_inovelli_vzm31_sn:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm31_sn_child.lua b/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm31_sn_child.lua
index fd7f718ff9..d94518f7d6 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm31_sn_child.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm31_sn_child.lua
@@ -80,7 +80,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -135,7 +135,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -169,7 +169,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -228,7 +228,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -291,7 +291,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -354,7 +354,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm31_sn_preferences.lua b/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm31_sn_preferences.lua
index 3823d4e010..415f12d83c 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm31_sn_preferences.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm31_sn_preferences.lua
@@ -52,7 +52,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -77,7 +77,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -101,7 +101,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -125,7 +125,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -149,7 +149,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -173,7 +173,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -197,7 +197,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -216,7 +216,7 @@ test.register_coroutine_test(
     test.socket.device_lifecycle:__queue_receive(mock_inovelli_vzm31_sn:generate_info_changed({preferences = {notificationChild = true}}))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm32_sn.lua b/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm32_sn.lua
index ee21044bea..924c6dad2a 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm32_sn.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm32_sn.lua
@@ -84,7 +84,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -118,7 +118,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -142,7 +142,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -166,7 +166,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -193,7 +193,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -263,7 +263,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -295,7 +295,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -333,7 +333,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -356,7 +356,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -379,7 +379,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -402,7 +402,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -425,7 +425,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -445,7 +445,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -494,7 +494,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -549,7 +549,7 @@ test.register_coroutine_test(
     mock_inovelli_vzm32_sn:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm32_sn_child.lua b/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm32_sn_child.lua
index 7173463e16..fefcf49bfe 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm32_sn_child.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm32_sn_child.lua
@@ -80,7 +80,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -135,7 +135,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -169,7 +169,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -228,7 +228,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -291,7 +291,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -354,7 +354,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm32_sn_preferences.lua b/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm32_sn_preferences.lua
index 9939926ff3..fbe4fa4f68 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm32_sn_preferences.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_inovelli_vzm32_sn_preferences.lua
@@ -52,7 +52,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -77,7 +77,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -101,7 +101,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -125,7 +125,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -144,7 +144,7 @@ test.register_coroutine_test(
     test.socket.device_lifecycle:__queue_receive(mock_inovelli_vzm32_sn:generate_info_changed({preferences = {notificationChild = true}}))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -174,7 +174,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_jasco_switch.lua b/drivers/SmartThings/zigbee-switch/src/test/test_jasco_switch.lua
index 6d1b78e806..8dbf456759 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_jasco_switch.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_jasco_switch.lua
@@ -56,7 +56,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -83,7 +83,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -102,7 +102,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -126,7 +126,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -155,7 +155,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_laisiao_bath_heather.lua b/drivers/SmartThings/zigbee-switch/src/test/test_laisiao_bath_heather.lua
index 5c7df6e762..58076ec07c 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_laisiao_bath_heather.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_laisiao_bath_heather.lua
@@ -50,7 +50,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -70,7 +70,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -90,7 +90,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -110,7 +110,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -130,7 +130,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -150,7 +150,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -170,7 +170,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -190,7 +190,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -212,7 +212,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -232,7 +232,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -252,7 +252,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -272,7 +272,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -292,7 +292,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -312,7 +312,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -332,7 +332,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -352,7 +352,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -365,7 +365,7 @@ test.register_coroutine_test(
       OnOff.server.commands.On(mock_device):to_endpoint(0x02) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -378,7 +378,7 @@ test.register_coroutine_test(
       OnOff.server.commands.On(mock_device):to_endpoint(0x03) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -391,7 +391,7 @@ test.register_coroutine_test(
       OnOff.server.commands.On(mock_device):to_endpoint(0x04) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -404,7 +404,7 @@ test.register_coroutine_test(
       OnOff.server.commands.On(mock_device):to_endpoint(0x05) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -417,7 +417,7 @@ test.register_coroutine_test(
       OnOff.server.commands.On(mock_device):to_endpoint(0x06) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -430,7 +430,7 @@ test.register_coroutine_test(
       OnOff.server.commands.On(mock_device):to_endpoint(0x07) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -443,7 +443,7 @@ test.register_coroutine_test(
       OnOff.server.commands.On(mock_device):to_endpoint(0x08) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -456,7 +456,7 @@ test.register_coroutine_test(
       OnOff.server.commands.Off(mock_device):to_endpoint(0x01) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -469,7 +469,7 @@ test.register_coroutine_test(
       OnOff.server.commands.Off(mock_device):to_endpoint(0x02) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -482,7 +482,7 @@ test.register_coroutine_test(
       OnOff.server.commands.Off(mock_device):to_endpoint(0x03) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -495,7 +495,7 @@ test.register_coroutine_test(
       OnOff.server.commands.Off(mock_device):to_endpoint(0x04) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -508,7 +508,7 @@ test.register_coroutine_test(
       OnOff.server.commands.Off(mock_device):to_endpoint(0x05) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -521,7 +521,7 @@ test.register_coroutine_test(
       OnOff.server.commands.Off(mock_device):to_endpoint(0x06) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -534,7 +534,7 @@ test.register_coroutine_test(
       OnOff.server.commands.Off(mock_device):to_endpoint(0x07) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -547,7 +547,7 @@ test.register_coroutine_test(
       OnOff.server.commands.Off(mock_device):to_endpoint(0x08) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -567,7 +567,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_ledvance_metering_plug.lua b/drivers/SmartThings/zigbee-switch/src/test/test_ledvance_metering_plug.lua
index ebdcae468e..0d0e8f2351 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_ledvance_metering_plug.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_ledvance_metering_plug.lua
@@ -55,7 +55,7 @@ test.register_coroutine_test(
     assert(mock_device:get_field(zigbee_constants.SIMPLE_METERING_DIVISOR_KEY) == 100)
   end,
   {
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -70,7 +70,7 @@ test.register_coroutine_test(
     assert(mock_device:get_field(zigbee_constants.SIMPLE_METERING_DIVISOR_KEY) == 1000)
   end,
   {
-    min_api_version = 17
+    
   }
 )
 
@@ -85,7 +85,7 @@ test.register_coroutine_test(
     assert(mock_device_eu_em_t:get_field(zigbee_constants.SIMPLE_METERING_DIVISOR_KEY) == 100)
   end,
   {
-    min_api_version = 17
+    min_api_version = 15
   }
 )
 
@@ -100,7 +100,7 @@ test.register_coroutine_test(
     assert(mock_device_eu_em_t:get_field(zigbee_constants.SIMPLE_METERING_DIVISOR_KEY) == 1000)
   end,
   {
-    min_api_version = 17
+    
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_multi_switch.lua b/drivers/SmartThings/zigbee-switch/src/test/test_multi_switch.lua
index b6b5adade5..9b2e288d6f 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_multi_switch.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_multi_switch.lua
@@ -39,7 +39,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -59,7 +59,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 test.register_message_test(
@@ -78,7 +78,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -98,7 +98,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -117,7 +117,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_multi_switch_no_master.lua b/drivers/SmartThings/zigbee-switch/src/test/test_multi_switch_no_master.lua
index 2ec4c6eb86..a9ce1e5218 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_multi_switch_no_master.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_multi_switch_no_master.lua
@@ -105,7 +105,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -138,7 +138,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -171,7 +171,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -204,7 +204,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -237,7 +237,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -270,7 +270,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -297,7 +297,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -324,7 +324,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -351,7 +351,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -378,7 +378,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -405,7 +405,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -432,7 +432,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -511,7 +511,7 @@ test.register_coroutine_test(
     mock_base_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -553,7 +553,7 @@ test.register_coroutine_test(
     test_init = function()
       test.mock_device.add_test_device(mock_non_mns_device)
     end,
-    min_api_version = 17
+    
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_multi_switch_power.lua b/drivers/SmartThings/zigbee-switch/src/test/test_multi_switch_power.lua
index 788c5477c5..048237536f 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_multi_switch_power.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_multi_switch_power.lua
@@ -117,7 +117,7 @@ test.register_coroutine_test(
       test_init = function()
         -- no op to avoid auto device add and immediate init event on driver startup
       end,
-      min_api_version = 17
+      
     }
 )
 
@@ -141,7 +141,7 @@ test.register_coroutine_test(
       test_init = function()
         -- no op to avoid auto device add and immediate init event on driver startup
       end,
-      min_api_version = 17
+      
     }
 )
 
@@ -172,7 +172,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -203,7 +203,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -231,7 +231,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -259,7 +259,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -287,7 +287,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -315,7 +315,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -345,7 +345,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -375,7 +375,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -402,7 +402,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -429,7 +429,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -456,7 +456,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -483,7 +483,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -509,7 +509,7 @@ test.register_coroutine_test(
       })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -528,7 +528,7 @@ test.register_coroutine_test(
       })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_on_off_zigbee_bulb.lua b/drivers/SmartThings/zigbee-switch/src/test/test_on_off_zigbee_bulb.lua
index 7a1af4a260..ef023df1ca 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_on_off_zigbee_bulb.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_on_off_zigbee_bulb.lua
@@ -47,7 +47,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -75,7 +75,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -103,7 +103,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -132,7 +132,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -175,7 +175,7 @@ test.register_coroutine_test(
       mock_simple_device:expect_metadata_update({provisioning_state = "PROVISIONED"})
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_osram_iqbr30_light.lua b/drivers/SmartThings/zigbee-switch/src/test/test_osram_iqbr30_light.lua
index 8727de3c35..3a6f7341f5 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_osram_iqbr30_light.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_osram_iqbr30_light.lua
@@ -65,7 +65,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -76,7 +76,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",capabilities.switchLevel.level(100)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -107,7 +107,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -138,7 +138,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "RELAXED",
-    min_api_version = 17
+    
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_osram_light.lua b/drivers/SmartThings/zigbee-switch/src/test/test_osram_light.lua
index 29a53accff..f686186379 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_osram_light.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_osram_light.lua
@@ -65,7 +65,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -76,7 +76,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",capabilities.switchLevel.level(100)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -107,7 +107,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_rgb_bulb.lua b/drivers/SmartThings/zigbee-switch/src/test/test_rgb_bulb.lua
index 06c20b34e5..21d3c7851a 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_rgb_bulb.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_rgb_bulb.lua
@@ -67,7 +67,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -114,7 +114,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -141,7 +141,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({mock_device.id, ColorControl.attributes.CurrentHue:read(mock_device)})
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -168,7 +168,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({mock_device.id, ColorControl.attributes.CurrentSaturation:read(mock_device)})
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -200,7 +200,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({mock_device.id, ColorControl.attributes.CurrentSaturation:read(mock_device)})
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_rgbw_bulb.lua b/drivers/SmartThings/zigbee-switch/src/test/test_rgbw_bulb.lua
index 4a83d8b920..0391aacf3a 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_rgbw_bulb.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_rgbw_bulb.lua
@@ -165,7 +165,6 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-    min_api_version = 17,
     max_api_version = 19
   }
 )
@@ -221,7 +220,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -248,7 +247,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({mock_device.id, ColorControl.attributes.CurrentHue:read(mock_device)})
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -275,7 +274,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({mock_device.id, ColorControl.attributes.CurrentSaturation:read(mock_device)})
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -304,7 +303,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({mock_device.id, ColorControl.attributes.CurrentSaturation:read(mock_device)})
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -330,7 +329,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({mock_device.id, ColorControl.attributes.ColorTemperatureMireds:read(mock_device)})
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -346,7 +345,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_robb_smarrt_2-wire_dimmer.lua b/drivers/SmartThings/zigbee-switch/src/test/test_robb_smarrt_2-wire_dimmer.lua
index cfbfa42b50..1cb0ad5929 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_robb_smarrt_2-wire_dimmer.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_robb_smarrt_2-wire_dimmer.lua
@@ -56,7 +56,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -83,7 +83,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -111,7 +111,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -131,7 +131,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -152,7 +152,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_robb_smarrt_knob_dimmer.lua b/drivers/SmartThings/zigbee-switch/src/test/test_robb_smarrt_knob_dimmer.lua
index 1bfa694b5b..752a2159ef 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_robb_smarrt_knob_dimmer.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_robb_smarrt_knob_dimmer.lua
@@ -56,7 +56,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -83,7 +83,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -111,7 +111,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -132,7 +132,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_sengled_color_temp_bulb.lua b/drivers/SmartThings/zigbee-switch/src/test/test_sengled_color_temp_bulb.lua
index 80241b4ca9..8e3cd49c31 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_sengled_color_temp_bulb.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_sengled_color_temp_bulb.lua
@@ -143,7 +143,6 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17,
      max_api_version = 19
   }
 )
@@ -238,7 +237,6 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17,
     max_api_version = 19
   }
 )
@@ -269,7 +267,6 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({mock_device.id, ColorControl.attributes.ColorTemperatureMireds:read(mock_device)})
   end,
   {
-     min_api_version = 17
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_sengled_dimmer_bulb_with_motion_sensor.lua b/drivers/SmartThings/zigbee-switch/src/test/test_sengled_dimmer_bulb_with_motion_sensor.lua
index aa4e56653c..f5d2e895da 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_sengled_dimmer_bulb_with_motion_sensor.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_sengled_dimmer_bulb_with_motion_sensor.lua
@@ -69,7 +69,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -83,7 +83,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, IASZone.attributes.ZoneStatus:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -97,7 +97,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, IASZone.attributes.ZoneStatus:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -119,7 +119,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, IASZone.attributes.ZoneStatus:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -141,7 +141,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, IASZone.attributes.ZoneStatus:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -163,7 +163,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, IASZone.attributes.ZoneStatus:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -190,7 +190,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -217,7 +217,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_sinope_dimmer.lua b/drivers/SmartThings/zigbee-switch/src/test/test_sinope_dimmer.lua
index 4de1a70303..d4858abd16 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_sinope_dimmer.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_sinope_dimmer.lua
@@ -73,7 +73,7 @@ test.register_coroutine_test(
 
    end,
    {
-      min_api_version = 17
+      
    }
 
   )
@@ -109,7 +109,7 @@ test.register_coroutine_test(
 
    end,
    {
-      min_api_version = 17
+      
    }
 
   )
@@ -148,7 +148,7 @@ test.register_coroutine_test(
 
    end,
    {
-      min_api_version = 17
+      
    }
 
   )
@@ -184,7 +184,7 @@ test.register_coroutine_test(
 
    end,
    {
-      min_api_version = 17
+      
    }
 
   )
@@ -214,7 +214,7 @@ test.register_coroutine_test(
 
    end,
    {
-      min_api_version = 17
+      
    }
 
   )
@@ -240,7 +240,7 @@ test.register_coroutine_test(
 
    end,
    {
-      min_api_version = 17
+      
    }
 
   )
@@ -280,7 +280,7 @@ test.register_coroutine_test(
 
    end,
    {
-      min_api_version = 17
+      
    }
 
   )
@@ -316,7 +316,7 @@ test.register_coroutine_test(
 
    end,
    {
-      min_api_version = 17
+      
    }
 
   )
@@ -360,7 +360,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_sinope_switch.lua b/drivers/SmartThings/zigbee-switch/src/test/test_sinope_switch.lua
index 9d9b33df99..f153b93283 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_sinope_switch.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_sinope_switch.lua
@@ -57,7 +57,7 @@ test.register_coroutine_test(
 
    end,
    {
-      min_api_version = 17
+      
    }
 
   )
@@ -84,7 +84,7 @@ test.register_coroutine_test(
 
    end,
    {
-      min_api_version = 17
+      
    }
 
   )
@@ -111,7 +111,7 @@ test.register_coroutine_test(
 
    end,
    {
-      min_api_version = 17
+      
    }
 
   )
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_switch_power.lua b/drivers/SmartThings/zigbee-switch/src/test/test_switch_power.lua
index 4ff3fb2afa..103a2e8ab9 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_switch_power.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_switch_power.lua
@@ -125,7 +125,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -180,7 +180,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -242,7 +242,7 @@ test.register_coroutine_test(
     mock_aurora_relay_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -312,7 +312,7 @@ test.register_coroutine_test(
     mock_vimar_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_tuya_multi.lua b/drivers/SmartThings/zigbee-switch/src/test/test_tuya_multi.lua
index ac3a78a982..0fe0872cf2 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_tuya_multi.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_tuya_multi.lua
@@ -78,7 +78,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_tuya_multi_switch.lua b/drivers/SmartThings/zigbee-switch/src/test/test_tuya_multi_switch.lua
index b6b5adade5..9b2e288d6f 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_tuya_multi_switch.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_tuya_multi_switch.lua
@@ -39,7 +39,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -59,7 +59,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 test.register_message_test(
@@ -78,7 +78,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -98,7 +98,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -117,7 +117,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_wallhero_switch.lua b/drivers/SmartThings/zigbee-switch/src/test/test_wallhero_switch.lua
index 8bbe6bad68..a4a376d878 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_wallhero_switch.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_wallhero_switch.lua
@@ -182,7 +182,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -215,7 +215,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -248,7 +248,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -281,7 +281,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -314,7 +314,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -347,7 +347,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -380,7 +380,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -413,7 +413,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -428,7 +428,7 @@ test.register_coroutine_test(
         0x6000, 0x1235, data_types.Uint8, 0x01) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -443,7 +443,7 @@ test.register_coroutine_test(
         0x6000, 0x1235, data_types.Uint8, 0x00) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -475,7 +475,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -502,7 +502,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -529,7 +529,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -556,7 +556,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -584,7 +584,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -611,7 +611,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -638,7 +638,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -665,7 +665,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -682,7 +682,7 @@ test.register_coroutine_test(
                                             )))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -698,7 +698,7 @@ test.register_coroutine_test(
                                             )))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -714,7 +714,7 @@ test.register_coroutine_test(
                                             )))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -730,7 +730,7 @@ test.register_coroutine_test(
                                             )))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -794,7 +794,7 @@ test.register_coroutine_test(
       })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -808,7 +808,7 @@ test.register_coroutine_test(
         capabilities.button.supportedButtonValues({ "pushed" }, { visibility = { displayed = false } })))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_white_color_temp_bulb.lua b/drivers/SmartThings/zigbee-switch/src/test/test_white_color_temp_bulb.lua
index 8a0db9d65c..1ef6418e9c 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_white_color_temp_bulb.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_white_color_temp_bulb.lua
@@ -144,7 +144,6 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17,
      max_api_version = 19
   }
 )
@@ -239,7 +238,6 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17,
     max_api_version = 19
   }
 )
@@ -270,7 +268,6 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({mock_device.id, ColorControl.attributes.ColorTemperatureMireds:read(mock_device)})
   end,
   {
-     min_api_version = 17
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_yanmi_switch.lua b/drivers/SmartThings/zigbee-switch/src/test/test_yanmi_switch.lua
index 5f29f49c2b..283025271c 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_yanmi_switch.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_yanmi_switch.lua
@@ -101,7 +101,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -134,7 +134,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -167,7 +167,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -201,7 +201,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -234,7 +234,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -267,7 +267,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -300,7 +300,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -327,7 +327,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -354,7 +354,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -384,7 +384,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -411,7 +411,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -438,7 +438,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_zigbee_ezex_switch.lua b/drivers/SmartThings/zigbee-switch/src/test/test_zigbee_ezex_switch.lua
index d2b73dd4b1..29821c9b25 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_zigbee_ezex_switch.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_zigbee_ezex_switch.lua
@@ -54,7 +54,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -81,7 +81,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -100,7 +100,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -127,7 +127,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -146,7 +146,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_zigbee_metering_plug_power_consumption_report.lua b/drivers/SmartThings/zigbee-switch/src/test/test_zigbee_metering_plug_power_consumption_report.lua
index e265fa13dc..0d8017c0d0 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_zigbee_metering_plug_power_consumption_report.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_zigbee_metering_plug_power_consumption_report.lua
@@ -66,7 +66,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -85,7 +85,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -153,7 +153,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_zigbee_metering_plug_rexense.lua b/drivers/SmartThings/zigbee-switch/src/test/test_zigbee_metering_plug_rexense.lua
index a616744baf..04158cafd8 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_zigbee_metering_plug_rexense.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_zigbee_metering_plug_rexense.lua
@@ -49,7 +49,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -73,7 +73,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_zll_color_temp_bulb.lua b/drivers/SmartThings/zigbee-switch/src/test/test_zll_color_temp_bulb.lua
index f6842b077f..0d9b4fb274 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_zll_color_temp_bulb.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_zll_color_temp_bulb.lua
@@ -66,7 +66,6 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.ColorTemperatureMireds:read(mock_device) })
   end,
   {
-    min_api_version = 17,
     max_api_version = 19
   }
 )
@@ -115,7 +114,6 @@ test.register_coroutine_test(
         test.mock_device.add_test_device(mock_device)
         test.timer.__create_and_queue_test_time_advance_timer(30, "interval", "polling")
       end,
-      min_api_version = 17,
       max_api_version = 19
     }
 )
@@ -156,7 +154,6 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.ColorTemperatureMireds:read(mock_device) })
   end,
   {
-     min_api_version = 17,
      max_api_version = 19
   }
 )
@@ -197,7 +194,6 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.ColorTemperatureMireds:read(mock_device) })
   end,
   {
-     min_api_version = 17,
      max_api_version = 19
   }
 )
@@ -238,7 +234,6 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.ColorTemperatureMireds:read(mock_device) })
   end,
   {
-     min_api_version = 17,
      max_api_version = 19
   }
 )
@@ -281,7 +276,6 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.ColorTemperatureMireds:read(mock_device) })
   end,
   {
-     min_api_version = 17,
      max_api_version = 19
   }
 )
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_zll_dimmer.lua b/drivers/SmartThings/zigbee-switch/src/test/test_zll_dimmer.lua
index 2e688c0a86..a8b0d1ad5b 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_zll_dimmer.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_zll_dimmer.lua
@@ -67,7 +67,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -78,7 +78,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",capabilities.switchLevel.level(100)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -91,7 +91,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -157,7 +157,7 @@ test.register_coroutine_test(
         test.mock_device.add_test_device(mock_device)
         test.timer.__create_and_queue_test_time_advance_timer(5*60, "interval", "polling")
       end,
-      min_api_version = 17
+      
     }
 )
 
@@ -171,7 +171,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_zll_dimmer_bulb.lua b/drivers/SmartThings/zigbee-switch/src/test/test_zll_dimmer_bulb.lua
index ec10a66a62..a592ef3b29 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_zll_dimmer_bulb.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_zll_dimmer_bulb.lua
@@ -67,7 +67,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -80,7 +80,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -93,7 +93,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -115,7 +115,7 @@ test.register_coroutine_test(
         test.mock_device.add_test_device(mock_device)
         test.timer.__create_and_queue_test_time_advance_timer(30, "interval", "polling")
       end,
-      min_api_version = 17
+      
     }
 )
 
@@ -136,7 +136,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -157,7 +157,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -178,7 +178,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_zll_rgb_bulb.lua b/drivers/SmartThings/zigbee-switch/src/test/test_zll_rgb_bulb.lua
index bbbda5660d..774a58014e 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_zll_rgb_bulb.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_zll_rgb_bulb.lua
@@ -85,7 +85,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -100,7 +100,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.CurrentY:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -115,7 +115,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.CurrentY:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -139,7 +139,7 @@ test.register_coroutine_test(
         test.mock_device.add_test_device(mock_device)
         test.timer.__create_and_queue_test_time_advance_timer(30, "interval", "polling")
       end,
-      min_api_version = 17
+      
     }
 )
 
@@ -162,7 +162,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.CurrentY:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -185,7 +185,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.CurrentY:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -208,7 +208,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.CurrentY:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -286,7 +286,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.CurrentY:read(mock_device) })
   end,
   {
-      min_api_version = 17
+      
   }
 )
 
@@ -365,7 +365,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.CurrentY:read(mock_device) })
   end,
   {
-      min_api_version = 17
+      
   }
 )
 
@@ -406,7 +406,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.CurrentY:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -447,7 +447,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.CurrentY:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -474,7 +474,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.CurrentY:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -489,7 +489,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.colorControl.saturation(65)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -504,7 +504,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.colorControl.saturation(65)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -519,7 +519,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.colorControl.saturation(65)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -534,7 +534,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.colorControl.saturation(65)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_zll_rgbw_bulb.lua b/drivers/SmartThings/zigbee-switch/src/test/test_zll_rgbw_bulb.lua
index 4e2ad43b06..162bc27bca 100644
--- a/drivers/SmartThings/zigbee-switch/src/test/test_zll_rgbw_bulb.lua
+++ b/drivers/SmartThings/zigbee-switch/src/test/test_zll_rgbw_bulb.lua
@@ -195,7 +195,6 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.CurrentSaturation:read(mock_device) })
   end,
   {
-    min_api_version = 17,
     max_api_version = 19
   }
 )
@@ -248,7 +247,6 @@ test.register_coroutine_test(
         test.mock_device.add_test_device(mock_device)
         test.timer.__create_and_queue_test_time_advance_timer(5*60, "interval", "polling")
       end,
-      min_api_version = 17,
       max_api_version = 19
     }
 )
@@ -301,7 +299,6 @@ test.register_coroutine_test(
 
   end,
   {
-     min_api_version = 17,
      max_api_version = 19
   }
 )
@@ -354,7 +351,6 @@ test.register_coroutine_test(
 
   end,
   {
-     min_api_version = 17,
      max_api_version = 19
   }
 )
@@ -407,7 +403,6 @@ test.register_coroutine_test(
 
   end,
   {
-     min_api_version = 17,
      max_api_version = 19
   }
 )
@@ -462,7 +457,6 @@ test.register_coroutine_test(
 
   end,
   {
-     min_api_version = 17,
      max_api_version = 19
   }
 )
@@ -491,7 +485,6 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.CurrentHue:read(mock_device) })
   end,
   {
-     min_api_version = 17
   }
 )
 
@@ -519,7 +512,6 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.CurrentSaturation:read(mock_device) })
   end,
   {
-     min_api_version = 17
   }
 )
 
@@ -549,7 +541,6 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.CurrentSaturation:read(mock_device) })
   end,
   {
-     min_api_version = 17
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-thermostat/src/test/test_aqara_thermostat.lua b/drivers/SmartThings/zigbee-thermostat/src/test/test_aqara_thermostat.lua
index 8b84e987a0..f2bb0e7eee 100644
--- a/drivers/SmartThings/zigbee-thermostat/src/test/test_aqara_thermostat.lua
+++ b/drivers/SmartThings/zigbee-thermostat/src/test/test_aqara_thermostat.lua
@@ -77,7 +77,7 @@ test.register_coroutine_test(
       PRIVATE_THERM0STAT_VALVE_DETECTION_SWITCH_ID, MFG_CODE, data_types.Uint8, 0x01) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -92,7 +92,7 @@ test.register_coroutine_test(
       PRIVATE_ANTIFREEZE_MODE_TEMPERATURE_SETTING_ID, MFG_CODE, data_types.Uint32, 500) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -120,7 +120,7 @@ test.register_coroutine_test(
     capabilities.hardwareFault.hardwareFault.clear()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -158,7 +158,7 @@ test.register_coroutine_test(
       valveCalibration.calibrationState.calibrationFailure()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -190,7 +190,7 @@ test.register_coroutine_test(
       invisibleCapabilities.invisibleCapabilities({"thermostatHeatingSetpoint"})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -258,7 +258,7 @@ test.register_coroutine_test(
       invisibleCapabilities.invisibleCapabilities({"thermostatHeatingSetpoint"})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -286,7 +286,7 @@ test.register_coroutine_test(
       capabilities.lock.lock.locked()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -305,7 +305,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -366,7 +366,7 @@ test.register_coroutine_test(
       PRIVATE_VALVE_SWITCH_ATTRIBUTE_ID, MFG_CODE, data_types.Uint8, 0x01) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -380,7 +380,7 @@ test.register_coroutine_test(
       PRIVATE_VALVE_CALIBRATION_ID, MFG_CODE, data_types.Uint8, 0x01) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -395,7 +395,7 @@ test.register_coroutine_test(
       PRIVATE_CHILD_LOCK_ID, MFG_CODE, data_types.Uint8, 0x01) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 --]]
@@ -470,7 +470,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-thermostat/src/test/test_centralite_thermostat.lua b/drivers/SmartThings/zigbee-thermostat/src/test/test_centralite_thermostat.lua
index b1942290db..af8b0e3a43 100644
--- a/drivers/SmartThings/zigbee-thermostat/src/test/test_centralite_thermostat.lua
+++ b/drivers/SmartThings/zigbee-thermostat/src/test/test_centralite_thermostat.lua
@@ -48,7 +48,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -68,7 +68,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -88,7 +88,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -119,7 +119,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -150,7 +150,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-thermostat/src/test/test_danfoss_thermostat.lua b/drivers/SmartThings/zigbee-thermostat/src/test/test_danfoss_thermostat.lua
index 43fe7c3c82..03f9913175 100644
--- a/drivers/SmartThings/zigbee-thermostat/src/test/test_danfoss_thermostat.lua
+++ b/drivers/SmartThings/zigbee-thermostat/src/test/test_danfoss_thermostat.lua
@@ -44,7 +44,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -55,7 +55,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device_danfoss:generate_test_message("main", capabilities.temperatureMeasurement.temperature({ value = 21.0, unit = "C"})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -66,7 +66,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device_danfoss:generate_test_message("main", capabilities.thermostatHeatingSetpoint.heatingSetpoint({ value = 21.0, unit = "C"})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -76,7 +76,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__queue_receive({ mock_device_danfoss.id, Thermostat.attributes.OccupiedCoolingSetpoint:build_test_attr_report(mock_device_danfoss, 2100) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -102,7 +102,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -121,7 +121,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-thermostat/src/test/test_fidure_thermostat.lua b/drivers/SmartThings/zigbee-thermostat/src/test/test_fidure_thermostat.lua
index 469f36dec9..c7075180ce 100644
--- a/drivers/SmartThings/zigbee-thermostat/src/test/test_fidure_thermostat.lua
+++ b/drivers/SmartThings/zigbee-thermostat/src/test/test_fidure_thermostat.lua
@@ -63,7 +63,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -78,7 +78,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-thermostat/src/test/test_leviton_rc.lua b/drivers/SmartThings/zigbee-thermostat/src/test/test_leviton_rc.lua
index 8fc6b2944f..66a485c599 100644
--- a/drivers/SmartThings/zigbee-thermostat/src/test/test_leviton_rc.lua
+++ b/drivers/SmartThings/zigbee-thermostat/src/test/test_leviton_rc.lua
@@ -53,7 +53,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -70,7 +70,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send( { mock_device.id, Thermostat.attributes.LocalTemperature:read(mock_device):to_endpoint(ENDPOINT) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -81,7 +81,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.temperatureMeasurement.temperature({value = 21.0, unit = "C"})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -92,7 +92,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.thermostatMode.thermostatMode.off()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -115,7 +115,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.thermostatFanMode.thermostatFanMode.auto()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -130,7 +130,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.thermostatCoolingSetpoint.coolingSetpoint({value = 21.0, unit = "C"})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -145,7 +145,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.thermostatHeatingSetpoint.heatingSetpoint({value = 21.0, unit = "C"})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -159,7 +159,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__queue_receive({ mock_device.id, Thermostat.attributes.OccupiedHeatingSetpoint:build_test_attr_report(mock_device, 2100) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -173,7 +173,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__queue_receive({ mock_device.id, Thermostat.attributes.OccupiedCoolingSetpoint:build_test_attr_report(mock_device, 2100) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -185,7 +185,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send( { mock_device.id, Thermostat.attributes.OccupiedHeatingSetpoint:write(mock_device, 2100):to_endpoint(ENDPOINT) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -197,7 +197,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send( { mock_device.id, Thermostat.attributes.OccupiedCoolingSetpoint:write(mock_device, 2100):to_endpoint(ENDPOINT) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -208,7 +208,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send( { mock_device.id, Thermostat.attributes.SystemMode:write(mock_device, 3):to_endpoint(ENDPOINT) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -219,7 +219,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send( { mock_device.id, FanControl.attributes.FanMode:write(mock_device, 5):to_endpoint(ENDPOINT) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -253,7 +253,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send( { mock_device.id, Thermostat.attributes.LocalTemperature:read(mock_device):to_endpoint(ENDPOINT) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-thermostat/src/test/test_popp_thermostat.lua b/drivers/SmartThings/zigbee-thermostat/src/test/test_popp_thermostat.lua
index d1ae50109d..70014679ef 100644
--- a/drivers/SmartThings/zigbee-thermostat/src/test/test_popp_thermostat.lua
+++ b/drivers/SmartThings/zigbee-thermostat/src/test/test_popp_thermostat.lua
@@ -69,7 +69,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -100,7 +100,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -122,7 +122,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -144,7 +144,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -168,7 +168,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -190,7 +190,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -254,7 +254,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -291,7 +291,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -319,7 +319,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -356,7 +356,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -393,7 +393,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -410,7 +410,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.thermostatMode.thermostatMode.eco()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -462,7 +462,7 @@ test.register_coroutine_test(
       )})
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -479,7 +479,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.temperatureAlarm.temperatureAlarm.cleared()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -496,7 +496,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.switch.switch.off()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-thermostat/src/test/test_resideo_dt300st_m000.lua b/drivers/SmartThings/zigbee-thermostat/src/test/test_resideo_dt300st_m000.lua
index 71264c3a99..4dac1a3e25 100644
--- a/drivers/SmartThings/zigbee-thermostat/src/test/test_resideo_dt300st_m000.lua
+++ b/drivers/SmartThings/zigbee-thermostat/src/test/test_resideo_dt300st_m000.lua
@@ -102,7 +102,7 @@ test.register_coroutine_test("Configure should configure all necessary attribute
   })
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -125,7 +125,7 @@ test.register_coroutine_test("Refresh should read all necessary attributes", fun
   end
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -139,7 +139,7 @@ test.register_coroutine_test("Temperature reporting should create the appropriat
     })))
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -156,7 +156,7 @@ test.register_coroutine_test("Thermostat mode reporting should create the approp
     .thermostatMode.heat()))
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -172,7 +172,7 @@ test.register_coroutine_test("ControlSequenceOfOperation reporting should create
     })))
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -187,7 +187,7 @@ test.register_coroutine_test("OccupiedHeatingSetpoint reporting shoulb create th
     })))
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -202,7 +202,7 @@ test.register_coroutine_test("Setting the heating setpoint should generate the a
                                     Thermostat.attributes.OccupiedHeatingSetpoint:write(mock_device, 2100)})
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -218,7 +218,7 @@ test.register_coroutine_test("Setting the thermostat mode to away should generat
     Thermostat.attributes.SystemMode.OFF)})
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -234,7 +234,7 @@ test.register_coroutine_test("Setting the thermostat mode to heat should generat
     Thermostat.attributes.SystemMode.HEAT)})
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -257,7 +257,7 @@ test.register_coroutine_test("Refresh should read all necessary attributes with
   end
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -271,7 +271,7 @@ test.register_coroutine_test("Temperature reporting should create the appropriat
     })))
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -288,7 +288,7 @@ test.register_coroutine_test("Thermostat mode reporting should create the approp
     .thermostatMode.heat()))
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -304,7 +304,7 @@ test.register_coroutine_test("ControlSequenceOfOperation reporting should create
     })))
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -319,7 +319,7 @@ test.register_coroutine_test("OccupiedHeatingSetpoint reporting shoulb create th
     })))
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -334,7 +334,7 @@ test.register_coroutine_test("Setting the heating setpoint should generate the a
                                     Thermostat.attributes.OccupiedHeatingSetpoint:write(mock_first_child, 2100)})
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -350,7 +350,7 @@ test.register_coroutine_test("Setting the thermostat mode to away should generat
     Thermostat.attributes.SystemMode.OFF)})
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -366,7 +366,7 @@ test.register_coroutine_test("Setting the thermostat mode to heat should generat
     Thermostat.attributes.SystemMode.HEAT)})
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -389,7 +389,7 @@ test.register_coroutine_test("Refresh should read all necessary attributes with
   end
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -403,7 +403,7 @@ test.register_coroutine_test("Temperature reporting should create the appropriat
     })))
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -420,7 +420,7 @@ test.register_coroutine_test("Thermostat mode reporting should create the approp
     .thermostatMode.heat()))
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -436,7 +436,7 @@ test.register_coroutine_test("ControlSequenceOfOperation reporting should create
     })))
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -451,7 +451,7 @@ test.register_coroutine_test("OccupiedHeatingSetpoint reporting shoulb create th
     })))
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -466,7 +466,7 @@ test.register_coroutine_test("Setting the heating setpoint should generate the a
                                     Thermostat.attributes.OccupiedHeatingSetpoint:write(mock_second_child, 2100)})
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -482,7 +482,7 @@ test.register_coroutine_test("Setting the thermostat mode to away should generat
     Thermostat.attributes.SystemMode.OFF)})
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -498,7 +498,7 @@ test.register_coroutine_test("Setting the thermostat mode to heat should generat
     Thermostat.attributes.SystemMode.HEAT)})
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -521,7 +521,7 @@ test.register_coroutine_test("Refresh should read all necessary attributes with
   end
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -535,7 +535,7 @@ test.register_coroutine_test("Temperature reporting should create the appropriat
     })))
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -552,7 +552,7 @@ test.register_coroutine_test("Thermostat mode reporting should create the approp
     .thermostatMode.heat()))
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -568,7 +568,7 @@ test.register_coroutine_test("ControlSequenceOfOperation reporting should create
     })))
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -583,7 +583,7 @@ test.register_coroutine_test("OccupiedHeatingSetpoint reporting shoulb create th
     })))
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -598,7 +598,7 @@ test.register_coroutine_test("Setting the heating setpoint should generate the a
                                     Thermostat.attributes.OccupiedHeatingSetpoint:write(mock_third_child, 2100)})
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -614,7 +614,7 @@ test.register_coroutine_test("Setting the thermostat mode to away should generat
     Thermostat.attributes.SystemMode.OFF)})
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -630,7 +630,7 @@ test.register_coroutine_test("Setting the thermostat mode to heat should generat
     Thermostat.attributes.SystemMode.HEAT)})
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -653,7 +653,7 @@ test.register_coroutine_test("Refresh should read all necessary attributes with
   end
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -667,7 +667,7 @@ test.register_coroutine_test("Temperature reporting should create the appropriat
     })))
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -684,7 +684,7 @@ test.register_coroutine_test("Thermostat mode reporting should create the approp
     .thermostatMode.heat()))
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -700,7 +700,7 @@ test.register_coroutine_test("ControlSequenceOfOperation reporting should create
     })))
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -715,7 +715,7 @@ test.register_coroutine_test("OccupiedHeatingSetpoint reporting shoulb create th
     })))
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -730,7 +730,7 @@ test.register_coroutine_test("Setting the heating setpoint should generate the a
                                     Thermostat.attributes.OccupiedHeatingSetpoint:write(mock_forth_child, 2100)})
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -746,7 +746,7 @@ test.register_coroutine_test("Setting the thermostat mode to away should generat
     Thermostat.attributes.SystemMode.OFF)})
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -762,7 +762,7 @@ test.register_coroutine_test("Setting the thermostat mode to heat should generat
     Thermostat.attributes.SystemMode.HEAT)})
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -785,7 +785,7 @@ test.register_coroutine_test("Refresh should read all necessary attributes with
   end
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -799,7 +799,7 @@ test.register_coroutine_test("Temperature reporting should create the appropriat
     })))
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -816,7 +816,7 @@ test.register_coroutine_test("Thermostat mode reporting should create the approp
     .thermostatMode.heat()))
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -832,7 +832,7 @@ test.register_coroutine_test("ControlSequenceOfOperation reporting should create
     })))
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -847,7 +847,7 @@ test.register_coroutine_test("OccupiedHeatingSetpoint reporting shoulb create th
     })))
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -862,7 +862,7 @@ test.register_coroutine_test("Setting the heating setpoint should generate the a
                                     Thermostat.attributes.OccupiedHeatingSetpoint:write(mock_fifth_child, 2100)})
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -878,7 +878,7 @@ test.register_coroutine_test("Setting the thermostat mode to away should generat
     Thermostat.attributes.SystemMode.OFF)})
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -894,7 +894,7 @@ test.register_coroutine_test("Setting the thermostat mode to heat should generat
     Thermostat.attributes.SystemMode.HEAT)})
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -913,7 +913,7 @@ test.register_coroutine_test("ThermostatRunningState reporting shoulb create the
     capabilities.thermostatOperatingState.thermostatOperatingState({value="fan only"})))
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
diff --git a/drivers/SmartThings/zigbee-thermostat/src/test/test_sinope_th1300_thermostat.lua b/drivers/SmartThings/zigbee-thermostat/src/test/test_sinope_th1300_thermostat.lua
index 271c070df3..2d4d9a0ff3 100644
--- a/drivers/SmartThings/zigbee-thermostat/src/test/test_sinope_th1300_thermostat.lua
+++ b/drivers/SmartThings/zigbee-thermostat/src/test/test_sinope_th1300_thermostat.lua
@@ -47,7 +47,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -66,7 +66,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -102,7 +102,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -198,7 +198,7 @@ test.register_coroutine_test(
       })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-thermostat/src/test/test_sinope_th1400_thermostat.lua b/drivers/SmartThings/zigbee-thermostat/src/test/test_sinope_th1400_thermostat.lua
index 55ba5be56c..ca767bf161 100644
--- a/drivers/SmartThings/zigbee-thermostat/src/test/test_sinope_th1400_thermostat.lua
+++ b/drivers/SmartThings/zigbee-thermostat/src/test/test_sinope_th1400_thermostat.lua
@@ -47,7 +47,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -66,7 +66,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -102,7 +102,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -208,7 +208,7 @@ test.register_coroutine_test(
       })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-thermostat/src/test/test_sinope_thermostat.lua b/drivers/SmartThings/zigbee-thermostat/src/test/test_sinope_thermostat.lua
index 2506ca0f2f..128e25af86 100644
--- a/drivers/SmartThings/zigbee-thermostat/src/test/test_sinope_thermostat.lua
+++ b/drivers/SmartThings/zigbee-thermostat/src/test/test_sinope_thermostat.lua
@@ -47,7 +47,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -66,7 +66,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -102,7 +102,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -182,7 +182,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -212,7 +212,7 @@ test.register_coroutine_test(
       })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-thermostat/src/test/test_stelpro_ki_zigbee_thermostat.lua b/drivers/SmartThings/zigbee-thermostat/src/test/test_stelpro_ki_zigbee_thermostat.lua
index 470bb1378d..40a4acbeac 100644
--- a/drivers/SmartThings/zigbee-thermostat/src/test/test_stelpro_ki_zigbee_thermostat.lua
+++ b/drivers/SmartThings/zigbee-thermostat/src/test/test_stelpro_ki_zigbee_thermostat.lua
@@ -59,7 +59,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -78,7 +78,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -102,7 +102,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -126,7 +126,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -150,7 +150,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -169,7 +169,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -188,7 +188,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -210,7 +210,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -242,7 +242,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", ThermostatOperatingState.thermostatOperatingState("idle")))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -265,7 +265,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", ThermostatMode.thermostatMode.heat()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -298,7 +298,7 @@ test.register_coroutine_test(
       })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -331,7 +331,7 @@ test.register_coroutine_test(
       })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -423,7 +423,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -508,7 +508,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -531,7 +531,7 @@ test.register_coroutine_test("Setting the heating setpoint should generate the a
     })
 end,
 {
-   min_api_version = 17
+   
 }
 )
 
@@ -563,7 +563,7 @@ test.register_coroutine_test(
       })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 test.register_coroutine_test(
@@ -588,7 +588,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -615,7 +615,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-thermostat/src/test/test_stelpro_thermostat.lua b/drivers/SmartThings/zigbee-thermostat/src/test/test_stelpro_thermostat.lua
index 208949090c..f59be067be 100644
--- a/drivers/SmartThings/zigbee-thermostat/src/test/test_stelpro_thermostat.lua
+++ b/drivers/SmartThings/zigbee-thermostat/src/test/test_stelpro_thermostat.lua
@@ -51,7 +51,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -75,7 +75,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -99,7 +99,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -133,7 +133,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -167,7 +167,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -190,7 +190,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -213,7 +213,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -237,7 +237,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -256,7 +256,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -275,7 +275,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -294,7 +294,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -313,7 +313,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -355,7 +355,7 @@ test.register_coroutine_test(
       test.socket.zigbee:__set_channel_ordering("relaxed")
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -400,7 +400,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -440,7 +440,7 @@ test.register_coroutine_test(
       test.socket.zigbee:__set_channel_ordering("relaxed")
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -485,7 +485,7 @@ test.register_coroutine_test(
       mock_device_maestro:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -500,7 +500,7 @@ test.register_coroutine_test(
     test.socket.device_lifecycle:__queue_receive(mock_device:generate_info_changed({preferences = { lock = 1 } }))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -513,7 +513,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -551,7 +551,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-thermostat/src/test/test_vimar_thermostat.lua b/drivers/SmartThings/zigbee-thermostat/src/test/test_vimar_thermostat.lua
index afbe34524b..8b4f4cc367 100644
--- a/drivers/SmartThings/zigbee-thermostat/src/test/test_vimar_thermostat.lua
+++ b/drivers/SmartThings/zigbee-thermostat/src/test/test_vimar_thermostat.lua
@@ -87,7 +87,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -118,7 +118,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -149,7 +149,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -188,7 +188,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -227,7 +227,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -269,7 +269,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -311,7 +311,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -375,7 +375,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -415,7 +415,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -454,7 +454,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -496,7 +496,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -538,7 +538,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -602,7 +602,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -637,7 +637,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -671,7 +671,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -730,7 +730,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -790,7 +790,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -820,7 +820,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -850,7 +850,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-thermostat/src/test/test_zenwithin_thermostat.lua b/drivers/SmartThings/zigbee-thermostat/src/test/test_zenwithin_thermostat.lua
index c16757366d..3f7b733fbc 100644
--- a/drivers/SmartThings/zigbee-thermostat/src/test/test_zenwithin_thermostat.lua
+++ b/drivers/SmartThings/zigbee-thermostat/src/test/test_zenwithin_thermostat.lua
@@ -49,7 +49,7 @@ test.register_coroutine_test(
       end
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -69,7 +69,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 test.register_message_test(
@@ -88,7 +88,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -108,7 +108,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -149,7 +149,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -211,7 +211,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -291,7 +291,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -426,7 +426,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -461,7 +461,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -476,7 +476,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -519,7 +519,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -534,7 +534,7 @@ test.register_coroutine_test(
       assert(mock_device:get_field("minHeatSetpoint") == 500, "minHeatSetpoint field not stored correctly")
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -549,7 +549,7 @@ test.register_coroutine_test(
       assert(mock_device:get_field("maxHeatSetpoint") == 3500, "maxHeatSetpoint field not stored correctly")
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -564,7 +564,7 @@ test.register_coroutine_test(
       assert(mock_device:get_field("minCoolSetpoint") == 1600, "minCoolSetpoint field not stored correctly")
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -579,7 +579,7 @@ test.register_coroutine_test(
       assert(mock_device:get_field("maxCoolSetpoint") == 3200, "maxCoolSetpoint field not stored correctly")
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -617,7 +617,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -655,7 +655,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -691,7 +691,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -727,7 +727,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -884,7 +884,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-thermostat/src/test/test_zigbee_thermostat.lua b/drivers/SmartThings/zigbee-thermostat/src/test/test_zigbee_thermostat.lua
index e954e05a8a..45601e7e63 100644
--- a/drivers/SmartThings/zigbee-thermostat/src/test/test_zigbee_thermostat.lua
+++ b/drivers/SmartThings/zigbee-thermostat/src/test/test_zigbee_thermostat.lua
@@ -38,7 +38,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -58,7 +58,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -85,7 +85,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -105,7 +105,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -124,7 +124,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -148,7 +148,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -168,7 +168,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -188,7 +188,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -219,7 +219,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -250,7 +250,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -275,7 +275,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -300,7 +300,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -320,7 +320,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -361,7 +361,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -381,7 +381,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -412,7 +412,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -443,7 +443,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -474,7 +474,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -505,7 +505,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -535,7 +535,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -566,7 +566,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -597,7 +597,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -643,7 +643,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -785,7 +785,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -911,7 +911,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -931,7 +931,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-thermostat/src/test/test_zigbee_thermostat_wallhero_3in1.lua b/drivers/SmartThings/zigbee-thermostat/src/test/test_zigbee_thermostat_wallhero_3in1.lua
index a93a3a36ee..2db830a41d 100644
--- a/drivers/SmartThings/zigbee-thermostat/src/test/test_zigbee_thermostat_wallhero_3in1.lua
+++ b/drivers/SmartThings/zigbee-thermostat/src/test/test_zigbee_thermostat_wallhero_3in1.lua
@@ -212,7 +212,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -233,7 +233,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -253,7 +253,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -273,7 +273,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -293,7 +293,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -313,7 +313,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -333,7 +333,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -353,7 +353,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -373,7 +373,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -393,7 +393,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -413,7 +413,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -433,7 +433,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -453,7 +453,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -473,7 +473,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -493,7 +493,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -513,7 +513,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -533,7 +533,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -553,7 +553,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -573,7 +573,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -593,7 +593,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -613,7 +613,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -633,7 +633,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -652,7 +652,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -671,7 +671,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -690,7 +690,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -709,7 +709,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -728,7 +728,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -747,7 +747,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -766,7 +766,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -785,7 +785,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -804,7 +804,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -823,7 +823,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -842,7 +842,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -861,7 +861,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -880,7 +880,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -899,7 +899,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -918,7 +918,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -937,7 +937,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -956,7 +956,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -975,7 +975,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -994,7 +994,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1013,7 +1013,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1233,7 +1233,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-valve/src/test/test_ezex_valve.lua b/drivers/SmartThings/zigbee-valve/src/test/test_ezex_valve.lua
index d9db636eab..d4e79786c9 100644
--- a/drivers/SmartThings/zigbee-valve/src/test/test_ezex_valve.lua
+++ b/drivers/SmartThings/zigbee-valve/src/test/test_ezex_valve.lua
@@ -47,7 +47,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -68,7 +68,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -87,7 +87,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -106,7 +106,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -126,7 +126,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -146,7 +146,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -166,7 +166,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -186,7 +186,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -205,7 +205,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -224,7 +224,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -272,7 +272,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -314,7 +314,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -353,7 +353,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-valve/src/test/test_sinope_valve.lua b/drivers/SmartThings/zigbee-valve/src/test/test_sinope_valve.lua
index 9ba28f751e..7133eee2f1 100644
--- a/drivers/SmartThings/zigbee-valve/src/test/test_sinope_valve.lua
+++ b/drivers/SmartThings/zigbee-valve/src/test/test_sinope_valve.lua
@@ -49,7 +49,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -97,7 +97,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -120,7 +120,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -131,7 +131,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send( mock_device:generate_test_message("main", capabilities.battery.battery(20)) )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -142,7 +142,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send( mock_device:generate_test_message("main", capabilities.battery.battery(0)) )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -153,7 +153,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send( mock_device:generate_test_message("main", capabilities.battery.battery(100)) )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-valve/src/test/test_zigbee_valve.lua b/drivers/SmartThings/zigbee-valve/src/test/test_zigbee_valve.lua
index 72038fdb37..5dbfe74ee4 100644
--- a/drivers/SmartThings/zigbee-valve/src/test/test_zigbee_valve.lua
+++ b/drivers/SmartThings/zigbee-valve/src/test/test_zigbee_valve.lua
@@ -47,7 +47,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -68,7 +68,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -87,7 +87,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -107,7 +107,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -127,7 +127,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -147,7 +147,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -167,7 +167,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -186,7 +186,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -205,7 +205,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -254,7 +254,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -296,7 +296,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -335,7 +335,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-vent/src/test/test_zigbee_vent.lua b/drivers/SmartThings/zigbee-vent/src/test/test_zigbee_vent.lua
index 26420c997b..3a5769a9d0 100644
--- a/drivers/SmartThings/zigbee-vent/src/test/test_zigbee_vent.lua
+++ b/drivers/SmartThings/zigbee-vent/src/test/test_zigbee_vent.lua
@@ -61,7 +61,7 @@ test.register_message_test(
           }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -81,7 +81,7 @@ test.register_message_test(
           }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -101,7 +101,7 @@ test.register_message_test(
           }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -119,7 +119,7 @@ test.register_coroutine_test(
           test.socket.zigbee:__expect_send({mock_device.id, Level.attributes.CurrentLevel:read(mock_device)})
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -138,7 +138,7 @@ test.register_message_test(
           }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -162,7 +162,7 @@ test.register_message_test(
           }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -241,7 +241,7 @@ test.register_message_test(
         },
         {
           inner_block_ordering = "relaxed",
-          min_api_version = 17
+          
         }
 )
 
@@ -299,7 +299,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -320,7 +320,7 @@ test.register_coroutine_test(
           test.socket.zigbee:__expect_send({mock_device.id, Level.commands.MoveToLevelWithOnOff(mock_device, math.floor(83 / 100 * 254), 0xFFFF)})
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -333,7 +333,7 @@ test.register_coroutine_test(
           test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.battery.battery(50)))
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -345,7 +345,7 @@ test.register_coroutine_test(
           test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.atmosphericPressureMeasurement.atmosphericPressure({value = 1, unit = "kPa"})))
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
diff --git a/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_aqara_water_leak_sensor.lua b/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_aqara_water_leak_sensor.lua
index 51be73b5b3..8c2613f8dd 100644
--- a/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_aqara_water_leak_sensor.lua
+++ b/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_aqara_water_leak_sensor.lua
@@ -53,7 +53,7 @@ test.register_coroutine_test(
         data_types.Uint8, 1) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -80,7 +80,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -107,7 +107,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -126,7 +126,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_centralite_water_leak_sensor.lua b/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_centralite_water_leak_sensor.lua
index d92293d30e..4a346e6ee6 100644
--- a/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_centralite_water_leak_sensor.lua
+++ b/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_centralite_water_leak_sensor.lua
@@ -48,7 +48,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, TemperatureMeasurement.attributes.MeasuredValue:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -110,7 +110,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -129,7 +129,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -148,7 +148,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -167,7 +167,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -186,7 +186,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -213,7 +213,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -240,7 +240,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -272,7 +272,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_frient_water_leak_sensor.lua b/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_frient_water_leak_sensor.lua
index ba6361bc9d..ca8e05a95e 100644
--- a/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_frient_water_leak_sensor.lua
+++ b/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_frient_water_leak_sensor.lua
@@ -48,7 +48,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, TemperatureMeasurement.attributes.MeasuredValue:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -116,7 +116,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -135,7 +135,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -154,7 +154,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -173,7 +173,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -192,7 +192,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -219,7 +219,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -246,7 +246,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -278,7 +278,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_leaksmart_water.lua b/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_leaksmart_water.lua
index 140608bfcc..2abc5ab354 100644
--- a/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_leaksmart_water.lua
+++ b/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_leaksmart_water.lua
@@ -42,7 +42,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.waterSensor.water.wet()))
       end,
       {
-         min_api_version = 17
+         
       }
 )
 
@@ -54,7 +54,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.waterSensor.water.dry()))
       end,
       {
-         min_api_version = 17
+         
       }
 )
 
@@ -66,7 +66,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.waterSensor.water.dry()))
       end,
       {
-         min_api_version = 17
+         
       }
 )
 
@@ -78,7 +78,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.waterSensor.water.dry()))
       end,
       {
-         min_api_version = 17
+         
       }
 )
 
@@ -90,7 +90,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.waterSensor.water.dry()))
       end,
       {
-         min_api_version = 17
+         
       }
 )
 
@@ -103,7 +103,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -169,7 +169,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_samjin_water_leak_sensor.lua b/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_samjin_water_leak_sensor.lua
index 7b28197ad6..e859f59453 100644
--- a/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_samjin_water_leak_sensor.lua
+++ b/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_samjin_water_leak_sensor.lua
@@ -48,7 +48,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, TemperatureMeasurement.attributes.MeasuredValue:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -110,7 +110,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -129,7 +129,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -148,7 +148,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -175,7 +175,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -202,7 +202,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -234,7 +234,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_sengled_water_leak_sensor.lua b/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_sengled_water_leak_sensor.lua
index 1e7c70eba1..f50a489c95 100644
--- a/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_sengled_water_leak_sensor.lua
+++ b/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_sengled_water_leak_sensor.lua
@@ -45,7 +45,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, PowerConfiguration.attributes.BatteryVoltage:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -96,7 +96,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_sinope_zigbee_water.lua b/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_sinope_zigbee_water.lua
index 2a6fd6be79..af58ae4e90 100644
--- a/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_sinope_zigbee_water.lua
+++ b/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_sinope_zigbee_water.lua
@@ -48,7 +48,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -67,7 +67,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -86,7 +86,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -105,7 +105,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -124,7 +124,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -151,7 +151,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -170,7 +170,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -313,7 +313,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -376,7 +376,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_smartthings_water_leak_sensor.lua b/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_smartthings_water_leak_sensor.lua
index e550d7d246..e1a66d539f 100644
--- a/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_smartthings_water_leak_sensor.lua
+++ b/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_smartthings_water_leak_sensor.lua
@@ -48,7 +48,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, TemperatureMeasurement.attributes.MeasuredValue:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -110,7 +110,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -143,7 +143,7 @@ test.register_coroutine_test(
       end
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -170,7 +170,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -197,7 +197,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -229,7 +229,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_thirdreality_water_leak_sensor.lua b/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_thirdreality_water_leak_sensor.lua
index e3946056f4..a28470be32 100644
--- a/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_thirdreality_water_leak_sensor.lua
+++ b/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_thirdreality_water_leak_sensor.lua
@@ -43,7 +43,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({mock_device.id, Basic.attributes.ApplicationVersion:read(mock_device)})
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -56,7 +56,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, PowerConfiguration.attributes.BatteryPercentageRemaining:read(mock_device) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -81,7 +81,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -106,7 +106,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -131,7 +131,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -156,7 +156,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_zigbee_water.lua b/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_zigbee_water.lua
index bf6bb7c4a9..a85a7cc0b7 100644
--- a/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_zigbee_water.lua
+++ b/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_zigbee_water.lua
@@ -46,7 +46,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -73,7 +73,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -100,7 +100,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -127,7 +127,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -154,7 +154,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -184,7 +184,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -203,7 +203,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -346,7 +346,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -409,7 +409,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_zigbee_water_freeze.lua b/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_zigbee_water_freeze.lua
index a8e951661f..67b7f980a0 100644
--- a/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_zigbee_water_freeze.lua
+++ b/drivers/SmartThings/zigbee-water-leak-sensor/src/test/test_zigbee_water_freeze.lua
@@ -54,7 +54,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -78,7 +78,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -102,7 +102,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -226,7 +226,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -289,7 +289,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-watering-kit/src/test/test_thirdreality_watering_kit.lua b/drivers/SmartThings/zigbee-watering-kit/src/test/test_thirdreality_watering_kit.lua
index 53118b5bff..28c081a254 100644
--- a/drivers/SmartThings/zigbee-watering-kit/src/test/test_thirdreality_watering_kit.lua
+++ b/drivers/SmartThings/zigbee-watering-kit/src/test/test_thirdreality_watering_kit.lua
@@ -48,7 +48,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.mode.mode("0")))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -67,7 +67,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -86,7 +86,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -105,7 +105,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -124,7 +124,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -143,7 +143,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -162,7 +162,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -181,7 +181,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -198,7 +198,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.fanSpeed.fanSpeed(10)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -215,7 +215,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.fanSpeed.fanSpeed(30)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -232,7 +232,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.mode.mode("4")))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -244,7 +244,7 @@ test.register_coroutine_test(
     THIRDREALITY_WATERING_CLUSTER, WATERING_TIME_ATTR, 0x1407, data_types.Uint16, 20) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -256,7 +256,7 @@ test.register_coroutine_test(
     THIRDREALITY_WATERING_CLUSTER, WATERING_INTERVAL_ATTR, 0x1407, data_types.Uint8, 2) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -275,7 +275,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -294,7 +294,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -311,7 +311,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.fanSpeed.fanSpeed(0)))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_shade_battery_ikea.lua b/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_shade_battery_ikea.lua
index 26a08b1a84..c64116d7fa 100644
--- a/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_shade_battery_ikea.lua
+++ b/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_shade_battery_ikea.lua
@@ -56,7 +56,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -78,7 +78,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -100,7 +100,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -133,7 +133,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -186,7 +186,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -213,7 +213,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -232,7 +232,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -273,7 +273,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -312,7 +312,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -351,7 +351,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_shade_only_HOPOsmart.lua b/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_shade_only_HOPOsmart.lua
index 71dc5c81a4..6e4f26eb28 100644
--- a/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_shade_only_HOPOsmart.lua
+++ b/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_shade_only_HOPOsmart.lua
@@ -45,7 +45,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({mock_device.id, read_0x0000_messge})
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -69,7 +69,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -96,7 +96,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -118,7 +118,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -136,7 +136,7 @@ test.register_coroutine_test(
       capabilities.windowShade.windowShade.open()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -154,7 +154,7 @@ test.register_coroutine_test(
       capabilities.windowShade.windowShade.opening()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -172,7 +172,7 @@ test.register_coroutine_test(
       capabilities.windowShade.windowShade.closed()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -190,7 +190,7 @@ test.register_coroutine_test(
       capabilities.windowShade.windowShade.closing()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -208,7 +208,7 @@ test.register_coroutine_test(
       capabilities.windowShade.windowShade.partially_open()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment.lua b/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment.lua
index 145876ff64..119a19589e 100644
--- a/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment.lua
+++ b/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment.lua
@@ -55,7 +55,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -108,7 +108,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -132,7 +132,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -159,7 +159,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -181,7 +181,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -209,7 +209,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -272,7 +272,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -298,7 +298,7 @@ test.register_coroutine_test(
       })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -333,7 +333,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -367,7 +367,7 @@ test.register_coroutine_test(
       })
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -401,7 +401,7 @@ test.register_coroutine_test(
       })
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -456,7 +456,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -491,7 +491,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -526,7 +526,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -556,7 +556,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -588,7 +588,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_VWSDSTUST120H.lua b/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_VWSDSTUST120H.lua
index ecf2586a5c..8cfae4759b 100644
--- a/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_VWSDSTUST120H.lua
+++ b/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_VWSDSTUST120H.lua
@@ -51,7 +51,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({mock_device.id, read_0x0001_messge})
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -70,7 +70,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({mock_device.id, read_0x0001_messge})
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -94,7 +94,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -121,7 +121,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -143,7 +143,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -160,7 +160,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -177,7 +177,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -194,7 +194,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -211,7 +211,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -229,7 +229,7 @@ test.register_coroutine_test(
       capabilities.mode.mode("Delete upper limit")))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -247,7 +247,7 @@ test.register_coroutine_test(
       capabilities.mode.mode("Set the upper limit")))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -265,7 +265,7 @@ test.register_coroutine_test(
       capabilities.mode.mode("Delete lower limit")))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -283,7 +283,7 @@ test.register_coroutine_test(
       capabilities.mode.mode("Set the lower limit")))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -301,7 +301,7 @@ test.register_coroutine_test(
       capabilities.hardwareFault.hardwareFault.clear()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -319,7 +319,7 @@ test.register_coroutine_test(
       capabilities.hardwareFault.hardwareFault.detected()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -340,7 +340,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -361,7 +361,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_aqara.lua b/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_aqara.lua
index 08c71ec85a..363390a151 100644
--- a/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_aqara.lua
+++ b/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_aqara.lua
@@ -143,7 +143,7 @@ test.register_coroutine_test(
         PREF_SOFT_TOUCH_ON) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -178,7 +178,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -200,7 +200,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -222,7 +222,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -244,7 +244,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -263,7 +263,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -282,7 +282,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -301,7 +301,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -348,7 +348,7 @@ test.register_coroutine_test(
       deviceInitialization.initializedState.initialized()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -380,7 +380,7 @@ test.register_coroutine_test(
         PREF_SOFT_TOUCH_OFF) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -404,7 +404,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -434,7 +434,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -464,7 +464,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -494,7 +494,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -514,7 +514,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -544,7 +544,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -576,7 +576,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -609,7 +609,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -631,7 +631,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -653,7 +653,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_aqara_curtain_driver_e1.lua b/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_aqara_curtain_driver_e1.lua
index 0177c71467..442630da04 100644
--- a/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_aqara_curtain_driver_e1.lua
+++ b/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_aqara_curtain_driver_e1.lua
@@ -111,7 +111,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -158,7 +158,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -175,7 +175,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -190,7 +190,7 @@ test.register_coroutine_test(
       PRIVATE_CURTAIN_MANUAL_ATTRIBUTE_ID, MFG_CODE, data_types.Boolean, false) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -221,7 +221,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -250,7 +250,7 @@ test.register_coroutine_test(
     -- })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -280,7 +280,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -298,7 +298,7 @@ test.register_coroutine_test(
       PRIVATE_CURTAIN_LOCKING_SETTING_ATTRIBUTE_ID, MFG_CODE, data_types.Uint8, 0x01) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -316,7 +316,7 @@ test.register_coroutine_test(
       PRIVATE_CURTAIN_LOCKING_SETTING_ATTRIBUTE_ID, MFG_CODE, data_types.Uint8, 0x00) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -348,7 +348,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -368,7 +368,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -388,7 +388,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -407,7 +407,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -426,7 +426,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -445,7 +445,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_aqara_roller_shade_rotate.lua b/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_aqara_roller_shade_rotate.lua
index 3e1e013c38..7fa09eb967 100644
--- a/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_aqara_roller_shade_rotate.lua
+++ b/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_aqara_roller_shade_rotate.lua
@@ -116,7 +116,7 @@ test.register_coroutine_test(
         PREF_REVERSE_OFF) })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -151,7 +151,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -173,7 +173,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -195,7 +195,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -217,7 +217,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -246,7 +246,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -275,7 +275,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -294,7 +294,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -313,7 +313,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -333,7 +333,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -371,7 +371,7 @@ test.register_coroutine_test(
       initializedStateWithGuide.initializedStateWithGuide.initialized()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -395,7 +395,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -427,7 +427,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -446,7 +446,7 @@ test.register_coroutine_test(
       initializedStateWithGuide.initializedStateWithGuide.notInitialized()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -466,7 +466,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -507,7 +507,7 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_device.id, message })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_axis.lua b/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_axis.lua
index fb63dd121d..333eca0f9e 100644
--- a/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_axis.lua
+++ b/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_axis.lua
@@ -82,7 +82,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -123,7 +123,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -176,7 +176,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -204,7 +204,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -236,7 +236,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -264,7 +264,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -296,7 +296,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -336,7 +336,7 @@ test.register_coroutine_test(
       })
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -378,7 +378,7 @@ test.register_coroutine_test(
       })
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -406,7 +406,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -441,7 +441,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -469,7 +469,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -506,7 +506,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -541,7 +541,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -586,7 +586,7 @@ test.register_coroutine_test(
       })
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -624,7 +624,7 @@ test.register_coroutine_test(
       })
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -679,7 +679,7 @@ test.register_coroutine_test(
       test.socket.zigbee:__expect_send({ mock_device.id, WindowCovering.attributes.CurrentPositionLiftPercentage:read(mock_device) })
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_rooms.lua b/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_rooms.lua
index 9f80bfdc80..3749fbdd43 100644
--- a/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_rooms.lua
+++ b/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_rooms.lua
@@ -58,7 +58,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -80,7 +80,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -102,7 +102,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -124,7 +124,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -146,7 +146,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -169,7 +169,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -189,7 +189,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -209,7 +209,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -229,7 +229,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -251,7 +251,7 @@ test.register_coroutine_test(
       end
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -296,7 +296,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.windowShadeLevel.shadeLevel(100)))
    end,
    {
-      min_api_version = 17
+      
    }
 
   )
@@ -335,7 +335,7 @@ test.register_coroutine_test(
       })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -384,7 +384,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_screen_innovations.lua b/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_screen_innovations.lua
index a929eb4e98..17d8d61f76 100644
--- a/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_screen_innovations.lua
+++ b/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_screen_innovations.lua
@@ -64,7 +64,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -86,7 +86,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -115,7 +115,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -135,7 +135,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -155,7 +155,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -175,7 +175,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -196,7 +196,7 @@ test.register_coroutine_test(
       end
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -219,7 +219,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -271,7 +271,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -303,7 +303,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -346,7 +346,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -389,7 +389,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -432,7 +432,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -457,7 +457,7 @@ test.register_coroutine_test(
         test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
diff --git a/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_sombra.lua b/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_sombra.lua
index 35ab9eab24..febbfe6ea5 100644
--- a/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_sombra.lua
+++ b/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_sombra.lua
@@ -59,7 +59,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -81,7 +81,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -126,7 +126,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -171,7 +171,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -191,7 +191,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -211,7 +211,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -231,7 +231,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -253,7 +253,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -275,7 +275,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -295,7 +295,7 @@ test.register_coroutine_test(
       end
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -320,7 +320,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -343,7 +343,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -395,7 +395,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -427,7 +427,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_somfy.lua b/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_somfy.lua
index e772b46bb9..7e89c956ea 100644
--- a/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_somfy.lua
+++ b/drivers/SmartThings/zigbee-window-treatment/src/test/test_zigbee_window_treatment_somfy.lua
@@ -68,7 +68,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -121,7 +121,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -161,7 +161,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -243,7 +243,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -267,7 +267,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -294,7 +294,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -316,7 +316,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -344,7 +344,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -372,7 +372,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -400,7 +400,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -427,7 +427,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -448,7 +448,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -475,7 +475,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -500,7 +500,7 @@ test.register_coroutine_test(
       })
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -536,7 +536,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -561,7 +561,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -591,7 +591,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -621,7 +621,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -662,7 +662,7 @@ test.register_coroutine_test(
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
diff --git a/drivers/SmartThings/zwave-bulb/src/test/test_aeon_multiwhite_bulb.lua b/drivers/SmartThings/zwave-bulb/src/test/test_aeon_multiwhite_bulb.lua
index 8ef8ceea42..bfa897ff0f 100644
--- a/drivers/SmartThings/zwave-bulb/src/test/test_aeon_multiwhite_bulb.lua
+++ b/drivers/SmartThings/zwave-bulb/src/test/test_aeon_multiwhite_bulb.lua
@@ -62,7 +62,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -83,7 +83,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -107,7 +107,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -131,7 +131,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -157,7 +157,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -183,7 +183,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -207,7 +207,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -232,7 +232,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -257,7 +257,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -281,7 +281,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -313,7 +313,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -347,7 +347,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -379,7 +379,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -408,7 +408,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -438,7 +438,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -465,7 +465,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -493,7 +493,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -570,7 +570,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-bulb/src/test/test_aeotec_led_bulb_6.lua b/drivers/SmartThings/zwave-bulb/src/test/test_aeotec_led_bulb_6.lua
index faa5125ebe..d5c84cfd47 100644
--- a/drivers/SmartThings/zwave-bulb/src/test/test_aeotec_led_bulb_6.lua
+++ b/drivers/SmartThings/zwave-bulb/src/test/test_aeotec_led_bulb_6.lua
@@ -105,7 +105,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -159,7 +159,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -188,7 +188,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
diff --git a/drivers/SmartThings/zwave-bulb/src/test/test_fibaro_rgbw_controller.lua b/drivers/SmartThings/zwave-bulb/src/test/test_fibaro_rgbw_controller.lua
index 0fc5140c4e..9b8bb081bd 100644
--- a/drivers/SmartThings/zwave-bulb/src/test/test_fibaro_rgbw_controller.lua
+++ b/drivers/SmartThings/zwave-bulb/src/test/test_fibaro_rgbw_controller.lua
@@ -99,7 +99,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -170,7 +170,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -202,7 +202,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -234,7 +234,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -265,7 +265,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -297,7 +297,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -321,7 +321,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -349,7 +349,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -398,7 +398,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -478,7 +478,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -509,7 +509,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -540,7 +540,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
diff --git a/drivers/SmartThings/zwave-bulb/src/test/test_zwave_bulb.lua b/drivers/SmartThings/zwave-bulb/src/test/test_zwave_bulb.lua
index a658806774..5ac3ca4004 100644
--- a/drivers/SmartThings/zwave-bulb/src/test/test_zwave_bulb.lua
+++ b/drivers/SmartThings/zwave-bulb/src/test/test_zwave_bulb.lua
@@ -100,7 +100,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -133,7 +133,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -161,7 +161,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -195,7 +195,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -228,7 +228,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -263,7 +263,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -315,7 +315,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -386,7 +386,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -431,7 +431,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -479,7 +479,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
   )
 end
diff --git a/drivers/SmartThings/zwave-button/src/test/test_zwave_aeotec_nanomote_one.lua b/drivers/SmartThings/zwave-button/src/test/test_zwave_aeotec_nanomote_one.lua
index 7df9c6cada..b28edce5b6 100644
--- a/drivers/SmartThings/zwave-button/src/test/test_zwave_aeotec_nanomote_one.lua
+++ b/drivers/SmartThings/zwave-button/src/test/test_zwave_aeotec_nanomote_one.lua
@@ -58,7 +58,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-button/src/test/test_zwave_button.lua b/drivers/SmartThings/zwave-button/src/test/test_zwave_button.lua
index 664d048010..75df4121e7 100644
--- a/drivers/SmartThings/zwave-button/src/test/test_zwave_button.lua
+++ b/drivers/SmartThings/zwave-button/src/test/test_zwave_button.lua
@@ -49,7 +49,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -68,7 +68,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -89,7 +89,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -110,7 +110,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -141,7 +141,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -173,7 +173,7 @@ test.register_coroutine_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-button/src/test/test_zwave_fibaro_button.lua b/drivers/SmartThings/zwave-button/src/test/test_zwave_fibaro_button.lua
index 5418917ee5..e205c59eec 100644
--- a/drivers/SmartThings/zwave-button/src/test/test_zwave_fibaro_button.lua
+++ b/drivers/SmartThings/zwave-button/src/test/test_zwave_fibaro_button.lua
@@ -57,7 +57,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-button/src/test/test_zwave_multi_button.lua b/drivers/SmartThings/zwave-button/src/test/test_zwave_multi_button.lua
index b88a85a800..3354dfd658 100644
--- a/drivers/SmartThings/zwave-button/src/test/test_zwave_multi_button.lua
+++ b/drivers/SmartThings/zwave-button/src/test/test_zwave_multi_button.lua
@@ -108,7 +108,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -137,7 +137,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -163,7 +163,7 @@ test.register_coroutine_test(
       capabilities.button.button.double({state_change = true})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -192,7 +192,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -221,7 +221,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -247,7 +247,7 @@ test.register_coroutine_test(
       capabilities.button.button.double({state_change = true})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -276,7 +276,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -305,7 +305,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -334,7 +334,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -359,7 +359,7 @@ test.register_coroutine_test(
       capabilities.button.button.held({state_change = true})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -378,7 +378,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -408,7 +408,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -437,7 +437,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -466,7 +466,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -495,7 +495,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -520,7 +520,7 @@ test.register_coroutine_test(
     mock_aeotec_keyfob_button:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -608,7 +608,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -649,7 +649,7 @@ test.register_coroutine_test(
     mock_fibaro_keyfob_button:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -765,7 +765,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -853,7 +853,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -913,7 +913,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -942,7 +942,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-electric-meter/src/test/test_aeon_meter.lua b/drivers/SmartThings/zwave-electric-meter/src/test/test_aeon_meter.lua
index 391b3b2b0d..d94dd49a0e 100644
--- a/drivers/SmartThings/zwave-electric-meter/src/test/test_aeon_meter.lua
+++ b/drivers/SmartThings/zwave-electric-meter/src/test/test_aeon_meter.lua
@@ -54,7 +54,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -76,7 +76,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -107,7 +107,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -139,7 +139,7 @@ test.register_coroutine_test(
       mock_meter:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-electric-meter/src/test/test_aeotec_gen5_meter.lua b/drivers/SmartThings/zwave-electric-meter/src/test/test_aeotec_gen5_meter.lua
index 016aff4061..3a29a181ef 100644
--- a/drivers/SmartThings/zwave-electric-meter/src/test/test_aeotec_gen5_meter.lua
+++ b/drivers/SmartThings/zwave-electric-meter/src/test/test_aeotec_gen5_meter.lua
@@ -54,7 +54,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -76,7 +76,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -107,7 +107,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -143,7 +143,7 @@ test.register_coroutine_test(
       mock_meter:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-electric-meter/src/test/test_qubino_3_phase_meter.lua b/drivers/SmartThings/zwave-electric-meter/src/test/test_qubino_3_phase_meter.lua
index ce9b61f949..daed449010 100644
--- a/drivers/SmartThings/zwave-electric-meter/src/test/test_qubino_3_phase_meter.lua
+++ b/drivers/SmartThings/zwave-electric-meter/src/test/test_qubino_3_phase_meter.lua
@@ -96,7 +96,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -118,7 +118,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -180,7 +180,7 @@ test.register_coroutine_test(
 
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -222,7 +222,7 @@ test.register_coroutine_test(
       mock_meter:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-electric-meter/src/test/test_qubino_smart_meter.lua b/drivers/SmartThings/zwave-electric-meter/src/test/test_qubino_smart_meter.lua
index d96d90aae1..1249909d08 100644
--- a/drivers/SmartThings/zwave-electric-meter/src/test/test_qubino_smart_meter.lua
+++ b/drivers/SmartThings/zwave-electric-meter/src/test/test_qubino_smart_meter.lua
@@ -54,7 +54,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -76,7 +76,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -107,7 +107,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -127,7 +127,7 @@ test.register_coroutine_test(
       mock_meter:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-electric-meter/src/test/test_zwave_electric_meter.lua b/drivers/SmartThings/zwave-electric-meter/src/test/test_zwave_electric_meter.lua
index 4df103e086..a7a521587f 100644
--- a/drivers/SmartThings/zwave-electric-meter/src/test/test_zwave_electric_meter.lua
+++ b/drivers/SmartThings/zwave-electric-meter/src/test/test_zwave_electric_meter.lua
@@ -47,7 +47,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -69,7 +69,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -100,7 +100,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
diff --git a/drivers/SmartThings/zwave-fan/src/test/test_zwave_fan_3_speed.lua b/drivers/SmartThings/zwave-fan/src/test/test_zwave_fan_3_speed.lua
index 534c48698e..dca395ed84 100644
--- a/drivers/SmartThings/zwave-fan/src/test/test_zwave_fan_3_speed.lua
+++ b/drivers/SmartThings/zwave-fan/src/test/test_zwave_fan_3_speed.lua
@@ -64,7 +64,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -96,7 +96,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -129,7 +129,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -160,7 +160,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -194,7 +194,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-fan/src/test/test_zwave_fan_4_speed.lua b/drivers/SmartThings/zwave-fan/src/test/test_zwave_fan_4_speed.lua
index 80ccef948b..33b99388a6 100644
--- a/drivers/SmartThings/zwave-fan/src/test/test_zwave_fan_4_speed.lua
+++ b/drivers/SmartThings/zwave-fan/src/test/test_zwave_fan_4_speed.lua
@@ -63,7 +63,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -94,7 +94,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -127,7 +127,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -158,7 +158,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -192,7 +192,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-garage-door-opener/src/test/test_ecolink_garage_door_operator.lua b/drivers/SmartThings/zwave-garage-door-opener/src/test/test_ecolink_garage_door_operator.lua
index 0608ca2ef2..0b389a7ca7 100644
--- a/drivers/SmartThings/zwave-garage-door-opener/src/test/test_ecolink_garage_door_operator.lua
+++ b/drivers/SmartThings/zwave-garage-door-opener/src/test/test_ecolink_garage_door_operator.lua
@@ -59,7 +59,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -78,7 +78,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -120,7 +120,7 @@ test.register_message_test(
   {
     test_init = test_init,
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -160,7 +160,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -183,7 +183,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -206,7 +206,7 @@ test.register_message_test(
           }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -234,7 +234,7 @@ test.register_coroutine_test(
       mock_garage_door:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -264,7 +264,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -294,7 +294,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -311,7 +311,7 @@ test.register_coroutine_test(
       test.mock_time.advance_time(1)
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -328,7 +328,7 @@ test.register_coroutine_test(
       test.mock_time.advance_time(1)
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
diff --git a/drivers/SmartThings/zwave-garage-door-opener/src/test/test_mimolite_garage_door.lua b/drivers/SmartThings/zwave-garage-door-opener/src/test/test_mimolite_garage_door.lua
index cc33391a4c..e504731e01 100644
--- a/drivers/SmartThings/zwave-garage-door-opener/src/test/test_mimolite_garage_door.lua
+++ b/drivers/SmartThings/zwave-garage-door-opener/src/test/test_mimolite_garage_door.lua
@@ -59,7 +59,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -83,7 +83,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -107,7 +107,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -131,7 +131,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -155,7 +155,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -179,7 +179,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -213,7 +213,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -247,7 +247,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -277,7 +277,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -307,7 +307,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -327,7 +327,7 @@ test.register_coroutine_test(
       mock_garage_door:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -350,7 +350,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 test.run_registered_tests()
diff --git a/drivers/SmartThings/zwave-garage-door-opener/src/test/test_zwave_garage_door_opener.lua b/drivers/SmartThings/zwave-garage-door-opener/src/test/test_zwave_garage_door_opener.lua
index 0d5da468e8..2f17244124 100644
--- a/drivers/SmartThings/zwave-garage-door-opener/src/test/test_zwave_garage_door_opener.lua
+++ b/drivers/SmartThings/zwave-garage-door-opener/src/test/test_zwave_garage_door_opener.lua
@@ -50,7 +50,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -69,7 +69,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -93,7 +93,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -117,7 +117,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -136,7 +136,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -156,7 +156,7 @@ test.register_message_test(
   },
   {
     test_init = test_init,
-    min_api_version = 17
+    
   }
 )
 
@@ -177,7 +177,7 @@ test.register_message_test(
   {
     test_init = test_init,
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
diff --git a/drivers/SmartThings/zwave-lock/src/test/test_keywe_lock.lua b/drivers/SmartThings/zwave-lock/src/test/test_keywe_lock.lua
index 6724094462..2b9d2d3d72 100644
--- a/drivers/SmartThings/zwave-lock/src/test/test_keywe_lock.lua
+++ b/drivers/SmartThings/zwave-lock/src/test/test_keywe_lock.lua
@@ -89,6 +89,9 @@ test.register_coroutine_test(
     test.socket.zwave:__queue_receive({ mock_device.id, Notification:Report({notification_type = 6, event = 25}) } )
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.lock.lock.locked({data={method="manual"}})))
   end
-)
+,
+    {
+      min_api_version = 17
+    })
 
 test.run_registered_tests()
diff --git a/drivers/SmartThings/zwave-lock/src/test/test_keywe_lock_legacy.lua b/drivers/SmartThings/zwave-lock/src/test/test_keywe_lock_legacy.lua
index a5c7aee7d4..77d9f0216c 100644
--- a/drivers/SmartThings/zwave-lock/src/test/test_keywe_lock_legacy.lua
+++ b/drivers/SmartThings/zwave-lock/src/test/test_keywe_lock_legacy.lua
@@ -46,7 +46,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.lock.lock.unlocked()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -59,7 +59,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.lock.lock.locked()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-lock/src/test/test_lock_battery.lua b/drivers/SmartThings/zwave-lock/src/test/test_lock_battery.lua
index d9642851e1..cd7d5599d8 100644
--- a/drivers/SmartThings/zwave-lock/src/test/test_lock_battery.lua
+++ b/drivers/SmartThings/zwave-lock/src/test/test_lock_battery.lua
@@ -60,7 +60,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.lock.lock.unlocked()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -79,7 +79,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -98,7 +98,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -115,7 +115,7 @@ test.register_coroutine_test(
     test.socket.zwave:__expect_send(DoorLock:OperationGet({}):build_test_tx(mock_device.id))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -136,7 +136,7 @@ test.register_coroutine_test(
     }):build_test_tx(mock_device.id))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -157,7 +157,7 @@ test.register_coroutine_test(
     }):build_test_tx(mock_device.id))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-lock/src/test/test_lock_credentials_commands.lua b/drivers/SmartThings/zwave-lock/src/test/test_lock_credentials_commands.lua
index 96b192a03d..5daee2191a 100644
--- a/drivers/SmartThings/zwave-lock/src/test/test_lock_credentials_commands.lua
+++ b/drivers/SmartThings/zwave-lock/src/test/test_lock_credentials_commands.lua
@@ -175,7 +175,10 @@ test.register_coroutine_test(
         ))
     )
     test.wait_for_events()
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -200,7 +203,10 @@ test.register_coroutine_test(
         ))
     )
     test.wait_for_events()
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -229,7 +235,10 @@ test.register_coroutine_test(
         ))
     )
     test.wait_for_events()
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 -- ============================================================================
@@ -253,7 +262,10 @@ test.register_coroutine_test(
         ))
     )
     test.wait_for_events()
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -275,7 +287,10 @@ test.register_coroutine_test(
         ))
     )
     test.wait_for_events()
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -297,7 +312,10 @@ test.register_coroutine_test(
         ))
     )
     test.wait_for_events()
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 -- ============================================================================
@@ -321,7 +339,10 @@ test.register_coroutine_test(
         ))
     )
     test.wait_for_events()
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -341,7 +362,10 @@ test.register_coroutine_test(
         ))
     )
     test.wait_for_events()
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -363,7 +387,10 @@ test.register_coroutine_test(
         ))
     )
     test.wait_for_events()
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -385,7 +412,10 @@ test.register_coroutine_test(
         ))
     )
     test.wait_for_events()
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 -- ============================================================================
@@ -423,7 +453,10 @@ test.register_coroutine_test(
         ))
     )
     test.wait_for_events()
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -445,7 +478,10 @@ test.register_coroutine_test(
         ))
     )
     test.wait_for_events()
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.register_coroutine_test(
@@ -474,7 +510,10 @@ test.register_coroutine_test(
         ))
     )
     test.wait_for_events()
-  end
+  end,
+  {
+    min_api_version = 15
+  }
 )
 
 test.run_registered_tests()
diff --git a/drivers/SmartThings/zwave-lock/src/test/test_lock_pre_configured.lua b/drivers/SmartThings/zwave-lock/src/test/test_lock_pre_configured.lua
index 0895ff3215..ef264e0c88 100644
--- a/drivers/SmartThings/zwave-lock/src/test/test_lock_pre_configured.lua
+++ b/drivers/SmartThings/zwave-lock/src/test/test_lock_pre_configured.lua
@@ -205,7 +205,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 -- ============================================================================
 -- updateUser — pre-configured device
@@ -240,7 +243,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test(
   "updateUser (pre-configured): returns failure for a userIndex that does not exist",
@@ -273,7 +279,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 -- ============================================================================
 -- deleteUser with associated credential — exercises clear_pin_code_response
@@ -324,7 +333,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 -- ============================================================================
 -- addCredential response states — set_pin_code_response
@@ -365,7 +377,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test(
   "addCredential (pre-configured): emits duplicate when the lock rejects with DUPLICATE_CODE",
@@ -392,7 +407,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test(
   "addCredential (pre-configured): emits failure when the lock returns available",
@@ -419,7 +437,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 -- ============================================================================
 -- updateCredential response states — set_pin_code_response
@@ -450,7 +471,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test(
   "updateCredential (pre-configured): returns failure immediately for a non-existent credentialIndex",
@@ -472,7 +496,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 -- ============================================================================
 -- deleteCredential standalone (lockCredentials.DELETE path)
@@ -509,6 +536,9 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.run_registered_tests()
diff --git a/drivers/SmartThings/zwave-lock/src/test/test_lock_users_commands.lua b/drivers/SmartThings/zwave-lock/src/test/test_lock_users_commands.lua
index da39c8c692..21c829c497 100644
--- a/drivers/SmartThings/zwave-lock/src/test/test_lock_users_commands.lua
+++ b/drivers/SmartThings/zwave-lock/src/test/test_lock_users_commands.lua
@@ -192,7 +192,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test(
   "addUser: assigns the next sequential userIndex when users already exist",
@@ -223,7 +226,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test(
   "addUser: fills a gap left by a deleted user rather than appending beyond max",
@@ -259,7 +265,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test(
   "addUser: returns resourceExhausted when totalUsersSupported has been reached",
@@ -284,7 +293,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 -- ============================================================================
 -- updateUser
@@ -322,7 +334,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test(
   "updateUser: creates user when userIndex does not exist",
@@ -352,7 +367,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test(
   "updateUser: can change a user's type as well as name",
@@ -380,7 +398,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 -- ============================================================================
 -- deleteUser (no associated credential — pure local delete)
@@ -415,7 +436,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test(
   "deleteUser: returns failure when the target userIndex is not in the users table",
@@ -435,7 +459,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 -- ============================================================================
 -- deleteAllUsers  (injects deleteAllCredentials → ClearAllPINCodes z-wave flow)
@@ -495,7 +522,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test(
   "deleteAllUsers: emits busy when another lock command is in progress",
@@ -517,7 +547,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 -- ============================================================================
 -- State-consistency: add → delete → re-add (indices 1, 2, 3 lifecycle)
@@ -590,7 +623,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test(
   "State-consistency: add users+credentials 1-3, deleteUser 2 (with credential), re-add user+credential reclaims index 2 cleanly",
@@ -700,6 +736,9 @@ test.register_coroutine_test(
     }) == constants.COMMAND_RESULT.SUCCESS)
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.run_registered_tests()
diff --git a/drivers/SmartThings/zwave-lock/src/test/test_samsung_lock_legacy.lua b/drivers/SmartThings/zwave-lock/src/test/test_samsung_lock_legacy.lua
index 81ba1df2ad..8a4e5f5c1f 100644
--- a/drivers/SmartThings/zwave-lock/src/test/test_samsung_lock_legacy.lua
+++ b/drivers/SmartThings/zwave-lock/src/test/test_samsung_lock_legacy.lua
@@ -51,7 +51,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -97,7 +97,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -114,7 +114,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.lockCodes.codeChanged("2 failed", { state_change = true })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -131,7 +131,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.lockCodes.codeChanged(2 .. " failed", { state_change = true })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -176,7 +176,7 @@ test.register_coroutine_test(
     ))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-lock/src/test/test_schlage_lock_legacy.lua b/drivers/SmartThings/zwave-lock/src/test/test_schlage_lock_legacy.lua
index 38dabbd9dd..e05e7b8423 100644
--- a/drivers/SmartThings/zwave-lock/src/test/test_schlage_lock_legacy.lua
+++ b/drivers/SmartThings/zwave-lock/src/test/test_schlage_lock_legacy.lua
@@ -77,7 +77,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -97,7 +97,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -116,7 +116,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -148,7 +148,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -167,7 +167,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -204,7 +204,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -232,7 +232,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -259,7 +259,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-lock/src/test/test_zwave_lock_legacy.lua b/drivers/SmartThings/zwave-lock/src/test/test_zwave_lock_legacy.lua
index 66038d0760..58e49357cb 100644
--- a/drivers/SmartThings/zwave-lock/src/test/test_zwave_lock_legacy.lua
+++ b/drivers/SmartThings/zwave-lock/src/test/test_zwave_lock_legacy.lua
@@ -62,7 +62,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.lock.lock.locked()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -81,7 +81,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -105,7 +105,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -137,7 +137,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -162,7 +162,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -179,7 +179,7 @@ test.register_coroutine_test(
     test.socket.zwave:__expect_send(DoorLock:OperationGet({}):build_test_tx(mock_device.id))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -198,7 +198,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -209,7 +209,7 @@ test.register_coroutine_test(
     expect_reload_all_codes_messages()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -228,7 +228,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -244,7 +244,7 @@ test.register_coroutine_test(
     test.socket.zwave:__expect_send(UserCode:Get( {user_identifier = 1}):build_test_tx(mock_device.id))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -264,7 +264,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -289,7 +289,7 @@ test.register_coroutine_test(
             {state_change = true})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -316,7 +316,7 @@ test.register_coroutine_test(
     test.wait_for_events()
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -341,7 +341,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -371,7 +371,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -395,7 +395,7 @@ test.register_coroutine_test(
     ))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -438,7 +438,7 @@ test.register_coroutine_test(
     ))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -463,7 +463,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -488,7 +488,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -519,7 +519,7 @@ test.register_coroutine_test(
     ))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -754,7 +754,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -779,7 +779,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -808,7 +808,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-lock/src/test/test_zwave_responses.lua b/drivers/SmartThings/zwave-lock/src/test/test_zwave_responses.lua
index 71bf25209d..24db26a3ba 100644
--- a/drivers/SmartThings/zwave-lock/src/test/test_zwave_responses.lua
+++ b/drivers/SmartThings/zwave-lock/src/test/test_zwave_responses.lua
@@ -100,7 +100,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test(
   "user_code_report: sync completes when the last slot is reached",
@@ -140,7 +143,10 @@ test.register_coroutine_test(
     assert(mock_device:get_field(constants.DRIVER_STATE.BUSY) == false,
       "BUSY must be false after sync completes")
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test(
   "user_code_report: out-of-band ENABLED code creates user and credential entries",
@@ -173,7 +179,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 -- ============================================================================
 -- user_code_event_handler (ACCESS_CONTROL Notification:Report)
@@ -208,7 +217,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test(
   "user_code_event: multi-byte event_parameter uses byte 3 to extract user_id",
@@ -239,7 +251,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 -- ============================================================================
 -- door_operation_event_handler (ACCESS_CONTROL Notification:Report)
@@ -279,7 +294,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test(
   "door_operation_event: KEYPAD_UNLOCK_OPERATION with unknown credential sets userIndex from event_parameter",
@@ -306,7 +324,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test(
   "door_operation_event: AUTO_LOCK_LOCKED_OPERATION emits locked with auto method",
@@ -327,7 +348,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 -- ============================================================================
 -- DoorLock:OperationReport → lock state
@@ -346,7 +370,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.register_coroutine_test(
   "OperationReport: DOOR_UNSECURED emits unlocked event",
@@ -360,7 +387,10 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 -- ============================================================================
 -- users_number_report: UserCode:UsersNumberReport
@@ -388,6 +418,9 @@ test.register_coroutine_test(
     )
     test.wait_for_events()
   end
-)
+,
+    {
+      min_api_version = 15
+    })
 
 test.run_registered_tests()
diff --git a/drivers/SmartThings/zwave-mouse-trap/src/test/test_zwave_mouse_trap.lua b/drivers/SmartThings/zwave-mouse-trap/src/test/test_zwave_mouse_trap.lua
index 519f577c86..8dc0ee58c3 100644
--- a/drivers/SmartThings/zwave-mouse-trap/src/test/test_zwave_mouse_trap.lua
+++ b/drivers/SmartThings/zwave-mouse-trap/src/test/test_zwave_mouse_trap.lua
@@ -67,7 +67,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -89,7 +89,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -111,7 +111,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -133,7 +133,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -155,7 +155,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -177,7 +177,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -199,7 +199,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -221,7 +221,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -243,7 +243,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -262,7 +262,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -281,7 +281,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -335,7 +335,7 @@ test.register_coroutine_test(
       mock_mouse_trap:expect_metadata_update({provisioning_state = "PROVISIONED"})
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_aeon_multisensor.lua b/drivers/SmartThings/zwave-sensor/src/test/test_aeon_multisensor.lua
index 472932fdfb..4b79c96e23 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_aeon_multisensor.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_aeon_multisensor.lua
@@ -83,7 +83,7 @@ test.register_coroutine_test(
       mock_sensor:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -108,7 +108,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_aeotec_multisensor_6.lua b/drivers/SmartThings/zwave-sensor/src/test/test_aeotec_multisensor_6.lua
index 323c0d4807..c3c05a4672 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_aeotec_multisensor_6.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_aeotec_multisensor_6.lua
@@ -108,7 +108,7 @@ test.register_coroutine_test(
       mock_sensor:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -159,7 +159,7 @@ test.register_coroutine_test(
 
       end,
       {
-         min_api_version = 17
+         
       }
 )
 test.register_coroutine_test(
@@ -231,7 +231,7 @@ test.register_coroutine_test(
 
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -253,7 +253,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -288,7 +288,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -323,7 +323,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -345,7 +345,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -369,7 +369,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -405,7 +405,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -429,7 +429,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -454,7 +454,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_aeotec_multisensor_7.lua b/drivers/SmartThings/zwave-sensor/src/test/test_aeotec_multisensor_7.lua
index 13442ec635..c082e1361e 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_aeotec_multisensor_7.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_aeotec_multisensor_7.lua
@@ -110,7 +110,7 @@ test.register_coroutine_test(
       mock_sensor:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -159,7 +159,7 @@ test.register_coroutine_test(
 
       end,
       {
-         min_api_version = 17
+         
       }
 )
 test.register_coroutine_test(
@@ -229,7 +229,7 @@ test.register_coroutine_test(
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -251,7 +251,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -286,7 +286,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -321,7 +321,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_aeotec_multisensor_gen5.lua b/drivers/SmartThings/zwave-sensor/src/test/test_aeotec_multisensor_gen5.lua
index b6ede32bd5..b7f15e6bf8 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_aeotec_multisensor_gen5.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_aeotec_multisensor_gen5.lua
@@ -98,7 +98,7 @@ test.register_coroutine_test(
       mock_sensor:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_aeotec_water_sensor.lua b/drivers/SmartThings/zwave-sensor/src/test/test_aeotec_water_sensor.lua
index e38ce96f37..4a6b3270cc 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_aeotec_water_sensor.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_aeotec_water_sensor.lua
@@ -78,7 +78,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -97,7 +97,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -116,7 +116,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -138,7 +138,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -160,7 +160,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -182,7 +182,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -204,7 +204,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -223,7 +223,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -245,7 +245,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -267,7 +267,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -289,7 +289,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -311,7 +311,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_aeotec_water_sensor_7.lua b/drivers/SmartThings/zwave-sensor/src/test/test_aeotec_water_sensor_7.lua
index 0f3dc972de..44313466e9 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_aeotec_water_sensor_7.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_aeotec_water_sensor_7.lua
@@ -52,7 +52,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -74,7 +74,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -96,7 +96,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -118,7 +118,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -140,7 +140,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -168,7 +168,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_sensor:generate_test_message("main", capabilities.tamperAlert.tamper.clear()))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_enerwave_motion_sensor.lua b/drivers/SmartThings/zwave-sensor/src/test/test_enerwave_motion_sensor.lua
index 3559656e3a..41ace3d091 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_enerwave_motion_sensor.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_enerwave_motion_sensor.lua
@@ -53,7 +53,7 @@ test.register_coroutine_test(
       mock_sensor:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -76,7 +76,7 @@ test.register_coroutine_test(
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -98,7 +98,7 @@ test.register_coroutine_test(
 
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_everpsring_sp817.lua b/drivers/SmartThings/zwave-sensor/src/test/test_everpsring_sp817.lua
index a33f9b97ec..ebcb8e6234 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_everpsring_sp817.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_everpsring_sp817.lua
@@ -51,7 +51,7 @@ test.register_coroutine_test(
       mock_sensor:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -88,7 +88,7 @@ test.register_coroutine_test(
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_everspring_PIR_sensor.lua b/drivers/SmartThings/zwave-sensor/src/test/test_everspring_PIR_sensor.lua
index 8479a5f74f..022f44e071 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_everspring_PIR_sensor.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_everspring_PIR_sensor.lua
@@ -58,7 +58,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -81,7 +81,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -108,7 +108,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_sensor:generate_test_message("main", capabilities.tamperAlert.tamper.clear()))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -130,7 +130,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -153,7 +153,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -203,7 +203,7 @@ test.register_coroutine_test(
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_everspring_ST814.lua b/drivers/SmartThings/zwave-sensor/src/test/test_everspring_ST814.lua
index 3c288c0be4..3b7ba96a1e 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_everspring_ST814.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_everspring_ST814.lua
@@ -50,7 +50,7 @@ test.register_coroutine_test(
       mock_sensor:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_everspring_illuminance_sensor.lua b/drivers/SmartThings/zwave-sensor/src/test/test_everspring_illuminance_sensor.lua
index ab124e8f80..a79312b00e 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_everspring_illuminance_sensor.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_everspring_illuminance_sensor.lua
@@ -54,7 +54,7 @@ test.register_coroutine_test(
       mock_sensor:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_everspring_motion_light_sensor.lua b/drivers/SmartThings/zwave-sensor/src/test/test_everspring_motion_light_sensor.lua
index 0a31f97de5..3b5f4880d4 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_everspring_motion_light_sensor.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_everspring_motion_light_sensor.lua
@@ -66,7 +66,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_ezmultipli_multipurpose_sensor.lua b/drivers/SmartThings/zwave-sensor/src/test/test_ezmultipli_multipurpose_sensor.lua
index fb2138c0d5..b2e105bc0a 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_ezmultipli_multipurpose_sensor.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_ezmultipli_multipurpose_sensor.lua
@@ -52,7 +52,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -81,7 +81,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -119,7 +119,7 @@ do
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -159,7 +159,7 @@ do
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -293,7 +293,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_door_window_sensor.lua b/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_door_window_sensor.lua
index 05e306b6c7..528134284e 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_door_window_sensor.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_door_window_sensor.lua
@@ -73,7 +73,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -97,7 +97,7 @@ test.register_coroutine_test(
       mock_fibaro_door_window_sensor:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -116,7 +116,7 @@ test.register_message_test(
    }
  },
  {
-    min_api_version = 17
+    
  }
 )
 
@@ -138,7 +138,7 @@ test.register_message_test(
    }
  },
  {
-    min_api_version = 17
+    
  }
 )
 
@@ -160,7 +160,7 @@ test.register_message_test(
    }
  },
  {
-    min_api_version = 17
+    
  }
 )
 
@@ -183,7 +183,7 @@ test.register_message_test(
    }
  },
  {
-    min_api_version = 17
+    
  }
 )
 
@@ -205,7 +205,7 @@ test.register_message_test(
    }
  },
  {
-    min_api_version = 17
+    
  }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_door_window_sensor_1.lua b/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_door_window_sensor_1.lua
index 6707dd7ae0..e6fcf16ce3 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_door_window_sensor_1.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_door_window_sensor_1.lua
@@ -121,7 +121,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -210,7 +210,7 @@ test.register_coroutine_test(
       mock_fibaro_door_window_sensor1:expect_metadata_update({provisioning_state = "PROVISIONED"})
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -229,7 +229,7 @@ test.register_message_test(
    }
  },
  {
-    min_api_version = 17
+    
  }
 )
 
@@ -251,7 +251,7 @@ test.register_message_test(
    }
  },
  {
-    min_api_version = 17
+    
  }
 )
 
@@ -273,7 +273,7 @@ test.register_message_test(
    }
  },
  {
-    min_api_version = 17
+    
  }
 )
 
@@ -300,7 +300,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -327,7 +327,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -349,7 +349,7 @@ test.register_message_test(
    }
  },
  {
-    min_api_version = 17
+    
  }
 )
 
@@ -370,7 +370,7 @@ test.register_message_test(
    }
  },
  {
-    min_api_version = 17
+    
  }
 )
 
@@ -401,7 +401,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -431,7 +431,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_door_window_sensor_2.lua b/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_door_window_sensor_2.lua
index 8fd23b208b..9a01eb7d32 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_door_window_sensor_2.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_door_window_sensor_2.lua
@@ -59,7 +59,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -81,7 +81,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -103,7 +103,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -125,7 +125,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -147,7 +147,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -169,7 +169,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -191,7 +191,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -308,7 +308,7 @@ test.register_coroutine_test(
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -349,7 +349,7 @@ test.register_coroutine_test(
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -385,7 +385,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_door_window_sensor_with_temperature.lua b/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_door_window_sensor_with_temperature.lua
index 4d3e6e0660..c6d06b9a63 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_door_window_sensor_with_temperature.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_door_window_sensor_with_temperature.lua
@@ -85,7 +85,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -113,7 +113,7 @@ test.register_coroutine_test(
       mock_fibaro_door_window_sensor:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -132,7 +132,7 @@ test.register_message_test(
    }
  },
  {
-    min_api_version = 17
+    
  }
 )
 
@@ -154,7 +154,7 @@ test.register_message_test(
    }
  },
  {
-    min_api_version = 17
+    
  }
 )
 
@@ -176,7 +176,7 @@ test.register_message_test(
    }
  },
  {
-    min_api_version = 17
+    
  }
 )
 
@@ -199,7 +199,7 @@ test.register_message_test(
    }
  },
  {
-    min_api_version = 17
+    
  }
 )
 
@@ -221,7 +221,7 @@ test.register_message_test(
    }
  },
  {
-    min_api_version = 17
+    
  }
 )
 
@@ -252,7 +252,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -282,7 +282,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -559,7 +559,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_flood_sensor.lua b/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_flood_sensor.lua
index 0ac7e57418..4f1ae2e741 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_flood_sensor.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_flood_sensor.lua
@@ -54,7 +54,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -73,7 +73,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -94,7 +94,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -115,7 +115,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -145,7 +145,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -167,7 +167,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -189,7 +189,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -216,7 +216,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_sensor:generate_test_message("main", capabilities.tamperAlert.tamper.clear()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -243,7 +243,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_sensor:generate_test_message("main", capabilities.tamperAlert.tamper.clear()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -270,7 +270,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_sensor:generate_test_message("main", capabilities.tamperAlert.tamper.clear()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -297,7 +297,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_sensor:generate_test_message("main", capabilities.tamperAlert.tamper.clear()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -328,7 +328,7 @@ test.register_coroutine_test(
     mock_sensor:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_flood_sensor_zw5.lua b/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_flood_sensor_zw5.lua
index 530d1c03bb..8f72ef1a3f 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_flood_sensor_zw5.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_flood_sensor_zw5.lua
@@ -82,7 +82,7 @@ test.register_coroutine_test(
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_motion_sensor.lua b/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_motion_sensor.lua
index 3dbfd89bc7..1467c65629 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_motion_sensor.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_motion_sensor.lua
@@ -87,7 +87,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -106,7 +106,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -133,7 +133,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -155,7 +155,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -177,7 +177,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -199,7 +199,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -221,7 +221,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -244,7 +244,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -266,7 +266,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -288,7 +288,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -315,7 +315,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -346,7 +346,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -376,7 +376,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_motion_sensor_zw5.lua b/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_motion_sensor_zw5.lua
index ac2022e069..dd39aef728 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_motion_sensor_zw5.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_motion_sensor_zw5.lua
@@ -69,7 +69,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -208,7 +208,7 @@ test.register_coroutine_test(
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_firmware_version.lua b/drivers/SmartThings/zwave-sensor/src/test/test_firmware_version.lua
index bf4c68d5bb..eeaf30dd56 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_firmware_version.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_firmware_version.lua
@@ -86,7 +86,7 @@ test.register_message_test(
       },
       {
         inner_block_ordering = "relaxed",
-        min_api_version = 17
+        
       }
 )
 
@@ -108,7 +108,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -124,7 +124,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_generic_sensor.lua b/drivers/SmartThings/zwave-sensor/src/test/test_generic_sensor.lua
index 3496ebb6d5..3cef67576b 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_generic_sensor.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_generic_sensor.lua
@@ -63,7 +63,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -86,7 +86,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -108,7 +108,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -131,7 +131,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -154,7 +154,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -176,7 +176,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -207,7 +207,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -238,7 +238,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -260,7 +260,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -283,7 +283,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -313,7 +313,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -344,7 +344,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -366,7 +366,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -388,7 +388,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -412,7 +412,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -456,7 +456,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -500,7 +500,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -522,7 +522,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -544,7 +544,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -571,7 +571,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -598,7 +598,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -692,7 +692,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -786,7 +786,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -808,7 +808,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -830,7 +830,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -852,7 +852,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -874,7 +874,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -896,7 +896,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -918,7 +918,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -940,7 +940,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -962,7 +962,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -984,7 +984,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1006,7 +1006,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1028,7 +1028,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1050,7 +1050,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1072,7 +1072,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1105,7 +1105,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -1127,7 +1127,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1149,7 +1149,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1171,7 +1171,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1199,7 +1199,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -1221,7 +1221,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1243,7 +1243,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1265,7 +1265,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1287,7 +1287,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1309,7 +1309,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1331,7 +1331,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1353,7 +1353,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1375,7 +1375,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1397,7 +1397,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1419,7 +1419,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1441,7 +1441,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1463,7 +1463,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1485,7 +1485,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1506,7 +1506,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1527,7 +1527,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1549,7 +1549,7 @@ test.register_coroutine_test(
     test.socket.zwave:__expect_send(zw_test_utils.zwave_test_build_send_command(mock_device, Battery:Get({})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1571,7 +1571,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1593,7 +1593,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_glentronics_water_leak_sensor.lua b/drivers/SmartThings/zwave-sensor/src/test/test_glentronics_water_leak_sensor.lua
index 926558036b..3553171422 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_glentronics_water_leak_sensor.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_glentronics_water_leak_sensor.lua
@@ -70,7 +70,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -95,7 +95,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -120,7 +120,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -145,7 +145,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -170,7 +170,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -196,7 +196,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -222,7 +222,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_homeseer_multi_sensor.lua b/drivers/SmartThings/zwave-sensor/src/test/test_homeseer_multi_sensor.lua
index 743ffc5298..fd26c711d7 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_homeseer_multi_sensor.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_homeseer_multi_sensor.lua
@@ -51,7 +51,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -70,7 +70,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -92,7 +92,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -137,7 +137,7 @@ test.register_coroutine_test(
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 test.register_coroutine_test(
@@ -168,7 +168,7 @@ test.register_coroutine_test(
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 test.run_registered_tests()
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_no_wakeup_poll.lua b/drivers/SmartThings/zwave-sensor/src/test/test_no_wakeup_poll.lua
index c88527f0cd..b61850ec6d 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_no_wakeup_poll.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_no_wakeup_poll.lua
@@ -100,7 +100,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_sensative_strip.lua b/drivers/SmartThings/zwave-sensor/src/test/test_sensative_strip.lua
index fb9b519a42..1dc25cd927 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_sensative_strip.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_sensative_strip.lua
@@ -61,7 +61,7 @@ test.register_coroutine_test(
       mock_sensor:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -72,7 +72,7 @@ test.register_coroutine_test(
     mock_sensor:expect_metadata_update({ profile = "illuminance-temperature" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -94,7 +94,7 @@ test.register_coroutine_test(
     test.socket.zwave:__queue_receive({mock_sensor.id, WakeUp:Notification({})})
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_smartthings_water_leak_sensor.lua b/drivers/SmartThings/zwave-sensor/src/test/test_smartthings_water_leak_sensor.lua
index e80e28dbd9..758774907e 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_smartthings_water_leak_sensor.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_smartthings_water_leak_sensor.lua
@@ -59,7 +59,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -81,7 +81,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -103,7 +103,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -125,7 +125,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -147,7 +147,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -169,7 +169,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -191,7 +191,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -222,7 +222,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -253,7 +253,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -272,7 +272,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -291,7 +291,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -310,7 +310,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_v1_contact_event.lua b/drivers/SmartThings/zwave-sensor/src/test/test_v1_contact_event.lua
index 4cfd906636..147576e0e0 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_v1_contact_event.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_v1_contact_event.lua
@@ -57,7 +57,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -84,7 +84,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -104,7 +104,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.tamperAlert.tamper.clear()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_vision_motion_detector.lua b/drivers/SmartThings/zwave-sensor/src/test/test_vision_motion_detector.lua
index 3cd16b6fa3..ed4b891bb1 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_vision_motion_detector.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_vision_motion_detector.lua
@@ -58,7 +58,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -80,7 +80,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -102,7 +102,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -124,7 +124,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -163,7 +163,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -187,7 +187,7 @@ test.register_coroutine_test(
       mock_sensor:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_zooz_4_in_1_sensor.lua b/drivers/SmartThings/zwave-sensor/src/test/test_zooz_4_in_1_sensor.lua
index fde2d5ebfe..e8e3c45716 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_zooz_4_in_1_sensor.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_zooz_4_in_1_sensor.lua
@@ -53,7 +53,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -76,7 +76,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -103,7 +103,7 @@ test.register_coroutine_test(
       test.socket.capability:__expect_send(mock_sensor:generate_test_message("main", capabilities.tamperAlert.tamper.clear()))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -125,7 +125,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -148,7 +148,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -169,7 +169,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -192,7 +192,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -214,7 +214,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -239,7 +239,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -260,7 +260,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_zwave_motion_light_sensor.lua b/drivers/SmartThings/zwave-sensor/src/test/test_zwave_motion_light_sensor.lua
index 7a8adbeb10..f671e7ff70 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_zwave_motion_light_sensor.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_zwave_motion_light_sensor.lua
@@ -59,7 +59,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -86,7 +86,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -108,7 +108,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -129,7 +129,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -151,7 +151,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -173,7 +173,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -196,7 +196,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -218,7 +218,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -245,7 +245,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -292,7 +292,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -307,7 +307,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_zwave_motion_temp_light_sensor.lua b/drivers/SmartThings/zwave-sensor/src/test/test_zwave_motion_temp_light_sensor.lua
index 8e463e7625..45cfdcbd0e 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_zwave_motion_temp_light_sensor.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_zwave_motion_temp_light_sensor.lua
@@ -55,7 +55,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -82,7 +82,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -104,7 +104,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -126,7 +126,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -148,7 +148,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -170,7 +170,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -192,7 +192,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -219,7 +219,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -247,7 +247,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_zwave_sensor.lua b/drivers/SmartThings/zwave-sensor/src/test/test_zwave_sensor.lua
index 677204e5d1..17f4b50931 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_zwave_sensor.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_zwave_sensor.lua
@@ -131,7 +131,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -235,7 +235,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -272,7 +272,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -294,7 +294,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -316,7 +316,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -338,7 +338,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -359,7 +359,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -380,7 +380,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -411,7 +411,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -438,7 +438,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -460,7 +460,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -482,7 +482,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -504,7 +504,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -526,7 +526,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -548,7 +548,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -570,7 +570,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -602,7 +602,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -624,7 +624,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -646,7 +646,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -673,7 +673,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -700,7 +700,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -727,7 +727,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -749,7 +749,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -771,7 +771,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -794,7 +794,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -815,7 +815,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -836,7 +836,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_zwave_water_sensor.lua b/drivers/SmartThings/zwave-sensor/src/test/test_zwave_water_sensor.lua
index 775130d87e..d8b349dcad 100644
--- a/drivers/SmartThings/zwave-sensor/src/test/test_zwave_water_sensor.lua
+++ b/drivers/SmartThings/zwave-sensor/src/test/test_zwave_water_sensor.lua
@@ -57,7 +57,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -76,7 +76,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -95,7 +95,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -117,7 +117,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -139,7 +139,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -161,7 +161,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -183,7 +183,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -202,7 +202,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -224,7 +224,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -246,7 +246,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -268,7 +268,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -290,7 +290,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-siren/src/test/test_aeon_siren.lua b/drivers/SmartThings/zwave-siren/src/test/test_aeon_siren.lua
index 30b8333c5b..8cadbdd666 100644
--- a/drivers/SmartThings/zwave-siren/src/test/test_aeon_siren.lua
+++ b/drivers/SmartThings/zwave-siren/src/test/test_aeon_siren.lua
@@ -56,7 +56,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -82,7 +82,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -113,7 +113,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -144,7 +144,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -176,7 +176,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -207,7 +207,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -238,7 +238,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -265,7 +265,7 @@ test.register_coroutine_test(
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -293,7 +293,7 @@ test.register_coroutine_test(
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -322,7 +322,7 @@ test.register_coroutine_test(
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-siren/src/test/test_aeotec_doorbell_siren.lua b/drivers/SmartThings/zwave-siren/src/test/test_aeotec_doorbell_siren.lua
index 31fb57fed2..4a951cc1df 100644
--- a/drivers/SmartThings/zwave-siren/src/test/test_aeotec_doorbell_siren.lua
+++ b/drivers/SmartThings/zwave-siren/src/test/test_aeotec_doorbell_siren.lua
@@ -113,7 +113,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -151,7 +151,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -189,7 +189,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -227,7 +227,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -265,7 +265,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -303,7 +303,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -341,7 +341,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -379,7 +379,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -424,7 +424,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -469,7 +469,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -514,7 +514,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -559,7 +559,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -604,7 +604,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -649,7 +649,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -694,7 +694,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -739,7 +739,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -779,7 +779,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -819,7 +819,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -859,7 +859,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -899,7 +899,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -939,7 +939,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -979,7 +979,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1019,7 +1019,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1059,7 +1059,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1099,7 +1099,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1139,7 +1139,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1179,7 +1179,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1219,7 +1219,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1259,7 +1259,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1299,7 +1299,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1339,7 +1339,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1379,7 +1379,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1419,7 +1419,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1459,7 +1459,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1499,7 +1499,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1539,7 +1539,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1579,7 +1579,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1619,7 +1619,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1659,7 +1659,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1699,7 +1699,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1739,7 +1739,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1779,7 +1779,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1819,7 +1819,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1859,7 +1859,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1899,7 +1899,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1939,7 +1939,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1979,7 +1979,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2019,7 +2019,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2059,7 +2059,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2099,7 +2099,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2139,7 +2139,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2179,7 +2179,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2219,7 +2219,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2259,7 +2259,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2299,7 +2299,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2339,7 +2339,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2379,7 +2379,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2419,7 +2419,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2459,7 +2459,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2499,7 +2499,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2539,7 +2539,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2579,7 +2579,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2619,7 +2619,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2659,7 +2659,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2682,7 +2682,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -2705,7 +2705,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -2738,7 +2738,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2754,7 +2754,7 @@ test.register_coroutine_test(
     test.socket.device_lifecycle:__queue_receive(mock_siren:generate_info_changed({ preferences = _preferences}))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2779,7 +2779,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2793,7 +2793,7 @@ test.register_coroutine_test(
     test.socket.device_lifecycle:__queue_receive(mock_siren:generate_info_changed({ preferences = _preferences}))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2818,7 +2818,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2832,7 +2832,7 @@ test.register_coroutine_test(
     test.socket.device_lifecycle:__queue_receive(mock_siren:generate_info_changed({ preferences = _preferences}))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2860,7 +2860,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2888,7 +2888,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2916,7 +2916,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2944,7 +2944,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -2972,7 +2972,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -3000,7 +3000,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -3036,7 +3036,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -3056,7 +3056,7 @@ test.register_coroutine_test(
             )
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
diff --git a/drivers/SmartThings/zwave-siren/src/test/test_ecolink_wireless_siren.lua b/drivers/SmartThings/zwave-siren/src/test/test_ecolink_wireless_siren.lua
index c81ba1b262..16fd4b2ab3 100644
--- a/drivers/SmartThings/zwave-siren/src/test/test_ecolink_wireless_siren.lua
+++ b/drivers/SmartThings/zwave-siren/src/test/test_ecolink_wireless_siren.lua
@@ -68,7 +68,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -106,7 +106,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -144,7 +144,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -172,7 +172,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -210,7 +210,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -248,7 +248,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -286,7 +286,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -313,7 +313,7 @@ test.register_coroutine_test(
 
   end,
   {
-     min_api_version = 17
+     
   }
 )
 test.register_coroutine_test(
@@ -347,7 +347,7 @@ test.register_coroutine_test(
 
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -374,7 +374,7 @@ test.register_coroutine_test(
 
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -400,7 +400,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -427,7 +427,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 test.register_coroutine_test(
@@ -452,7 +452,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 test.register_coroutine_test(
@@ -477,7 +477,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 test.register_coroutine_test(
@@ -502,7 +502,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-siren/src/test/test_fortrezz_siren.lua b/drivers/SmartThings/zwave-siren/src/test/test_fortrezz_siren.lua
index 61ae247d58..087e5c5400 100644
--- a/drivers/SmartThings/zwave-siren/src/test/test_fortrezz_siren.lua
+++ b/drivers/SmartThings/zwave-siren/src/test/test_fortrezz_siren.lua
@@ -61,7 +61,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_siren:generate_test_message("main", capabilities.switch.switch.on({})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -95,7 +95,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_siren:generate_test_message("main", capabilities.switch.switch.on({})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -128,7 +128,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_siren:generate_test_message("main", capabilities.switch.switch.on({})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -161,7 +161,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_siren:generate_test_message("main", capabilities.switch.switch.off({})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-siren/src/test/test_philio_sound_siren.lua b/drivers/SmartThings/zwave-siren/src/test/test_philio_sound_siren.lua
index 432de972dd..88e3b2df1e 100644
--- a/drivers/SmartThings/zwave-siren/src/test/test_philio_sound_siren.lua
+++ b/drivers/SmartThings/zwave-siren/src/test/test_philio_sound_siren.lua
@@ -64,7 +64,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -95,7 +95,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -136,7 +136,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -168,7 +168,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -201,7 +201,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -224,7 +224,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -247,7 +247,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -281,7 +281,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -308,7 +308,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -333,7 +333,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -360,7 +360,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -387,7 +387,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -414,7 +414,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -441,7 +441,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -462,7 +462,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -484,7 +484,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -533,7 +533,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -558,7 +558,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
diff --git a/drivers/SmartThings/zwave-siren/src/test/test_utilitech_siren.lua b/drivers/SmartThings/zwave-siren/src/test/test_utilitech_siren.lua
index 33801f1dbd..39366666f4 100644
--- a/drivers/SmartThings/zwave-siren/src/test/test_utilitech_siren.lua
+++ b/drivers/SmartThings/zwave-siren/src/test/test_utilitech_siren.lua
@@ -43,7 +43,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -63,7 +63,7 @@ test.register_coroutine_test(
     ))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-siren/src/test/test_yale_siren.lua b/drivers/SmartThings/zwave-siren/src/test/test_yale_siren.lua
index 275cc89ce9..049f2b9308 100644
--- a/drivers/SmartThings/zwave-siren/src/test/test_yale_siren.lua
+++ b/drivers/SmartThings/zwave-siren/src/test/test_yale_siren.lua
@@ -54,7 +54,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -75,7 +75,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -113,7 +113,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -152,7 +152,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -190,7 +190,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -227,7 +227,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -263,7 +263,7 @@ test.register_coroutine_test(
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -311,7 +311,7 @@ test.register_coroutine_test(
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -331,7 +331,7 @@ test.register_coroutine_test(
     ))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-siren/src/test/test_zipato_siren.lua b/drivers/SmartThings/zwave-siren/src/test/test_zipato_siren.lua
index 0d39f0f990..f8a4f4fc2f 100644
--- a/drivers/SmartThings/zwave-siren/src/test/test_zipato_siren.lua
+++ b/drivers/SmartThings/zwave-siren/src/test/test_zipato_siren.lua
@@ -63,7 +63,7 @@ test.register_coroutine_test(
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -94,7 +94,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -114,7 +114,7 @@ test.register_coroutine_test(
     ))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -135,7 +135,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -156,7 +156,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-siren/src/test/test_zooz_zse50.lua b/drivers/SmartThings/zwave-siren/src/test/test_zooz_zse50.lua
index 1454458687..34229f9251 100644
--- a/drivers/SmartThings/zwave-siren/src/test/test_zooz_zse50.lua
+++ b/drivers/SmartThings/zwave-siren/src/test/test_zooz_zse50.lua
@@ -66,7 +66,7 @@ test.register_coroutine_test(
         )
       end,
       {
-        min_api_version = 17
+        
       }
 )
 
@@ -120,7 +120,7 @@ test.register_coroutine_test(
         )
       end,
       {
-        min_api_version = 17
+        
       }
 )
 
@@ -148,7 +148,7 @@ test.register_coroutine_test(
         )
       end,
       {
-        min_api_version = 17
+        
       }
 )
 
@@ -176,7 +176,7 @@ test.register_coroutine_test(
         )
       end,
       {
-        min_api_version = 17
+        
       }
 )
 
@@ -198,7 +198,7 @@ test.register_message_test(
         }
       },
       {
-        min_api_version = 17
+        
       }
 )
 
@@ -220,7 +220,7 @@ test.register_message_test(
         }
       },
       {
-        min_api_version = 17
+        
       }
 )
 
@@ -242,7 +242,7 @@ test.register_message_test(
         }
       },
       {
-        min_api_version = 17
+        
       }
 )
 
@@ -264,7 +264,7 @@ test.register_message_test(
         }
       },
       {
-        min_api_version = 17
+        
       }
 )
 
@@ -296,7 +296,7 @@ test.register_message_test(
         }
       },
       {
-        min_api_version = 17
+        
       }
 )
 
@@ -341,7 +341,7 @@ test.register_message_test(
         }
       },
       {
-        min_api_version = 17
+        
       }
 )
 
@@ -372,7 +372,7 @@ test.register_message_test(
         }
       },
       {
-        min_api_version = 17
+        
       }
 )
 
@@ -403,7 +403,7 @@ test.register_message_test(
         }
       },
       {
-        min_api_version = 17
+        
       }
 )
 
@@ -434,7 +434,7 @@ test.register_message_test(
         }
       },
       {
-        min_api_version = 17
+        
       }
 )
 
@@ -453,7 +453,7 @@ test.register_coroutine_test(
         )
       end,
       {
-        min_api_version = 17
+        
       }
 )
 
@@ -472,7 +472,7 @@ test.register_coroutine_test(
         )
       end,
       {
-        min_api_version = 17
+        
       }
 )
 
@@ -491,7 +491,7 @@ test.register_coroutine_test(
         )
       end,
       {
-        min_api_version = 17
+        
       }
 )
 
@@ -516,7 +516,7 @@ test.register_coroutine_test(
         )
       end,
       {
-        min_api_version = 17
+        
       }
 )
 
@@ -541,7 +541,7 @@ test.register_coroutine_test(
         )
       end,
       {
-        min_api_version = 17
+        
       }
 )
 
@@ -566,7 +566,7 @@ test.register_coroutine_test(
         )
       end,
       {
-        min_api_version = 17
+        
       }
 )
 
@@ -591,7 +591,7 @@ test.register_coroutine_test(
         )
       end,
       {
-        min_api_version = 17
+        
       }
 )
 
@@ -616,7 +616,7 @@ test.register_coroutine_test(
         )
       end,
       {
-        min_api_version = 17
+        
       }
 )
 
@@ -641,7 +641,7 @@ test.register_coroutine_test(
         )
       end,
       {
-        min_api_version = 17
+        
       }
 )
 
@@ -663,7 +663,7 @@ test.register_coroutine_test(
         )
       end,
       {
-        min_api_version = 17
+        
       }
 )
 
@@ -710,7 +710,7 @@ test.register_coroutine_test(
         )
       end,
       {
-        min_api_version = 17
+        
       }
 )
 
diff --git a/drivers/SmartThings/zwave-siren/src/test/test_zwave_multifunctional-siren.lua b/drivers/SmartThings/zwave-siren/src/test/test_zwave_multifunctional-siren.lua
index 61893d7dd6..ab4b0b9f16 100644
--- a/drivers/SmartThings/zwave-siren/src/test/test_zwave_multifunctional-siren.lua
+++ b/drivers/SmartThings/zwave-siren/src/test/test_zwave_multifunctional-siren.lua
@@ -52,7 +52,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -74,7 +74,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -96,7 +96,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -118,7 +118,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -146,7 +146,7 @@ test.register_coroutine_test(
     mock_siren:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-siren/src/test/test_zwave_notification_siren.lua b/drivers/SmartThings/zwave-siren/src/test/test_zwave_notification_siren.lua
index e80d79e338..4ed06bc608 100644
--- a/drivers/SmartThings/zwave-siren/src/test/test_zwave_notification_siren.lua
+++ b/drivers/SmartThings/zwave-siren/src/test/test_zwave_notification_siren.lua
@@ -51,7 +51,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -78,7 +78,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -100,7 +100,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -127,7 +127,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-siren/src/test/test_zwave_siren.lua b/drivers/SmartThings/zwave-siren/src/test/test_zwave_siren.lua
index 3e33929169..f48187c05e 100644
--- a/drivers/SmartThings/zwave-siren/src/test/test_zwave_siren.lua
+++ b/drivers/SmartThings/zwave-siren/src/test/test_zwave_siren.lua
@@ -84,7 +84,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -110,7 +110,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -136,7 +136,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -162,7 +162,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -188,7 +188,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -214,7 +214,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -240,7 +240,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -266,7 +266,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -297,7 +297,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -328,7 +328,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -360,7 +360,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -391,7 +391,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -422,7 +422,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -463,7 +463,7 @@ test.register_coroutine_test(
     test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-siren/src/test/test_zwave_sound_sensor.lua b/drivers/SmartThings/zwave-siren/src/test/test_zwave_sound_sensor.lua
index b796b1b9d0..daa1c7d5cd 100644
--- a/drivers/SmartThings/zwave-siren/src/test/test_zwave_sound_sensor.lua
+++ b/drivers/SmartThings/zwave-siren/src/test/test_zwave_sound_sensor.lua
@@ -50,7 +50,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -72,7 +72,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -91,7 +91,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-smoke-alarm/src/test/test_fibaro_co_sensor_zw5.lua b/drivers/SmartThings/zwave-smoke-alarm/src/test/test_fibaro_co_sensor_zw5.lua
index e860e4608f..916388119b 100644
--- a/drivers/SmartThings/zwave-smoke-alarm/src/test/test_fibaro_co_sensor_zw5.lua
+++ b/drivers/SmartThings/zwave-smoke-alarm/src/test/test_fibaro_co_sensor_zw5.lua
@@ -70,7 +70,7 @@ test.register_coroutine_test(
     mock_fibaro_CO_sensor:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -89,7 +89,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -117,7 +117,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -145,7 +145,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -172,7 +172,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -199,7 +199,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -226,7 +226,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -253,7 +253,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -279,7 +279,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -307,7 +307,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -334,7 +334,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -361,7 +361,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -392,7 +392,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -501,7 +501,7 @@ test.register_coroutine_test(
 
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-smoke-alarm/src/test/test_fibaro_smoke_sensor.lua b/drivers/SmartThings/zwave-smoke-alarm/src/test/test_fibaro_smoke_sensor.lua
index 39c79e0498..4aed236210 100644
--- a/drivers/SmartThings/zwave-smoke-alarm/src/test/test_fibaro_smoke_sensor.lua
+++ b/drivers/SmartThings/zwave-smoke-alarm/src/test/test_fibaro_smoke_sensor.lua
@@ -150,7 +150,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -186,7 +186,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -209,7 +209,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-smoke-alarm/src/test/test_zwave_alarm_v1.lua b/drivers/SmartThings/zwave-smoke-alarm/src/test/test_zwave_alarm_v1.lua
index bdeb10535f..30c3a6fe2b 100644
--- a/drivers/SmartThings/zwave-smoke-alarm/src/test/test_zwave_alarm_v1.lua
+++ b/drivers/SmartThings/zwave-smoke-alarm/src/test/test_zwave_alarm_v1.lua
@@ -54,7 +54,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -76,7 +76,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -98,7 +98,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -120,7 +120,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -165,7 +165,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -187,7 +187,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -209,7 +209,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-smoke-alarm/src/test/test_zwave_co_detector.lua b/drivers/SmartThings/zwave-smoke-alarm/src/test/test_zwave_co_detector.lua
index 60710942bc..ff4f3d7794 100644
--- a/drivers/SmartThings/zwave-smoke-alarm/src/test/test_zwave_co_detector.lua
+++ b/drivers/SmartThings/zwave-smoke-alarm/src/test/test_zwave_co_detector.lua
@@ -55,7 +55,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -77,7 +77,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 test.register_message_test(
@@ -98,7 +98,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -120,7 +120,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -142,7 +142,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -164,7 +164,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -181,7 +181,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-smoke-alarm/src/test/test_zwave_smoke_detector.lua b/drivers/SmartThings/zwave-smoke-alarm/src/test/test_zwave_smoke_detector.lua
index c62dab7ec6..0da43eb010 100644
--- a/drivers/SmartThings/zwave-smoke-alarm/src/test/test_zwave_smoke_detector.lua
+++ b/drivers/SmartThings/zwave-smoke-alarm/src/test/test_zwave_smoke_detector.lua
@@ -56,7 +56,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -78,7 +78,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -100,7 +100,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -122,7 +122,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -144,7 +144,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -166,7 +166,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -188,7 +188,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -205,7 +205,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -253,7 +253,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -275,7 +275,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -297,7 +297,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -319,7 +319,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -341,7 +341,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -363,7 +363,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -407,7 +407,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_aeon_smart_strip.lua b/drivers/SmartThings/zwave-switch/src/test/test_aeon_smart_strip.lua
index d0db48c559..f94cdf1fb9 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_aeon_smart_strip.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_aeon_smart_strip.lua
@@ -152,7 +152,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -241,7 +241,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -292,7 +292,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -343,7 +343,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -377,7 +377,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -411,7 +411,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -445,7 +445,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -515,7 +515,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -549,7 +549,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -621,7 +621,7 @@ test.register_coroutine_test(
       mock_metering_switch:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -755,7 +755,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -889,7 +889,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -980,7 +980,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1071,7 +1071,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1162,7 +1162,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1253,7 +1253,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_aeotec_dimmer_switch.lua b/drivers/SmartThings/zwave-switch/src/test/test_aeotec_dimmer_switch.lua
index ad9197c159..ddeca103bb 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_aeotec_dimmer_switch.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_aeotec_dimmer_switch.lua
@@ -60,7 +60,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -99,7 +99,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -139,7 +139,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -179,7 +179,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -223,7 +223,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -280,7 +280,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -312,7 +312,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -336,7 +336,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -405,7 +405,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -475,7 +475,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -510,7 +510,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_aeotec_dual_nano_switch_configuration.lua b/drivers/SmartThings/zwave-switch/src/test/test_aeotec_dual_nano_switch_configuration.lua
index 6f35d6200c..13931a0693 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_aeotec_dual_nano_switch_configuration.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_aeotec_dual_nano_switch_configuration.lua
@@ -113,7 +113,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_aeotec_heavy_duty_switch.lua b/drivers/SmartThings/zwave-switch/src/test/test_aeotec_heavy_duty_switch.lua
index 2d9b6e24c5..8bbcb9a879 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_aeotec_heavy_duty_switch.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_aeotec_heavy_duty_switch.lua
@@ -57,7 +57,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -81,7 +81,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -123,7 +123,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -136,7 +136,7 @@ test.register_coroutine_test(
       Meter:Get({ scale = Meter.scale.electric_meter.KILOWATT_HOURS })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -167,7 +167,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -193,7 +193,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -219,7 +219,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -246,7 +246,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -273,7 +273,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -300,7 +300,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -327,7 +327,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -354,7 +354,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -381,7 +381,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -408,7 +408,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -435,7 +435,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -462,7 +462,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -489,7 +489,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -516,7 +516,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_aeotec_metering_switch_configuration.lua b/drivers/SmartThings/zwave-switch/src/test/test_aeotec_metering_switch_configuration.lua
index c26c0403e4..5f8f88a277 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_aeotec_metering_switch_configuration.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_aeotec_metering_switch_configuration.lua
@@ -65,7 +65,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_aeotec_nano_dimmer.lua b/drivers/SmartThings/zwave-switch/src/test/test_aeotec_nano_dimmer.lua
index 2c009b5ec7..b923d04c87 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_aeotec_nano_dimmer.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_aeotec_nano_dimmer.lua
@@ -84,7 +84,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -123,7 +123,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -163,7 +163,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -203,7 +203,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -247,7 +247,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -304,7 +304,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -336,7 +336,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -360,7 +360,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -429,7 +429,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -499,7 +499,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -534,7 +534,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_aeotec_nano_dimmer_preferences.lua b/drivers/SmartThings/zwave-switch/src/test/test_aeotec_nano_dimmer_preferences.lua
index 5a349d80cb..a00745fe57 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_aeotec_nano_dimmer_preferences.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_aeotec_nano_dimmer_preferences.lua
@@ -59,7 +59,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_aeotec_smart_switch.lua b/drivers/SmartThings/zwave-switch/src/test/test_aeotec_smart_switch.lua
index c61e1835a8..b41ffdb4f9 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_aeotec_smart_switch.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_aeotec_smart_switch.lua
@@ -60,7 +60,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -90,7 +90,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_aeotec_smart_switch_7_eu.lua b/drivers/SmartThings/zwave-switch/src/test/test_aeotec_smart_switch_7_eu.lua
index fcaed8070a..47d300a9fb 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_aeotec_smart_switch_7_eu.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_aeotec_smart_switch_7_eu.lua
@@ -66,7 +66,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -96,7 +96,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -120,7 +120,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -144,7 +144,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -175,7 +175,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -222,7 +222,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_aeotec_smart_switch_7_us.lua b/drivers/SmartThings/zwave-switch/src/test/test_aeotec_smart_switch_7_us.lua
index 51f7b504ca..a840e8eb5e 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_aeotec_smart_switch_7_us.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_aeotec_smart_switch_7_us.lua
@@ -54,7 +54,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -84,7 +84,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -114,7 +114,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -138,7 +138,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -162,7 +162,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -193,7 +193,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_aeotec_smart_switch_gen5.lua b/drivers/SmartThings/zwave-switch/src/test/test_aeotec_smart_switch_gen5.lua
index 565d6b57aa..ff532a6e5d 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_aeotec_smart_switch_gen5.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_aeotec_smart_switch_gen5.lua
@@ -55,7 +55,7 @@ test.register_coroutine_test(
       mock_switch:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_dawon_smart_plug.lua b/drivers/SmartThings/zwave-switch/src/test/test_dawon_smart_plug.lua
index 6615af4a12..e4e67955a4 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_dawon_smart_plug.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_dawon_smart_plug.lua
@@ -49,7 +49,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -71,7 +71,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_dawon_wall_smart_switch.lua b/drivers/SmartThings/zwave-switch/src/test/test_dawon_wall_smart_switch.lua
index 3fe41b79db..dbdf04af94 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_dawon_wall_smart_switch.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_dawon_wall_smart_switch.lua
@@ -77,7 +77,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -106,7 +106,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -138,7 +138,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -170,7 +170,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -202,7 +202,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -234,7 +234,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -266,7 +266,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -298,7 +298,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -321,7 +321,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -385,7 +385,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_eaton_5_scene_keypad.lua b/drivers/SmartThings/zwave-switch/src/test/test_eaton_5_scene_keypad.lua
index 29ff5d699e..ef64f21c3f 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_eaton_5_scene_keypad.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_eaton_5_scene_keypad.lua
@@ -76,7 +76,7 @@ test.register_coroutine_test(
             )
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -118,7 +118,7 @@ test.register_coroutine_test(
             )
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -147,7 +147,7 @@ test.register_coroutine_test(
 
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -235,7 +235,7 @@ test.register_coroutine_test(
             )
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -273,7 +273,7 @@ test.register_coroutine_test(
 
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -333,7 +333,7 @@ test.register_coroutine_test(
             )
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -381,7 +381,7 @@ test.register_coroutine_test(
 
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -398,7 +398,7 @@ test.register_coroutine_test(
             )
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -458,7 +458,7 @@ test.register_coroutine_test(
             -- if group_id and scene_id are same, do nothing.
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -483,7 +483,7 @@ test.register_coroutine_test(
             )
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -501,7 +501,7 @@ test.register_coroutine_test(
             -- driver should do nothing.
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -521,7 +521,7 @@ test.register_coroutine_test(
             )
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -541,7 +541,7 @@ test.register_coroutine_test(
             )
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_eaton_accessory_dimmer.lua b/drivers/SmartThings/zwave-switch/src/test/test_eaton_accessory_dimmer.lua
index 103f856373..59bad0c7c9 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_eaton_accessory_dimmer.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_eaton_accessory_dimmer.lua
@@ -44,7 +44,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -68,7 +68,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -95,7 +95,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -130,7 +130,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -176,7 +176,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 end
@@ -203,7 +203,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -229,7 +229,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -257,7 +257,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_eaton_anyplace_switch.lua b/drivers/SmartThings/zwave-switch/src/test/test_eaton_anyplace_switch.lua
index 3c1fdfc9eb..1749422e12 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_eaton_anyplace_switch.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_eaton_anyplace_switch.lua
@@ -73,7 +73,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -119,7 +119,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -142,7 +142,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -165,7 +165,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -184,7 +184,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -203,7 +203,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_eaton_rf_dimmer.lua b/drivers/SmartThings/zwave-switch/src/test/test_eaton_rf_dimmer.lua
index 10a784d8b4..3944102d1f 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_eaton_rf_dimmer.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_eaton_rf_dimmer.lua
@@ -43,7 +43,7 @@ test.register_coroutine_test(
       mock_sensor:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_ecolink_switch.lua b/drivers/SmartThings/zwave-switch/src/test/test_ecolink_switch.lua
index 51ad9b8299..17b6d33ed2 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_ecolink_switch.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_ecolink_switch.lua
@@ -63,7 +63,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -94,7 +94,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -113,7 +113,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -145,7 +145,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -177,7 +177,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -217,7 +217,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -249,7 +249,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -274,7 +274,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -299,7 +299,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_fibaro_double_switch.lua b/drivers/SmartThings/zwave-switch/src/test/test_fibaro_double_switch.lua
index 29e6b9566e..9b0e8f22f3 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_fibaro_double_switch.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_fibaro_double_switch.lua
@@ -135,7 +135,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -187,7 +187,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 test.register_message_test(
@@ -237,7 +237,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -288,7 +288,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -328,7 +328,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -368,7 +368,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -408,7 +408,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -448,7 +448,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -601,7 +601,7 @@ test.register_coroutine_test(
 
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -653,7 +653,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_fibaro_single_switch.lua b/drivers/SmartThings/zwave-switch/src/test/test_fibaro_single_switch.lua
index 4c8d058acf..979bdbf29f 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_fibaro_single_switch.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_fibaro_single_switch.lua
@@ -55,7 +55,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -76,7 +76,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -109,7 +109,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -142,7 +142,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -175,7 +175,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -208,7 +208,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -238,7 +238,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -267,7 +267,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -290,7 +290,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -319,7 +319,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -342,7 +342,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -371,7 +371,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -394,7 +394,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -423,7 +423,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -446,7 +446,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -475,7 +475,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -497,7 +497,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -526,7 +526,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -548,7 +548,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -577,7 +577,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -691,7 +691,7 @@ test.register_coroutine_test(
 
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_fibaro_wall_plug_eu.lua b/drivers/SmartThings/zwave-switch/src/test/test_fibaro_wall_plug_eu.lua
index 669b01f1bd..39a6d5f862 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_fibaro_wall_plug_eu.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_fibaro_wall_plug_eu.lua
@@ -108,7 +108,7 @@ test.register_coroutine_test(
 
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_fibaro_wall_plug_uk_configuration.lua b/drivers/SmartThings/zwave-switch/src/test/test_fibaro_wall_plug_uk_configuration.lua
index a051ce72b2..8f6fc24dea 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_fibaro_wall_plug_uk_configuration.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_fibaro_wall_plug_uk_configuration.lua
@@ -57,7 +57,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_fibaro_wall_plug_us.lua b/drivers/SmartThings/zwave-switch/src/test/test_fibaro_wall_plug_us.lua
index 2fafc237b2..8ecd89faa9 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_fibaro_wall_plug_us.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_fibaro_wall_plug_us.lua
@@ -71,7 +71,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -108,7 +108,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -142,7 +142,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -176,7 +176,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -210,7 +210,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -244,7 +244,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -258,7 +258,7 @@ test.register_coroutine_test(
     ))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -340,7 +340,7 @@ test.register_coroutine_test(
 
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_fibaro_walli_dimmer_preferences.lua b/drivers/SmartThings/zwave-switch/src/test/test_fibaro_walli_dimmer_preferences.lua
index 3dd35e66b9..4a0905382a 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_fibaro_walli_dimmer_preferences.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_fibaro_walli_dimmer_preferences.lua
@@ -53,7 +53,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -77,7 +77,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -101,7 +101,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -125,7 +125,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -149,7 +149,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -174,7 +174,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -198,7 +198,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_fibaro_walli_double_switch.lua b/drivers/SmartThings/zwave-switch/src/test/test_fibaro_walli_double_switch.lua
index 2ced0ef6a3..d876ee5f9e 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_fibaro_walli_double_switch.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_fibaro_walli_double_switch.lua
@@ -117,7 +117,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -173,7 +173,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -220,7 +220,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -254,7 +254,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -310,7 +310,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -366,7 +366,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -413,7 +413,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -452,7 +452,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -522,7 +522,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -591,7 +591,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -658,7 +658,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -727,7 +727,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -771,7 +771,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -806,7 +806,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -841,7 +841,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_fibaro_walli_double_switch_preferences.lua b/drivers/SmartThings/zwave-switch/src/test/test_fibaro_walli_double_switch_preferences.lua
index 1e2cfe45aa..e37ac763aa 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_fibaro_walli_double_switch_preferences.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_fibaro_walli_double_switch_preferences.lua
@@ -53,7 +53,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -73,7 +73,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -93,7 +93,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -113,7 +113,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -133,7 +133,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -153,7 +153,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_generic_zwave_device1.lua b/drivers/SmartThings/zwave-switch/src/test/test_generic_zwave_device1.lua
index 5116eceada..a81e2e8236 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_generic_zwave_device1.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_generic_zwave_device1.lua
@@ -45,7 +45,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -71,7 +71,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -114,7 +114,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -144,7 +144,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -187,7 +187,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -216,7 +216,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -245,7 +245,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -275,7 +275,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_go_control_plug_in_switch_configuraton.lua b/drivers/SmartThings/zwave-switch/src/test/test_go_control_plug_in_switch_configuraton.lua
index 4827c600d8..0017095991 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_go_control_plug_in_switch_configuraton.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_go_control_plug_in_switch_configuraton.lua
@@ -49,7 +49,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_honeywell_dimmer.lua b/drivers/SmartThings/zwave-switch/src/test/test_honeywell_dimmer.lua
index 66cbf38817..d98040046c 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_honeywell_dimmer.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_honeywell_dimmer.lua
@@ -55,7 +55,7 @@ test.register_coroutine_test(
       mock_dimmer:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_inovelli_2_channel_smart_plug.lua b/drivers/SmartThings/zwave-switch/src/test/test_inovelli_2_channel_smart_plug.lua
index 65ccf723b3..1b91eb0a06 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_inovelli_2_channel_smart_plug.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_inovelli_2_channel_smart_plug.lua
@@ -97,7 +97,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -161,7 +161,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -204,7 +204,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -247,7 +247,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -290,7 +290,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -333,7 +333,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -405,7 +405,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -478,7 +478,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -538,7 +538,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -598,7 +598,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -662,7 +662,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -726,7 +726,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -774,7 +774,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -822,7 +822,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -862,7 +862,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -903,7 +903,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -943,7 +943,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -984,7 +984,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_inovelli_button.lua b/drivers/SmartThings/zwave-switch/src/test/test_inovelli_button.lua
index 96668cfc24..76ba63eeca 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_inovelli_button.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_inovelli_button.lua
@@ -131,7 +131,7 @@ test.register_coroutine_test(
     end
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -159,7 +159,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -186,7 +186,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -213,7 +213,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_inovelli_dimmer.lua b/drivers/SmartThings/zwave-switch/src/test/test_inovelli_dimmer.lua
index 0e71010aa3..6196e7b449 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_inovelli_dimmer.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_inovelli_dimmer.lua
@@ -47,7 +47,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -73,7 +73,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -101,7 +101,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -136,7 +136,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -169,7 +169,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -200,7 +200,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -233,7 +233,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
   )
 end
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_inovelli_dimmer_led.lua b/drivers/SmartThings/zwave-switch/src/test/test_inovelli_dimmer_led.lua
index 48fde4f573..8b1e2ccf60 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_inovelli_dimmer_led.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_inovelli_dimmer_led.lua
@@ -99,7 +99,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -135,7 +135,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_inovelli_dimmer_power_energy.lua b/drivers/SmartThings/zwave-switch/src/test/test_inovelli_dimmer_power_energy.lua
index 4a3ab7f64a..8ccc96c359 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_inovelli_dimmer_power_energy.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_inovelli_dimmer_power_energy.lua
@@ -70,7 +70,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -112,7 +112,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -136,7 +136,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -162,7 +162,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -200,7 +200,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -243,7 +243,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -276,7 +276,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -307,7 +307,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -340,7 +340,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_inovelli_dimmer_preferences.lua b/drivers/SmartThings/zwave-switch/src/test/test_inovelli_dimmer_preferences.lua
index 701fd6513a..e32500b22e 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_inovelli_dimmer_preferences.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_inovelli_dimmer_preferences.lua
@@ -56,7 +56,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -84,7 +84,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -112,7 +112,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -140,7 +140,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -169,7 +169,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_inovelli_dimmer_scenes.lua b/drivers/SmartThings/zwave-switch/src/test/test_inovelli_dimmer_scenes.lua
index 81e4eff5c0..7a5e5f5bad 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_inovelli_dimmer_scenes.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_inovelli_dimmer_scenes.lua
@@ -59,7 +59,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -82,7 +82,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -105,7 +105,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -128,7 +128,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -151,7 +151,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -174,7 +174,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -197,7 +197,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -220,7 +220,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -243,7 +243,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -266,7 +266,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -289,7 +289,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_inovelli_vzw32_sn.lua b/drivers/SmartThings/zwave-switch/src/test/test_inovelli_vzw32_sn.lua
index 5a9b2ccafd..bf93b74185 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_inovelli_vzw32_sn.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_inovelli_vzw32_sn.lua
@@ -130,7 +130,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -159,7 +159,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -188,7 +188,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -222,7 +222,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -248,7 +248,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -274,7 +274,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -333,7 +333,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_inovelli_vzw32_sn_child.lua b/drivers/SmartThings/zwave-switch/src/test/test_inovelli_vzw32_sn_child.lua
index 4fcdf9e65c..7dc1aafe46 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_inovelli_vzw32_sn_child.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_inovelli_vzw32_sn_child.lua
@@ -90,7 +90,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -145,7 +145,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -179,7 +179,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -238,7 +238,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -301,7 +301,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -344,7 +344,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_inovelli_vzw32_sn_preferences.lua b/drivers/SmartThings/zwave-switch/src/test/test_inovelli_vzw32_sn_preferences.lua
index 3c3e9aa7b8..05ba185e1c 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_inovelli_vzw32_sn_preferences.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_inovelli_vzw32_sn_preferences.lua
@@ -60,7 +60,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -86,7 +86,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -112,7 +112,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -138,7 +138,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -162,7 +162,7 @@ do
       })
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_multi_metering_switch.lua b/drivers/SmartThings/zwave-switch/src/test/test_multi_metering_switch.lua
index ad95d3edbb..b4ea89c626 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_multi_metering_switch.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_multi_metering_switch.lua
@@ -116,7 +116,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -168,7 +168,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -220,7 +220,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -248,7 +248,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -276,7 +276,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -304,7 +304,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -332,7 +332,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -381,7 +381,7 @@ test.register_coroutine_test(
       mock_parent_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -424,7 +424,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -467,7 +467,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -497,7 +497,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -531,7 +531,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -563,7 +563,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -595,7 +595,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -630,7 +630,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -663,7 +663,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -757,7 +757,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -774,7 +774,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_multichannel_device.lua b/drivers/SmartThings/zwave-switch/src/test/test_multichannel_device.lua
index 6c835ff893..ea51ed5343 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_multichannel_device.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_multichannel_device.lua
@@ -169,7 +169,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -206,7 +206,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -243,7 +243,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -280,7 +280,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -330,7 +330,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -375,7 +375,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -420,7 +420,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -470,7 +470,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -520,7 +520,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -565,7 +565,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -610,7 +610,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -660,7 +660,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -703,7 +703,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -746,7 +746,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -789,7 +789,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -832,7 +832,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -888,7 +888,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -931,7 +931,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -987,7 +987,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1057,7 +1057,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1099,7 +1099,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -1141,7 +1141,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -1183,7 +1183,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -1229,7 +1229,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1283,7 +1283,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1312,7 +1312,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1341,7 +1341,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1375,7 +1375,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1409,7 +1409,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1533,7 +1533,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1657,7 +1657,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1786,7 +1786,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1815,7 +1815,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1844,7 +1844,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1873,7 +1873,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1902,7 +1902,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1931,7 +1931,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1960,7 +1960,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1989,7 +1989,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -2018,7 +2018,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -2047,7 +2047,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -2076,7 +2076,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -2105,7 +2105,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -2134,7 +2134,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -2172,7 +2172,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -2201,7 +2201,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -2231,7 +2231,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -2281,7 +2281,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -2337,7 +2337,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -2465,7 +2465,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -2509,7 +2509,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -2531,7 +2531,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -2550,7 +2550,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -2572,7 +2572,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -2591,7 +2591,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -2613,7 +2613,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -2632,7 +2632,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -2654,7 +2654,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -2673,7 +2673,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_popp_outdoor_plug_configuration.lua b/drivers/SmartThings/zwave-switch/src/test/test_popp_outdoor_plug_configuration.lua
index 8586267722..2502718aa3 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_popp_outdoor_plug_configuration.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_popp_outdoor_plug_configuration.lua
@@ -49,7 +49,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_qubino_din_dimmer.lua b/drivers/SmartThings/zwave-switch/src/test/test_qubino_din_dimmer.lua
index 151b6b416e..fa01b94f69 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_qubino_din_dimmer.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_qubino_din_dimmer.lua
@@ -70,7 +70,7 @@ test.register_coroutine_test(
       mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -125,7 +125,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -165,7 +165,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -206,7 +206,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -250,7 +250,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -307,7 +307,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -339,7 +339,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -363,7 +363,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -382,7 +382,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.temperatureMeasurement.temperature({ value = 21.5, unit = 'C' })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -451,7 +451,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -521,7 +521,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -555,7 +555,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_qubino_din_dimmer_preferences.lua b/drivers/SmartThings/zwave-switch/src/test/test_qubino_din_dimmer_preferences.lua
index 3a2ef76aa2..a2e52e282b 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_qubino_din_dimmer_preferences.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_qubino_din_dimmer_preferences.lua
@@ -56,7 +56,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -80,7 +80,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -104,7 +104,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -128,7 +128,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -152,7 +152,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -177,7 +177,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -201,7 +201,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_1_relay_preferences.lua b/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_1_relay_preferences.lua
index 959bb2068d..3d10ed4a53 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_1_relay_preferences.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_1_relay_preferences.lua
@@ -48,7 +48,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -72,7 +72,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -96,7 +96,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -120,7 +120,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -144,7 +144,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_1d_relay_preferences.lua b/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_1d_relay_preferences.lua
index 89b03dae43..788bac624d 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_1d_relay_preferences.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_1d_relay_preferences.lua
@@ -48,7 +48,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -72,7 +72,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -96,7 +96,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_2_relay.lua b/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_2_relay.lua
index 53e8744577..8af028bc98 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_2_relay.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_2_relay.lua
@@ -106,7 +106,7 @@ test.register_coroutine_test(
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -138,7 +138,7 @@ test.register_coroutine_test(
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -159,7 +159,7 @@ test.register_coroutine_test(
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -187,7 +187,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -215,7 +215,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -240,7 +240,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -265,7 +265,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -292,7 +292,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -319,7 +319,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -354,7 +354,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -389,7 +389,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -418,7 +418,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -460,7 +460,7 @@ test.register_coroutine_test(
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -502,7 +502,7 @@ test.register_coroutine_test(
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -544,7 +544,7 @@ test.register_coroutine_test(
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -586,7 +586,7 @@ test.register_coroutine_test(
       ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -639,7 +639,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_2_relay_preferences.lua b/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_2_relay_preferences.lua
index b894310832..b79492a9c9 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_2_relay_preferences.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_2_relay_preferences.lua
@@ -48,7 +48,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -72,7 +72,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -96,7 +96,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -120,7 +120,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -144,7 +144,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_dimmer.lua b/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_dimmer.lua
index 42e01fe944..bb4a4b257c 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_dimmer.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_dimmer.lua
@@ -61,7 +61,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -116,7 +116,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -156,7 +156,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -197,7 +197,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -241,7 +241,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -298,7 +298,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -330,7 +330,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -354,7 +354,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -371,7 +371,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.temperatureMeasurement.temperature({ value = 21.5, unit = 'C' })))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -440,7 +440,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -510,7 +510,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -544,7 +544,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_dimmer_0_10V_preferences.lua b/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_dimmer_0_10V_preferences.lua
index 7256e3579a..18f834d432 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_dimmer_0_10V_preferences.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_dimmer_0_10V_preferences.lua
@@ -52,7 +52,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -76,7 +76,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -100,7 +100,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -124,7 +124,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -148,7 +148,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -176,7 +176,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -204,7 +204,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_dimmer_preferences.lua b/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_dimmer_preferences.lua
index 347995922e..9ee6ff1c0c 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_dimmer_preferences.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_dimmer_preferences.lua
@@ -51,7 +51,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -75,7 +75,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -99,7 +99,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -123,7 +123,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -147,7 +147,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -171,7 +171,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -195,7 +195,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -220,7 +220,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -244,7 +244,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_qubino_mini_dimmer_preferences.lua b/drivers/SmartThings/zwave-switch/src/test/test_qubino_mini_dimmer_preferences.lua
index c1c4f31f0b..bc6e910589 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_qubino_mini_dimmer_preferences.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_qubino_mini_dimmer_preferences.lua
@@ -51,7 +51,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -75,7 +75,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -99,7 +99,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -123,7 +123,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -147,7 +147,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -172,7 +172,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -196,7 +196,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -220,7 +220,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_qubino_temperature_sensor_with_power.lua b/drivers/SmartThings/zwave-switch/src/test/test_qubino_temperature_sensor_with_power.lua
index 2614927458..8da4a73359 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_qubino_temperature_sensor_with_power.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_qubino_temperature_sensor_with_power.lua
@@ -59,7 +59,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -99,7 +99,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -140,7 +140,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -172,7 +172,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -196,7 +196,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -221,7 +221,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -290,7 +290,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -360,7 +360,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -404,7 +404,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_qubino_temperature_sensor_without_power.lua b/drivers/SmartThings/zwave-switch/src/test/test_qubino_temperature_sensor_without_power.lua
index c13617986b..628ce72d33 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_qubino_temperature_sensor_without_power.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_qubino_temperature_sensor_without_power.lua
@@ -60,7 +60,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -92,7 +92,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -117,7 +117,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -170,7 +170,7 @@ test.register_coroutine_test(
     mock_device:expect_native_attr_handler_registration("switch", "switch")
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -224,7 +224,7 @@ test.register_coroutine_test(
     mock_device:expect_native_attr_handler_registration("switch", "switch")
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -268,7 +268,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_shelly_multi_metering_switch.lua b/drivers/SmartThings/zwave-switch/src/test/test_shelly_multi_metering_switch.lua
index 0d3759c314..800e898e0b 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_shelly_multi_metering_switch.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_shelly_multi_metering_switch.lua
@@ -115,7 +115,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -167,7 +167,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -219,7 +219,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -247,7 +247,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -275,7 +275,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -303,7 +303,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -331,7 +331,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -374,7 +374,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -417,7 +417,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -447,7 +447,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -481,7 +481,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -513,7 +513,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -545,7 +545,7 @@ do
       }
     },
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -580,7 +580,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -613,7 +613,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -707,7 +707,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -724,7 +724,7 @@ test.register_coroutine_test(
     })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_wyfy_touch.lua b/drivers/SmartThings/zwave-switch/src/test/test_wyfy_touch.lua
index c7288aafaf..42c8ed4936 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_wyfy_touch.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_wyfy_touch.lua
@@ -71,7 +71,7 @@ test.register_coroutine_test(
     mock_parent_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -99,7 +99,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -127,7 +127,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -155,7 +155,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -183,7 +183,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -216,7 +216,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -249,7 +249,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -283,7 +283,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -316,7 +316,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -350,7 +350,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -369,7 +369,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_wyfy_touch_configuration.lua b/drivers/SmartThings/zwave-switch/src/test/test_wyfy_touch_configuration.lua
index fbf70da972..5391a2f665 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_wyfy_touch_configuration.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_wyfy_touch_configuration.lua
@@ -48,7 +48,7 @@ test.register_coroutine_test(
     mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_zooz_double_plug.lua b/drivers/SmartThings/zwave-switch/src/test/test_zooz_double_plug.lua
index 7826e3d4e4..b43fdfd95b 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_zooz_double_plug.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_zooz_double_plug.lua
@@ -73,7 +73,7 @@ test.register_coroutine_test(
     mock_parent:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -124,7 +124,7 @@ test.register_coroutine_test(
      )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -174,7 +174,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -201,7 +201,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -229,7 +229,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -256,7 +256,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -284,7 +284,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -326,7 +326,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -368,7 +368,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -410,7 +410,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -452,7 +452,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -476,7 +476,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -500,7 +500,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -532,7 +532,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -564,7 +564,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_zooz_power_strip.lua b/drivers/SmartThings/zwave-switch/src/test/test_zooz_power_strip.lua
index 8ffb5f93f6..ac19d6e09d 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_zooz_power_strip.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_zooz_power_strip.lua
@@ -85,7 +85,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -124,7 +124,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -163,7 +163,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -202,7 +202,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -241,7 +241,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -280,7 +280,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -319,7 +319,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -359,7 +359,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -399,7 +399,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -439,7 +439,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -483,7 +483,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -526,7 +526,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -569,7 +569,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -612,7 +612,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -655,7 +655,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -698,7 +698,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -741,7 +741,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -784,7 +784,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -827,7 +827,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -870,7 +870,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -932,7 +932,7 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.switch.switch.off()))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -1011,7 +1011,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -1090,7 +1090,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -1126,7 +1126,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -1162,7 +1162,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -1198,7 +1198,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -1234,7 +1234,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -1270,7 +1270,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -1306,7 +1306,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -1342,7 +1342,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -1378,7 +1378,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -1414,7 +1414,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -1450,7 +1450,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_zooz_zen_30_dimmer_relay.lua b/drivers/SmartThings/zwave-switch/src/test/test_zooz_zen_30_dimmer_relay.lua
index b42d511166..b1d110298e 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_zooz_zen_30_dimmer_relay.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_zooz_zen_30_dimmer_relay.lua
@@ -94,7 +94,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -114,7 +114,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -146,7 +146,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -178,7 +178,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -218,7 +218,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -263,7 +263,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -312,7 +312,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -348,7 +348,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -380,7 +380,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -412,7 +412,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -443,7 +443,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -474,7 +474,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -505,7 +505,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -536,7 +536,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -572,7 +572,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -621,7 +621,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -648,7 +648,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -675,7 +675,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -702,7 +702,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -729,7 +729,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -756,7 +756,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -783,7 +783,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -810,7 +810,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -837,7 +837,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -864,7 +864,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -891,7 +891,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -918,7 +918,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -945,7 +945,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -972,7 +972,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -999,7 +999,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1026,7 +1026,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1053,7 +1053,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1080,7 +1080,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1107,7 +1107,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1129,7 +1129,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1157,7 +1157,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1185,7 +1185,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1224,7 +1224,7 @@ test.register_coroutine_test(
 
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1272,7 +1272,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -1291,7 +1291,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_zooz_zen_30_dimmer_relay_preferences.lua b/drivers/SmartThings/zwave-switch/src/test/test_zooz_zen_30_dimmer_relay_preferences.lua
index b021a25aa4..c9aab89b5b 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_zooz_zen_30_dimmer_relay_preferences.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_zooz_zen_30_dimmer_relay_preferences.lua
@@ -79,7 +79,7 @@ do
       test.wait_for_events()
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_zwave_dimmer_power_energy.lua b/drivers/SmartThings/zwave-switch/src/test/test_zwave_dimmer_power_energy.lua
index cd47374f82..a27fc27073 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_zwave_dimmer_power_energy.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_zwave_dimmer_power_energy.lua
@@ -72,7 +72,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -113,7 +113,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -157,7 +157,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -214,7 +214,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -246,7 +246,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -270,7 +270,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -339,7 +339,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -408,7 +408,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -441,7 +441,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_zwave_dual_switch.lua b/drivers/SmartThings/zwave-switch/src/test/test_zwave_dual_switch.lua
index 16b15348ce..8adad3b997 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_zwave_dual_switch.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_zwave_dual_switch.lua
@@ -82,7 +82,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -116,7 +116,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -150,7 +150,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -184,7 +184,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -218,7 +218,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -252,7 +252,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -286,7 +286,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -320,7 +320,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -360,7 +360,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -400,7 +400,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -440,7 +440,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -480,7 +480,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -520,7 +520,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -560,7 +560,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -600,7 +600,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -640,7 +640,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -664,7 +664,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -688,7 +688,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_zwave_dual_switch_migration.lua b/drivers/SmartThings/zwave-switch/src/test/test_zwave_dual_switch_migration.lua
index d11dd78b8c..a44ad2b94f 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_zwave_dual_switch_migration.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_zwave_dual_switch_migration.lua
@@ -74,7 +74,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -101,7 +101,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_zwave_switch.lua b/drivers/SmartThings/zwave-switch/src/test/test_zwave_switch.lua
index 15fbe8b065..1de2de863d 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_zwave_switch.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_zwave_switch.lua
@@ -78,7 +78,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -105,7 +105,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -129,7 +129,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -155,7 +155,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -178,7 +178,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -204,7 +204,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -238,7 +238,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -272,7 +272,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -306,7 +306,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -340,7 +340,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_zwave_switch_battery.lua b/drivers/SmartThings/zwave-switch/src/test/test_zwave_switch_battery.lua
index 608d92a052..42c28628b1 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_zwave_switch_battery.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_zwave_switch_battery.lua
@@ -45,7 +45,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -76,7 +76,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -110,7 +110,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_zwave_switch_electric_meter.lua b/drivers/SmartThings/zwave-switch/src/test/test_zwave_switch_electric_meter.lua
index 5ec6b0a340..e0a597d8fd 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_zwave_switch_electric_meter.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_zwave_switch_electric_meter.lua
@@ -57,7 +57,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -79,7 +79,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -118,7 +118,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -160,7 +160,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_zwave_switch_energy_meter.lua b/drivers/SmartThings/zwave-switch/src/test/test_zwave_switch_energy_meter.lua
index f1b382ee67..db94e1d02b 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_zwave_switch_energy_meter.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_zwave_switch_energy_meter.lua
@@ -63,7 +63,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -85,7 +85,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -116,7 +116,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -150,7 +150,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -162,7 +162,7 @@ test.register_coroutine_test(
     test.socket.zwave:__expect_send(zw_test_utils.zwave_test_build_send_command( mock_switch, Meter:Get({scale = Meter.scale.electric_meter.KILOWATT_HOURS})))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_zwave_switch_level.lua b/drivers/SmartThings/zwave-switch/src/test/test_zwave_switch_level.lua
index 1841b7c97e..aa7fbac8d5 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_zwave_switch_level.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_zwave_switch_level.lua
@@ -46,7 +46,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -72,7 +72,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
diff --git a/drivers/SmartThings/zwave-switch/src/test/test_zwave_switch_power_meter.lua b/drivers/SmartThings/zwave-switch/src/test/test_zwave_switch_power_meter.lua
index 7ea67ed56d..6fc72d3455 100644
--- a/drivers/SmartThings/zwave-switch/src/test/test_zwave_switch_power_meter.lua
+++ b/drivers/SmartThings/zwave-switch/src/test/test_zwave_switch_power_meter.lua
@@ -68,7 +68,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -85,7 +85,7 @@ test.register_message_test(
       },
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -116,7 +116,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -150,7 +150,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
diff --git a/drivers/SmartThings/zwave-thermostat/src/test/test_aeotec_radiator_thermostat.lua b/drivers/SmartThings/zwave-thermostat/src/test/test_aeotec_radiator_thermostat.lua
index 341926c301..c1eef9b5db 100644
--- a/drivers/SmartThings/zwave-thermostat/src/test/test_aeotec_radiator_thermostat.lua
+++ b/drivers/SmartThings/zwave-thermostat/src/test/test_aeotec_radiator_thermostat.lua
@@ -95,7 +95,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -114,7 +114,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -133,7 +133,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -164,7 +164,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -184,7 +184,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -207,7 +207,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -235,7 +235,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -268,7 +268,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-thermostat/src/test/test_ct100_thermostat.lua b/drivers/SmartThings/zwave-thermostat/src/test/test_ct100_thermostat.lua
index 29645b580d..4345cc211f 100644
--- a/drivers/SmartThings/zwave-thermostat/src/test/test_ct100_thermostat.lua
+++ b/drivers/SmartThings/zwave-thermostat/src/test/test_ct100_thermostat.lua
@@ -137,7 +137,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -165,7 +165,7 @@ test.register_coroutine_test(
     ))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -193,7 +193,7 @@ test.register_coroutine_test(
     ))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -221,7 +221,7 @@ test.register_coroutine_test(
     ))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -280,7 +280,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -339,7 +339,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -404,7 +404,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -473,7 +473,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -499,7 +499,7 @@ test.register_coroutine_test(
     ))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -524,7 +524,7 @@ test.register_coroutine_test(
     ))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-thermostat/src/test/test_fibaro_heat_controller.lua b/drivers/SmartThings/zwave-thermostat/src/test/test_fibaro_heat_controller.lua
index eee99d0445..a675ba4543 100644
--- a/drivers/SmartThings/zwave-thermostat/src/test/test_fibaro_heat_controller.lua
+++ b/drivers/SmartThings/zwave-thermostat/src/test/test_fibaro_heat_controller.lua
@@ -116,7 +116,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -174,7 +174,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -193,7 +193,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -216,7 +216,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -235,7 +235,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -266,7 +266,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -286,7 +286,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -309,7 +309,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -355,7 +355,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -383,7 +383,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -416,7 +416,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-thermostat/src/test/test_popp_radiator_thermostat.lua b/drivers/SmartThings/zwave-thermostat/src/test/test_popp_radiator_thermostat.lua
index 76b6dcc423..94324b0900 100644
--- a/drivers/SmartThings/zwave-thermostat/src/test/test_popp_radiator_thermostat.lua
+++ b/drivers/SmartThings/zwave-thermostat/src/test/test_popp_radiator_thermostat.lua
@@ -62,7 +62,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -81,7 +81,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -112,7 +112,7 @@ test.register_message_test(
     }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -135,7 +135,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -159,7 +159,7 @@ test.register_coroutine_test(
       test.mock_time.advance_time(200)
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -203,7 +203,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-thermostat/src/test/test_qubino_flush_thermostat.lua b/drivers/SmartThings/zwave-thermostat/src/test/test_qubino_flush_thermostat.lua
index d2cc7cd938..153910bce9 100644
--- a/drivers/SmartThings/zwave-thermostat/src/test/test_qubino_flush_thermostat.lua
+++ b/drivers/SmartThings/zwave-thermostat/src/test/test_qubino_flush_thermostat.lua
@@ -123,7 +123,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -146,7 +146,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -172,7 +172,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -193,7 +193,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -213,7 +213,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -240,7 +240,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -267,7 +267,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -324,7 +324,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -376,7 +376,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -404,7 +404,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -437,7 +437,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -465,7 +465,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -487,7 +487,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -517,7 +517,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       min_api_version = 15
     }
 )
 
@@ -570,7 +570,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-thermostat/src/test/test_stelpro_ki_thermostat.lua b/drivers/SmartThings/zwave-thermostat/src/test/test_stelpro_ki_thermostat.lua
index 2af3f3e24c..012f0e0f1f 100644
--- a/drivers/SmartThings/zwave-thermostat/src/test/test_stelpro_ki_thermostat.lua
+++ b/drivers/SmartThings/zwave-thermostat/src/test/test_stelpro_ki_thermostat.lua
@@ -68,7 +68,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -107,7 +107,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -146,7 +146,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -190,7 +190,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -234,7 +234,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -273,7 +273,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -312,7 +312,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -330,7 +330,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -351,7 +351,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -377,7 +377,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-thermostat/src/test/test_thermostat_heating_battery.lua b/drivers/SmartThings/zwave-thermostat/src/test/test_thermostat_heating_battery.lua
index bf6fc0e42e..113f707512 100644
--- a/drivers/SmartThings/zwave-thermostat/src/test/test_thermostat_heating_battery.lua
+++ b/drivers/SmartThings/zwave-thermostat/src/test/test_thermostat_heating_battery.lua
@@ -104,7 +104,7 @@ test.register_coroutine_test(
             do_initial_setup()
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -123,7 +123,7 @@ test.register_message_test(
             }
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -155,7 +155,7 @@ test.register_coroutine_test(
             ))
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -217,7 +217,7 @@ test.register_coroutine_test(
 
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -239,7 +239,7 @@ test.register_message_test(
             },
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -271,7 +271,7 @@ test.register_message_test(
             },
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -303,7 +303,7 @@ test.register_message_test(
             },
         },
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -332,7 +332,7 @@ test.register_coroutine_test(
 
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -425,7 +425,7 @@ test.register_coroutine_test(
             )
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -539,7 +539,7 @@ test.register_coroutine_test(
             )
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -642,7 +642,7 @@ test.register_coroutine_test(
 
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -728,7 +728,7 @@ test.register_coroutine_test(
 
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
@@ -770,7 +770,7 @@ test.register_coroutine_test(
         ))
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -810,7 +810,7 @@ test.register_coroutine_test(
 
         end,
         {
-           min_api_version = 17
+           
         }
 )
 
diff --git a/drivers/SmartThings/zwave-thermostat/src/test/test_zwave_thermostat.lua b/drivers/SmartThings/zwave-thermostat/src/test/test_zwave_thermostat.lua
index 900331c254..8e55b4abce 100644
--- a/drivers/SmartThings/zwave-thermostat/src/test/test_zwave_thermostat.lua
+++ b/drivers/SmartThings/zwave-thermostat/src/test/test_zwave_thermostat.lua
@@ -144,7 +144,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -163,7 +163,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -182,7 +182,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -201,7 +201,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -226,7 +226,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -250,7 +250,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -281,7 +281,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -304,7 +304,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -324,7 +324,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -344,7 +344,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -367,7 +367,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -390,7 +390,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -418,7 +418,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -446,7 +446,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -474,7 +474,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -502,7 +502,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -530,7 +530,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -558,7 +558,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -591,7 +591,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -645,7 +645,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -698,7 +698,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -753,7 +753,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-valve/src/test/test_inverse.valve.lua b/drivers/SmartThings/zwave-valve/src/test/test_inverse.valve.lua
index 801a1608eb..d69571a2e2 100644
--- a/drivers/SmartThings/zwave-valve/src/test/test_inverse.valve.lua
+++ b/drivers/SmartThings/zwave-valve/src/test/test_inverse.valve.lua
@@ -49,7 +49,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -70,7 +70,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -91,7 +91,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -112,7 +112,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -145,7 +145,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -178,7 +178,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-valve/src/test/test_zwave_valve.lua b/drivers/SmartThings/zwave-valve/src/test/test_zwave_valve.lua
index 3743f62fd5..d0b511d5dc 100644
--- a/drivers/SmartThings/zwave-valve/src/test/test_zwave_valve.lua
+++ b/drivers/SmartThings/zwave-valve/src/test/test_zwave_valve.lua
@@ -71,7 +71,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -90,7 +90,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -121,7 +121,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -152,7 +152,7 @@ test.register_message_test(
     },
     {
       inner_block_ordering = "relaxed",
-      min_api_version = 17
+      
     }
 )
 
@@ -185,7 +185,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -218,7 +218,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -251,7 +251,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -284,7 +284,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
diff --git a/drivers/SmartThings/zwave-virtual-momentary-switch/src/test/test_zwave_virtual_momentary_switch.lua b/drivers/SmartThings/zwave-virtual-momentary-switch/src/test/test_zwave_virtual_momentary_switch.lua
index e496b5a629..6edd0da450 100644
--- a/drivers/SmartThings/zwave-virtual-momentary-switch/src/test/test_zwave_virtual_momentary_switch.lua
+++ b/drivers/SmartThings/zwave-virtual-momentary-switch/src/test/test_zwave_virtual_momentary_switch.lua
@@ -67,7 +67,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -86,7 +86,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -113,7 +113,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -136,7 +136,7 @@ test.register_message_test(
   },
   {
     inner_block_ordering = "relaxed",
-    min_api_version = 17
+    
   }
 )
 
@@ -186,7 +186,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -236,7 +236,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -266,7 +266,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-window-treatment/src/test/test_fibaro_roller_shutter.lua b/drivers/SmartThings/zwave-window-treatment/src/test/test_fibaro_roller_shutter.lua
index ffeb175b43..11f7190ea6 100644
--- a/drivers/SmartThings/zwave-window-treatment/src/test/test_fibaro_roller_shutter.lua
+++ b/drivers/SmartThings/zwave-window-treatment/src/test/test_fibaro_roller_shutter.lua
@@ -68,7 +68,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -94,7 +94,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -120,7 +120,7 @@ test.register_message_test(
       }
     },
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -153,7 +153,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -186,7 +186,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -219,7 +219,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -253,7 +253,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -287,7 +287,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -309,7 +309,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -343,7 +343,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -377,7 +377,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -405,7 +405,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -431,7 +431,7 @@ test.register_coroutine_test(
       assert(mock_fibaro_roller_shutter:get_field("calibration") == "done", "Calibration should be done")
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -456,7 +456,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -483,7 +483,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -510,7 +510,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -537,7 +537,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -564,7 +564,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -591,7 +591,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -618,7 +618,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -645,7 +645,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -672,7 +672,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -699,7 +699,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -726,7 +726,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -753,7 +753,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -780,7 +780,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -807,7 +807,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -834,7 +834,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -851,7 +851,7 @@ test.register_coroutine_test(
     mock_fibaro_roller_shutter_venetian:expect_metadata_update({ profile = "fibaro-roller-shutter" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -867,7 +867,7 @@ test.register_coroutine_test(
     mock_fibaro_roller_shutter_venetian:expect_metadata_update({ profile = "fibaro-roller-shutter-venetian" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/SmartThings/zwave-window-treatment/src/test/test_qubino_flush_shutter.lua b/drivers/SmartThings/zwave-window-treatment/src/test/test_qubino_flush_shutter.lua
index 4127e8f7c4..cc21a19223 100644
--- a/drivers/SmartThings/zwave-window-treatment/src/test/test_qubino_flush_shutter.lua
+++ b/drivers/SmartThings/zwave-window-treatment/src/test/test_qubino_flush_shutter.lua
@@ -76,7 +76,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -109,7 +109,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -142,7 +142,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -175,7 +175,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -208,7 +208,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -230,7 +230,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -264,7 +264,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -297,7 +297,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -325,7 +325,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -358,7 +358,7 @@ test.register_coroutine_test(
       )
     end,
     {
-       min_api_version = 17
+       
     }
 )
 
@@ -383,7 +383,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -410,7 +410,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -437,7 +437,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -464,7 +464,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -491,7 +491,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -518,7 +518,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
@@ -563,7 +563,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -582,7 +582,7 @@ test.register_coroutine_test(
   mock_qubino_flush_shutter:expect_metadata_update({ profile = "qubino-flush-shutter-venetian" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -601,7 +601,7 @@ test.register_coroutine_test(
     mock_qubino_flush_shutter:expect_metadata_update({ profile = "qubino-flush-shutter" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -623,7 +623,7 @@ test.register_coroutine_test(
     assert(targetValue == mock_qubino_flush_shutter.transient_store.shade_target, "driver should chache correct level value")
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -653,7 +653,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -686,7 +686,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -713,7 +713,7 @@ test.register_message_test(
     }
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -739,7 +739,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     min_api_version = 15
   }
 )
 
@@ -772,7 +772,7 @@ do
       )
     end,
     {
-       min_api_version = 17
+       
     }
 
   )
diff --git a/drivers/SmartThings/zwave-window-treatment/src/test/test_zwave_aeotec_nano_shutter.lua b/drivers/SmartThings/zwave-window-treatment/src/test/test_zwave_aeotec_nano_shutter.lua
index 8f6442b0ee..590680062e 100644
--- a/drivers/SmartThings/zwave-window-treatment/src/test/test_zwave_aeotec_nano_shutter.lua
+++ b/drivers/SmartThings/zwave-window-treatment/src/test/test_zwave_aeotec_nano_shutter.lua
@@ -48,7 +48,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -69,7 +69,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -102,7 +102,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -141,7 +141,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -170,7 +170,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -199,7 +199,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -240,7 +240,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -287,7 +287,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -301,7 +301,7 @@ test.register_coroutine_test(
     mock_window_button:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -334,7 +334,7 @@ test.register_message_test(
     },
   },
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -349,7 +349,7 @@ test.register_coroutine_test(
     )
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
@@ -369,7 +369,7 @@ test.register_coroutine_test(
     ))
   end,
   {
-     min_api_version = 17
+     
   }
 )
 
diff --git a/drivers/Unofficial/tuya-zigbee/src/test/test_tuya_curtain.lua b/drivers/Unofficial/tuya-zigbee/src/test/test_tuya_curtain.lua
index 1cf3335d9e..23f96507ca 100644
--- a/drivers/Unofficial/tuya-zigbee/src/test/test_tuya_curtain.lua
+++ b/drivers/Unofficial/tuya-zigbee/src/test/test_tuya_curtain.lua
@@ -59,7 +59,10 @@ test.register_coroutine_test(
     test.socket.zigbee:__expect_send({ mock_simple_device.id, zigbee_test_utils.build_bind_request(mock_simple_device, zigbee_test_utils.mock_hub_eui, Basic.ID) })
     test.socket.zigbee:__expect_send({ mock_simple_device.id, Basic.attributes.ApplicationVersion:configure_reporting(mock_simple_device, 30, 300, 1) })
     mock_simple_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
-  end
+  end,
+  {
+    min_api_version = 17
+  }
 )
 
 test.register_coroutine_test(
@@ -89,7 +92,10 @@ test.register_coroutine_test(
         tuya_utils.build_send_tuya_command(mock_simple_device, '\x05', tuya_utils.DP_TYPE_ENUM, '\x00', 1)
       }
     )
-  end
+  end,
+  {
+    min_api_version = 17
+  }
 )
 
 test.register_coroutine_test(
@@ -131,7 +137,10 @@ test.register_coroutine_test(
     test.socket.capability:__expect_send(
       mock_simple_device:generate_test_message("main", capabilities.windowShadePreset.supportedCommands({"presetPosition", "setPresetPosition"}, {visibility = {displayed=false}}))
     )
-  end
+  end,
+  {
+    min_api_version = 17
+  }
 )
 
 test.register_message_test(
@@ -152,7 +161,10 @@ test.register_message_test(
         direction = "send",
         message = mock_simple_device:generate_test_message("main",  capabilities.windowShade.windowShade.opening())
       }
-    }
+    },
+  {
+    min_api_version = 17
+  }
 )
 
 test.register_message_test(
@@ -173,7 +185,10 @@ test.register_message_test(
         direction = "send",
         message = mock_simple_device:generate_test_message("main",  capabilities.windowShade.windowShade.closing())
       }
-    }
+    },
+  {
+    min_api_version = 17
+  }
 )
 
 test.register_message_test(
@@ -189,7 +204,10 @@ test.register_message_test(
         direction = "send",
         message = { mock_simple_device.id, tuya_utils.build_send_tuya_command(mock_simple_device, '\x01', tuya_utils.DP_TYPE_ENUM, '\x01', 0) }
       }
-    }
+    },
+  {
+    min_api_version = 17
+  }
 )
 
 test.register_message_test(
@@ -205,7 +223,10 @@ test.register_message_test(
         direction = "send",
         message = { mock_simple_device.id, tuya_utils.build_send_tuya_command(mock_simple_device, '\x02', tuya_utils.DP_TYPE_VALUE, '\x00\x00\x00\x3c', 0) }
       }
-    }
+    },
+  {
+    min_api_version = 17
+  }
 )
 
 test.register_message_test(
@@ -221,7 +242,10 @@ test.register_message_test(
         direction = "send",
         message = { mock_simple_device.id, tuya_utils.build_send_tuya_command(mock_simple_device, '\x02', tuya_utils.DP_TYPE_VALUE, '\x00\x00\x00\x32', 0) }
       }
-    }
+    },
+  {
+    min_api_version = 17
+  }
 )
 
 test.register_message_test(
@@ -242,7 +266,10 @@ test.register_message_test(
         direction = "send",
         message = mock_simple_device:generate_test_message("main",  capabilities.windowShade.windowShade("partially open"))
       }
-    }
+    },
+  {
+    min_api_version = 17
+  }
 )
 
 test.register_message_test(
@@ -259,7 +286,10 @@ test.register_message_test(
         -- For _TZE284_nladmfvf, level is inverted: 100 - 10 = 90 (0x5A)
         message = { mock_simple_device.id, tuya_utils.build_send_tuya_command(mock_simple_device, '\x02', tuya_utils.DP_TYPE_VALUE, '\x00\x00\x00\x5a', 0) }
       }
-    }
+    },
+  {
+    min_api_version = 17
+  }
 )
 
 test.register_message_test(
@@ -276,7 +306,10 @@ test.register_message_test(
         -- For _TZE284_nladmfvf, level is inverted: 100 - 0 = 100 (0x64), but clamped to 0 so 100 - 0 = 100
         message = { mock_simple_device.id, tuya_utils.build_send_tuya_command(mock_simple_device, '\x02', tuya_utils.DP_TYPE_VALUE, '\x00\x00\x00\x64', 0) }
       }
-    }
+    },
+  {
+    min_api_version = 17
+  }
 )
 
 test.register_coroutine_test(
@@ -305,7 +338,10 @@ test.register_coroutine_test(
       mock_simple_device.id,
       tuya_utils.build_send_tuya_command(mock_simple_device, '\x02', tuya_utils.DP_TYPE_VALUE, '\x00\x00\x00\x28', 0)
     })
-  end
+  end,
+  {
+    min_api_version = 17
+  }
 )
 
 test.register_coroutine_test(
@@ -334,7 +370,10 @@ test.register_coroutine_test(
       mock_simple_device.id,
       tuya_utils.build_send_tuya_command(mock_simple_device, '\x02', tuya_utils.DP_TYPE_VALUE, '\x00\x00\x00\x00', 0)
     })
-  end
+  end,
+  {
+    min_api_version = 17
+  }
 )
 
 test.register_coroutine_test(
@@ -363,7 +402,10 @@ test.register_coroutine_test(
       mock_simple_device.id,
       tuya_utils.build_send_tuya_command(mock_simple_device, '\x02', tuya_utils.DP_TYPE_VALUE, '\x00\x00\x00\x64', 0)
     })
-  end
+  end,
+  {
+    min_api_version = 17
+  }
 )
 
 test.register_coroutine_test(
@@ -405,7 +447,10 @@ test.register_coroutine_test(
       mock_simple_device.id,
       tuya_utils.build_send_tuya_command(mock_simple_device, '\x02', tuya_utils.DP_TYPE_VALUE, '\x00\x00\x00\x28', 1)
     })
-  end
+  end,
+  {
+    min_api_version = 17
+  }
 )
 
-test.run_registered_tests()
\ No newline at end of file
+test.run_registered_tests()
diff --git a/drivers/Unofficial/tuya-zigbee/src/test/test_tuya_switch.lua b/drivers/Unofficial/tuya-zigbee/src/test/test_tuya_switch.lua
index 97537c36ad..da6c87843a 100644
--- a/drivers/Unofficial/tuya-zigbee/src/test/test_tuya_switch.lua
+++ b/drivers/Unofficial/tuya-zigbee/src/test/test_tuya_switch.lua
@@ -254,6 +254,9 @@ test.register_message_test(
       direction = "send",
       message = { mock_parent_device.id, tuya_utils.build_send_tuya_command(mock_parent_device, '\x02', tuya_utils.DP_TYPE_BOOL, '\x01', 0) }
     }
+  },
+  {
+    min_api_version = 17
   }
 )
 
@@ -270,6 +273,9 @@ test.register_message_test(
       direction = "send",
       message = { mock_parent_device.id, tuya_utils.build_send_tuya_command(mock_parent_device, '\x03', tuya_utils.DP_TYPE_BOOL, '\x01', 0) }
     }
+  },
+  {
+    min_api_version = 17
   }
 )
 
@@ -286,6 +292,9 @@ test.register_message_test(
       direction = "send",
       message = { mock_parent_device.id, tuya_utils.build_send_tuya_command(mock_parent_device, '\x04', tuya_utils.DP_TYPE_BOOL, '\x01', 0) }
     }
+  },
+  {
+    min_api_version = 17
   }
 )
 
@@ -302,6 +311,9 @@ test.register_message_test(
       direction = "send",
       message = { mock_parent_device.id, tuya_utils.build_send_tuya_command(mock_parent_device, '\x05', tuya_utils.DP_TYPE_BOOL, '\x01', 0) }
     }
+  },
+  {
+    min_api_version = 17
   }
 )
 
@@ -318,6 +330,9 @@ test.register_message_test(
       direction = "send",
       message = { mock_parent_device.id, tuya_utils.build_send_tuya_command(mock_parent_device, '\x06', tuya_utils.DP_TYPE_BOOL, '\x01', 0) }
     }
+  },
+  {
+    min_api_version = 17
   }
 )
 
@@ -334,6 +349,9 @@ test.register_message_test(
       direction = "send",
       message = { mock_parent_device.id, tuya_utils.build_send_tuya_command(mock_parent_device, '\x01', tuya_utils.DP_TYPE_BOOL, '\x00', 0) }
     }
+  },
+  {
+    min_api_version = 17
   }
 )
 
@@ -350,6 +368,9 @@ test.register_message_test(
       direction = "send",
       message = { mock_parent_device.id, tuya_utils.build_send_tuya_command(mock_parent_device, '\x02', tuya_utils.DP_TYPE_BOOL, '\x00', 0) }
     }
+  },
+  {
+    min_api_version = 17
   }
 )
 
@@ -366,6 +387,9 @@ test.register_message_test(
       direction = "send",
       message = { mock_parent_device.id, tuya_utils.build_send_tuya_command(mock_parent_device, '\x03', tuya_utils.DP_TYPE_BOOL, '\x00', 0) }
     }
+  },
+  {
+    min_api_version = 17
   }
 )
 
@@ -382,6 +406,9 @@ test.register_message_test(
       direction = "send",
       message = { mock_parent_device.id, tuya_utils.build_send_tuya_command(mock_parent_device, '\x04', tuya_utils.DP_TYPE_BOOL, '\x00', 0) }
     }
+  },
+  {
+    min_api_version = 17
   }
 )
 
@@ -398,6 +425,9 @@ test.register_message_test(
       direction = "send",
       message = { mock_parent_device.id, tuya_utils.build_send_tuya_command(mock_parent_device, '\x05', tuya_utils.DP_TYPE_BOOL, '\x00', 0) }
     }
+  },
+  {
+    min_api_version = 17
   }
 )
 
@@ -414,6 +444,9 @@ test.register_message_test(
       direction = "send",
       message = { mock_parent_device.id, tuya_utils.build_send_tuya_command(mock_parent_device, '\x06', tuya_utils.DP_TYPE_BOOL, '\x00', 0) }
     }
+  },
+  {
+    min_api_version = 17
   }
 )
 
@@ -460,4 +493,4 @@ test.register_coroutine_test(
     end
 )
 
-test.run_registered_tests()
\ No newline at end of file
+test.run_registered_tests()
diff --git a/drivers/Unofficial/tuya-zigbee/src/test/test_tuya_thermostat.lua b/drivers/Unofficial/tuya-zigbee/src/test/test_tuya_thermostat.lua
index 4df634bf18..6198f22f94 100644
--- a/drivers/Unofficial/tuya-zigbee/src/test/test_tuya_thermostat.lua
+++ b/drivers/Unofficial/tuya-zigbee/src/test/test_tuya_thermostat.lua
@@ -166,7 +166,9 @@ test.register_message_test(
         }
       }
     },
-    {}
+    {
+      min_api_version = 17
+    }
 )
 
 test.register_message_test(
@@ -200,7 +202,9 @@ test.register_message_test(
         }
       }
     },
-    {}
+    {
+      min_api_version = 17
+    }
 )
 
 test.register_message_test(
@@ -234,7 +238,9 @@ test.register_message_test(
         }
       }
     },
-    {}
+    {
+      min_api_version = 17
+    }
 )
 
 test.register_message_test(
@@ -268,7 +274,9 @@ test.register_message_test(
         }
       }
     },
-    {}
+    {
+      min_api_version = 17
+    }
 )
 
 test.register_message_test(
@@ -302,7 +310,9 @@ test.register_message_test(
         }
       }
     },
-    {}
+    {
+      min_api_version = 17
+    }
 )
 
 test.register_message_test(
@@ -336,7 +346,9 @@ test.register_message_test(
         }
       }
     },
-    {}
+    {
+      min_api_version = 17
+    }
 )
 
 test.register_message_test(