diff --git a/controls/V-93249.rb b/controls/V-93249.rb
index 76d7b2e..825ec4e 100644
--- a/controls/V-93249.rb
+++ b/controls/V-93249.rb
@@ -56,7 +56,8 @@
       it { should_not have_property 'DriverLoadPolicy' }
     end
     describe registry_key('HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Policies\EarlyLaunch') do
-      its('DriverLoadPolicy') { should_not be 7 }
+      it { should have_property 'DriverLoadPolicy' }
+      its('DriverLoadPolicy') { should be_in [1, 3, 8] }
     end
   end
 end
diff --git a/controls/V-93261.rb b/controls/V-93261.rb
index 584a57c..f02d49a 100644
--- a/controls/V-93261.rb
+++ b/controls/V-93261.rb
@@ -46,11 +46,9 @@
     describe registry_key('HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Explorer') do
       it { should have_property 'NoHeapTerminationOnCorruption' }
       its('NoHeapTerminationOnCorruption') { should_not be 1 }
-    end
-    describe registry_key('HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Explorer') do
-      it { should have_property 'NoHeapTerminationOnCorruption' }
       its('NoHeapTerminationOnCorruption') { should cmp 0 }
     end
+    
   end
 end
 
diff --git a/controls/V-93263.rb b/controls/V-93263.rb
index bb8e78b..4eec2d4 100644
--- a/controls/V-93263.rb
+++ b/controls/V-93263.rb
@@ -48,9 +48,6 @@
     describe registry_key('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer') do
       it { should have_property 'PreXPSP2ShellProtocolBehavior' }
       its('PreXPSP2ShellProtocolBehavior') { should_not be 1 }
-    end
-    describe registry_key('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer') do
-      it { should have_property 'PreXPSP2ShellProtocolBehavior' }
       its('PreXPSP2ShellProtocolBehavior') { should cmp 0 }
     end
   end
diff --git a/controls/V-93267.rb b/controls/V-93267.rb
index 1ebdc0b..b57c832 100644
--- a/controls/V-93267.rb
+++ b/controls/V-93267.rb
@@ -47,9 +47,8 @@
       it { should_not have_property 'SafeForScripting' }
     end
     describe registry_key('HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Installer') do
-      its('SafeForScripting') { should_not be 1 }
-    end
-    describe registry_key('HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Installer') do
+      it { should have_property 'SafeForScripting' }
+      its('SafeForScripting') { should_not cmp 1 }
       its('SafeForScripting') { should cmp 0 }
     end
   end
diff --git a/controls/V-93311.rb b/controls/V-93311.rb
index 4c8bf9f..9a2f45b 100644
--- a/controls/V-93311.rb
+++ b/controls/V-93311.rb
@@ -30,13 +30,14 @@
   tag cci: ["CCI-000366"]
   tag nist: ["CM-6 b", "Rev_4"]
 
-  if registry_key('HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Attachments').has_property?('SaveZoneInformation')
+  describe.one do
     describe registry_key('HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Attachments') do
-    its('SaveZoneInformation') { should cmp 2 }
+      it { should_not have_property 'SaveZoneInformation' }
     end
-  else
     describe registry_key('HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Attachments') do
-      it { should_not have_property 'SaveZoneInformation' }
+      it { should have_property 'SaveZoneInformation' }
+      its('SaveZoneInformation') { should_not cmp 1 }
+      its('SaveZoneInformation') { should cmp 2 }
     end
   end
 end
\ No newline at end of file
diff --git a/controls/V-93413.rb b/controls/V-93413.rb
index ef4febf..f781bec 100644
--- a/controls/V-93413.rb
+++ b/controls/V-93413.rb
@@ -29,13 +29,14 @@
   tag cci: ["CCI-000381"]
   tag nist: ["CM-7 a", "Rev_4"]
 
-  if registry_key('HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Internet Explorer\Feeds').has_property?('AllowBasicAuthInClear')
+  describe.one do 
     describe registry_key('HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Internet Explorer\Feeds') do
-    its('AllowBasicAuthInClear') { should cmp 0 }
+      it { should_not have_property 'AllowBasicAuthInClear' }
     end
-  else
     describe registry_key('HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Internet Explorer\Feeds') do
-      it { should_not have_property 'AllowBasicAuthInClear' }
+      it { should have_property 'AllowBasicAuthInClear' }
+      its('AllowBasicAuthInClear') { should_not cmp 1 }
+      its('AllowBasicAuthInClear') { should cmp 0 }
     end
   end
 end
\ No newline at end of file
diff --git a/controls/V-93563.rb b/controls/V-93563.rb
index 32b76e3..fd12995 100644
--- a/controls/V-93563.rb
+++ b/controls/V-93563.rb
@@ -27,13 +27,14 @@
   tag cci: ["CCI-002824"]
   tag nist: ["SI-16", "Rev_4"]
 
-  if registry_key('HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Explorer').has_property?('NoDataExecutionPrevention')
+  describe.one do 
     describe registry_key('HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Explorer') do
-    its('NoDataExecutionPrevention') { should cmp 0 }
+      it { should_not have_property 'NoDataExecutionPrevention' }
     end
-  else
     describe registry_key('HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Explorer') do
-      it { should_not have_property 'NoDataExecutionPrevention' }
+      it { should have_property 'NoDataExecutionPrevention' }
+      its('NoDataExecutionPrevention') { should_not cmp 1 }
+      its('NoDataExecutionPrevention') { should cmp 0 }
     end
   end
 end
\ No newline at end of file