diff --git a/ci/scripts/test-module.sh b/ci/scripts/test-module.sh
index a89ddba..5bfb363 100755
--- a/ci/scripts/test-module.sh
+++ b/ci/scripts/test-module.sh
@@ -9,6 +9,7 @@ cat main.tf
 terraform init
 terraform validate
 # Create
+export SOLACEBROKER_SKIP_API_CHECK=true
 terraform plan $2
 terraform apply -auto-approve $2
 # terraform plan $2 | grep "No changes"
diff --git a/examples/adding-headers/main.tf b/examples/adding-headers/main.tf
index 9ef25b0..3406f03 100644
--- a/examples/adding-headers/main.tf
+++ b/examples/adding-headers/main.tf
@@ -13,15 +13,13 @@
 # limitations under the License.
 
 provider "solacebroker" {
-  username       = "admin"
-  password       = "admin"
-  url            = "http://localhost:8080"
-  skip_api_check = true
+  username = "admin"
+  password = "admin"
+  url      = "http://localhost:8080"
 }
 
 # The RDP requires a queue to bind to.
-# Recommended: Use the queue-endpoint module to create the queue
-# TODO: Uncomment the following block and replace the resource block once the queue-endpoint module is available
+# Option: Use the queue-endpoint module to create the queue. If using this option then also uncomment the queue_name in module "testrdp" below.
 # module "rdp_queue" {
 #   source = SolaceProducts/queue-endpoint/solacebroker
 #
diff --git a/examples/adding-headers/providers.tf b/examples/adding-headers/providers.tf
index 1c3168b..f8ad495 100644
--- a/examples/adding-headers/providers.tf
+++ b/examples/adding-headers/providers.tf
@@ -18,7 +18,7 @@ terraform {
   required_providers {
     solacebroker = {
       source  = "registry.terraform.io/solaceproducts/solacebrokerappliance"
-      version = "~> 0.9"
+      version = "~> 1.0"
     }
   }
   required_version = "~> 1.2"
diff --git a/examples/basic/main.tf b/examples/basic/main.tf
index 6426a21..87a951b 100644
--- a/examples/basic/main.tf
+++ b/examples/basic/main.tf
@@ -13,15 +13,13 @@
 # limitations under the License.
 
 provider "solacebroker" {
-  username       = "admin"
-  password       = "admin"
-  url            = "http://localhost:8080"
-  skip_api_check = true
+  username = "admin"
+  password = "admin"
+  url      = "http://localhost:8080"
 }
 
 # The RDP requires a queue to bind to.
-# Recommended: Use the queue-endpoint module to create the queue
-# TODO: Uncomment the following block and replace the resource block once the queue-endpoint module is available
+# Option: Use the queue-endpoint module to create the queue. If using this option then also uncomment the queue_name in module "testrdp" below.
 # module "rdp_queue" {
 #   source = SolaceProducts/queue-endpoint/solacebroker
 #
diff --git a/examples/basic/providers.tf b/examples/basic/providers.tf
index 1c3168b..f8ad495 100644
--- a/examples/basic/providers.tf
+++ b/examples/basic/providers.tf
@@ -18,7 +18,7 @@ terraform {
   required_providers {
     solacebroker = {
       source  = "registry.terraform.io/solaceproducts/solacebrokerappliance"
-      version = "~> 0.9"
+      version = "~> 1.0"
     }
   }
   required_version = "~> 1.2"
diff --git a/examples/using-substitution-expressions/main.tf b/examples/using-substitution-expressions/main.tf
index 2d82ffd..b353ee2 100644
--- a/examples/using-substitution-expressions/main.tf
+++ b/examples/using-substitution-expressions/main.tf
@@ -13,15 +13,13 @@
 # limitations under the License.
 
 provider "solacebroker" {
-  username       = "admin"
-  password       = "admin"
-  url            = "http://localhost:8080"
-  skip_api_check = true
+  username = "admin"
+  password = "admin"
+  url      = "http://localhost:8080"
 }
 
 # The RDP requires a queue to bind to.
-# Recommended: Use the queue-endpoint module to create the queue
-# TODO: Uncomment the following block and replace the resource block once the queue-endpoint module is available
+# Option: Use the queue-endpoint module to create the queue. If using this option then also uncomment the queue_name in module "testrdp" below.
 # module "rdp_queue" {
 #   source = SolaceProducts/queue-endpoint/solacebroker
 #
diff --git a/examples/using-substitution-expressions/providers.tf b/examples/using-substitution-expressions/providers.tf
index 1c3168b..f8ad495 100644
--- a/examples/using-substitution-expressions/providers.tf
+++ b/examples/using-substitution-expressions/providers.tf
@@ -18,7 +18,7 @@ terraform {
   required_providers {
     solacebroker = {
       source  = "registry.terraform.io/solaceproducts/solacebrokerappliance"
-      version = "~> 0.9"
+      version = "~> 1.0"
     }
   }
   required_version = "~> 1.2"