diff --git a/src/test/resources/autoregionlookup-cache.xml b/src/test/resources/autoregionlookup-cache.xml
index a6abc0d7..384c9f2d 100644
--- a/src/test/resources/autoregionlookup-cache.xml
+++ b/src/test/resources/autoregionlookup-cache.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache xmlns="http://geode.apache.org/schema/cache"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+	   xsi:schemaLocation="http://geode.apache.org/schema/cache https://geode.apache.org/schema/cache/cache-1.0.xsd"
 	   version="1.0">
 
 	<region name="NativePartitionedRegion" refid="PARTITION"/>
diff --git a/src/test/resources/cache-with-declarable.xml b/src/test/resources/cache-with-declarable.xml
index 3b5f244a..e99ee18a 100644
--- a/src/test/resources/cache-with-declarable.xml
+++ b/src/test/resources/cache-with-declarable.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache xmlns="http://geode.apache.org/schema/cache"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+	   xsi:schemaLocation="http://geode.apache.org/schema/cache https://geode.apache.org/schema/cache/cache-1.0.xsd"
 	   version="1.0">
 
 	<region name="Example">
diff --git a/src/test/resources/cache-with-regions.xml b/src/test/resources/cache-with-regions.xml
index d96f7c86..2ca2acd8 100644
--- a/src/test/resources/cache-with-regions.xml
+++ b/src/test/resources/cache-with-regions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache xmlns="http://geode.apache.org/schema/cache"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+	   xsi:schemaLocation="http://geode.apache.org/schema/cache https://geode.apache.org/schema/cache/cache-1.0.xsd"
 	   version="1.0">
 
 	<region name="NativeLocalRegion" refid="LOCAL">
diff --git a/src/test/resources/cache-with-spring-context-bootstrap-initializer-using-base-packages.xml b/src/test/resources/cache-with-spring-context-bootstrap-initializer-using-base-packages.xml
index bfaefcc6..4bc04122 100644
--- a/src/test/resources/cache-with-spring-context-bootstrap-initializer-using-base-packages.xml
+++ b/src/test/resources/cache-with-spring-context-bootstrap-initializer-using-base-packages.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache xmlns="http://geode.apache.org/schema/cache"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+	   xsi:schemaLocation="http://geode.apache.org/schema/cache https://geode.apache.org/schema/cache/cache-1.0.xsd"
 	   version="1.0">
 
 	<region name="Users" refid="REPLICATE">
diff --git a/src/test/resources/cache-with-spring-context-bootstrap-initializer.xml b/src/test/resources/cache-with-spring-context-bootstrap-initializer.xml
index 7338d6e9..a45f7099 100644
--- a/src/test/resources/cache-with-spring-context-bootstrap-initializer.xml
+++ b/src/test/resources/cache-with-spring-context-bootstrap-initializer.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache xmlns="http://geode.apache.org/schema/cache"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+	   xsi:schemaLocation="http://geode.apache.org/schema/cache https://geode.apache.org/schema/cache/cache-1.0.xsd"
 	   version="1.0">
 
 	<region name="Users" refid="REPLICATE">
diff --git a/src/test/resources/clientcache-with-regions.xml b/src/test/resources/clientcache-with-regions.xml
index 2da6b5a4..384c4ee8 100644
--- a/src/test/resources/clientcache-with-regions.xml
+++ b/src/test/resources/clientcache-with-regions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <client-cache xmlns="http://geode.apache.org/schema/cache"
 			  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-			  xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+			  xsi:schemaLocation="http://geode.apache.org/schema/cache https://geode.apache.org/schema/cache/cache-1.0.xsd"
 			  version="1.0">
 
 	<region name="NativeClientRegion" refid="LOCAL">
diff --git a/src/test/resources/empty-cache.xml b/src/test/resources/empty-cache.xml
index 183dd436..f5965f40 100644
--- a/src/test/resources/empty-cache.xml
+++ b/src/test/resources/empty-cache.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache xmlns="http://geode.apache.org/schema/cache"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+	   xsi:schemaLocation="http://geode.apache.org/schema/cache https://geode.apache.org/schema/cache/cache-1.0.xsd"
 	   version="1.0">
 
 </cache>
diff --git a/src/test/resources/empty-client-cache.xml b/src/test/resources/empty-client-cache.xml
index bf30b4c8..75e10385 100644
--- a/src/test/resources/empty-client-cache.xml
+++ b/src/test/resources/empty-client-cache.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <client-cache xmlns="http://geode.apache.org/schema/cache"
 			  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-			  xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+			  xsi:schemaLocation="http://geode.apache.org/schema/cache https://geode.apache.org/schema/cache/cache-1.0.xsd"
 			  version="1.0">
 
 </client-cache>
diff --git a/src/test/resources/gemfire-cache.xml b/src/test/resources/gemfire-cache.xml
index 22b1f636..bb3af478 100644
--- a/src/test/resources/gemfire-cache.xml
+++ b/src/test/resources/gemfire-cache.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache xmlns="http://geode.apache.org/schema/cache"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
-	   version="1.0" lock-lease="120" lock-timeout="60" search-timeout="300">
+	   xsi:schemaLocation="http://geode.apache.org/schema/cache https://geode.apache.org/schema/cache/cache-1.0.xsd"
+	   version="1.0"
+	   lock-lease="120" lock-timeout="60" search-timeout="300">
 
-	<region-attributes id="attTemplate" scope="local" data-policy="normal" initial-capacity="16" load-factor="0.75"
-					   concurrency-level="16" statistics-enabled="true">
+	<region-attributes id="attTemplate"
+					   concurrency-level="16"
+					   data-policy="normal"
+					   initial-capacity="16"
+					   load-factor="0.75"
+					   scope="local"
+					   statistics-enabled="true">
 		<key-constraint>java.lang.String</key-constraint>
 	</region-attributes>
 
diff --git a/src/test/resources/gemfire-client-cache.xml b/src/test/resources/gemfire-client-cache.xml
index ec681db1..273985d4 100644
--- a/src/test/resources/gemfire-client-cache.xml
+++ b/src/test/resources/gemfire-client-cache.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <client-cache xmlns="http://geode.apache.org/schema/cache"
 			  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-			  xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+			  xsi:schemaLocation="http://geode.apache.org/schema/cache https://geode.apache.org/schema/cache/cache-1.0.xsd"
 			  version="1.0">
 
 	<pool name="DEFAULT">
@@ -9,7 +9,5 @@
 	</pool>
 
 	<region name="myRegion" refid="PROXY"/>
-	<!-- you can override or add to the PROXY attributes by adding a region-attributes sub element here -->
 
 </client-cache>
-
diff --git a/src/test/resources/gemfire-datasource-integration-test-cache.xml b/src/test/resources/gemfire-datasource-integration-test-cache.xml
index 3ea2a4d4..fbc7e34d 100644
--- a/src/test/resources/gemfire-datasource-integration-test-cache.xml
+++ b/src/test/resources/gemfire-datasource-integration-test-cache.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache xmlns="http://geode.apache.org/schema/cache"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+	   xsi:schemaLocation="http://geode.apache.org/schema/cache https://geode.apache.org/schema/cache/cache-1.0.xsd"
 	   version="1.0">
 
 	<cache-server hostname-for-clients="localhost" port="42082"/>
diff --git a/src/test/resources/lazy-wiring-declarable-support-function-cache.xml b/src/test/resources/lazy-wiring-declarable-support-function-cache.xml
index 88b171e0..fb406945 100644
--- a/src/test/resources/lazy-wiring-declarable-support-function-cache.xml
+++ b/src/test/resources/lazy-wiring-declarable-support-function-cache.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache xmlns="http://geode.apache.org/schema/cache"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+	   xsi:schemaLocation="http://geode.apache.org/schema/cache https://geode.apache.org/schema/cache/cache-1.0.xsd"
 	   version="1.0">
 
 	<function-service>
diff --git a/src/test/resources/lookup-region-mutation-cache.xml b/src/test/resources/lookup-region-mutation-cache.xml
index 61c3cdee..137aeeca 100644
--- a/src/test/resources/lookup-region-mutation-cache.xml
+++ b/src/test/resources/lookup-region-mutation-cache.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache xmlns="http://geode.apache.org/schema/cache"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+	   xsi:schemaLocation="http://geode.apache.org/schema/cache https://geode.apache.org/schema/cache/cache-1.0.xsd"
 	   version="1.0">
 
 	<region name="Example">
diff --git a/src/test/resources/non-cluster-config-cache.xml b/src/test/resources/non-cluster-config-cache.xml
index f77ebd32..cdfbcf5c 100644
--- a/src/test/resources/non-cluster-config-cache.xml
+++ b/src/test/resources/non-cluster-config-cache.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache xmlns="http://geode.apache.org/schema/cache"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+	   xsi:schemaLocation="http://geode.apache.org/schema/cache https://geode.apache.org/schema/cache/cache-1.0.xsd"
 	   version="1.0">
 
 	<region name="NativeLocalRegion" refid="LOCAL">
diff --git a/src/test/resources/subregion-cache.xml b/src/test/resources/subregion-cache.xml
index 984581d6..19193c8d 100644
--- a/src/test/resources/subregion-cache.xml
+++ b/src/test/resources/subregion-cache.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cache xmlns="http://geode.apache.org/schema/cache"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd"
+	   xsi:schemaLocation="http://geode.apache.org/schema/cache https://geode.apache.org/schema/cache/cache-1.0.xsd"
 	   version="1.0">
 
 	<region name="Parent" refid="REPLICATE">