diff --git a/pyracf/access/access_admin.py b/pyracf/access/access_admin.py
index 4ac104d3..494ac4b1 100644
--- a/pyracf/access/access_admin.py
+++ b/pyracf/access/access_admin.py
@@ -67,7 +67,7 @@ def permit(
         traits["base:id"] = auth_id
         self._build_segment_dictionaries(traits)
         access_request = AccessRequest(resource, class_name, "set", volume, generic)
-        self._add_traits_directly_to_request_xml_with_no_segments(access_request)
+        self._add_traits_directly_to_request_xml_with_no_segments(access_request, alter=True)
         return self._make_request(access_request)
 
     def delete(
diff --git a/pyracf/connection/connection_admin.py b/pyracf/connection/connection_admin.py
index c5f33f31..f76af254 100644
--- a/pyracf/connection/connection_admin.py
+++ b/pyracf/connection/connection_admin.py
@@ -123,7 +123,7 @@ def connect(self, userid: str, group: str, traits: dict = {}) -> Union[dict, byt
         """Establish or change a group connection."""
         self._build_segment_dictionaries(traits)
         connection_request = ConnectionRequest(userid, group, "set")
-        self._add_traits_directly_to_request_xml_with_no_segments(connection_request)
+        self._add_traits_directly_to_request_xml_with_no_segments(connection_request, alter=True)
         return self._make_request(connection_request)
 
     def delete(self, userid: str, group: str) -> Union[dict, bytes]:
diff --git a/pyracf/setropts/setropts_admin.py b/pyracf/setropts/setropts_admin.py
index 19597907..52734e8e 100644
--- a/pyracf/setropts/setropts_admin.py
+++ b/pyracf/setropts/setropts_admin.py
@@ -325,7 +325,7 @@ def alter(self, options: dict = {}) -> Union[dict, bytes]:
         """Update RACF options."""
         self._build_segment_dictionaries(options)
         setropts_request = SetroptsRequest()
-        self._add_traits_directly_to_request_xml_with_no_segments(setropts_request)
+        self._add_traits_directly_to_request_xml_with_no_segments(setropts_request, alter=True)
         return self._make_request(setropts_request)
 
     # ============================================================================
diff --git a/tests/access/access_log_samples/permit_access_error.log b/tests/access/access_log_samples/permit_access_error.log
index deaeaf6f..a4b8f7e7 100644
--- a/tests/access/access_log_samples/permit_access_error.log
+++ b/tests/access/access_log_samples/permit_access_error.log
@@ -25,8 +25,8 @@
 
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <permission name="TESTING" class="ELIJTEST" operation="set" requestid="AccessRequest">
-    <access>ALTER</access>
-    <authid>MCGINLEY</authid>
+    <access operation="set">ALTER</access>
+    <authid operation="set">MCGINLEY</authid>
   </permission>
 </securityrequest>
 
diff --git a/tests/access/access_log_samples/permit_access_success.log b/tests/access/access_log_samples/permit_access_success.log
index f7440155..8ab1b307 100644
--- a/tests/access/access_log_samples/permit_access_success.log
+++ b/tests/access/access_log_samples/permit_access_success.log
@@ -25,8 +25,8 @@
 
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <permission name="TESTING" class="ELIJTEST" operation="set" requestid="AccessRequest">
-    <access>NONE</access>
-    <authid>ESWIFT</authid>
+    <access operation="set">NONE</access>
+    <authid operation="set">ESWIFT</authid>
   </permission>
 </securityrequest>
 
diff --git a/tests/access/access_request_samples/permit_access_request.xml b/tests/access/access_request_samples/permit_access_request.xml
index 8771e90f..60ae67eb 100644
--- a/tests/access/access_request_samples/permit_access_request.xml
+++ b/tests/access/access_request_samples/permit_access_request.xml
@@ -1,6 +1,6 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <permission name="TESTING" class="ELIJTEST" operation="set" requestid="AccessRequest">
-    <access>NONE</access>
-    <authid>ESWIFT</authid>
+    <access operation="set">NONE</access>
+    <authid operation="set">ESWIFT</authid>
   </permission>
 </securityrequest>
\ No newline at end of file
diff --git a/tests/connection/connection_log_samples/connect_connection_error.log b/tests/connection/connection_log_samples/connect_connection_error.log
index 4fb7a2ba..c7473430 100644
--- a/tests/connection/connection_log_samples/connect_connection_error.log
+++ b/tests/connection/connection_log_samples/connect_connection_error.log
@@ -26,7 +26,7 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <groupconnection name="ESWIFT" group="TESTGRP0" operation="set" requestid="ConnectionRequest">
     <racf:oper operation="del"/>
-    <racf:special/>
+    <racf:special operation="set"/>
   </groupconnection>
 </securityrequest>
 
diff --git a/tests/connection/connection_log_samples/connect_connection_success.log b/tests/connection/connection_log_samples/connect_connection_success.log
index a25b4c01..f7782fa8 100644
--- a/tests/connection/connection_log_samples/connect_connection_success.log
+++ b/tests/connection/connection_log_samples/connect_connection_success.log
@@ -26,7 +26,7 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <groupconnection name="ESWIFT" group="TESTGRP0" operation="set" requestid="ConnectionRequest">
     <racf:oper operation="del"/>
-    <racf:special/>
+    <racf:special operation="set"/>
   </groupconnection>
 </securityrequest>
 
diff --git a/tests/connection/connection_request_samples/connect_connection_request.xml b/tests/connection/connection_request_samples/connect_connection_request.xml
index 7affef1e..f6c274d1 100644
--- a/tests/connection/connection_request_samples/connect_connection_request.xml
+++ b/tests/connection/connection_request_samples/connect_connection_request.xml
@@ -1,6 +1,6 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <groupconnection name="ESWIFT" group="TESTGRP0" operation="set" requestid="ConnectionRequest">
     <racf:oper operation="del" />
-    <racf:special />
+    <racf:special operation="set" />
   </groupconnection>
 </securityrequest>
\ No newline at end of file
diff --git a/tests/connection/connection_request_samples/connection_give_group_access_attribute.xml b/tests/connection/connection_request_samples/connection_give_group_access_attribute.xml
index 92cf26c7..e5d15a33 100644
--- a/tests/connection/connection_request_samples/connection_give_group_access_attribute.xml
+++ b/tests/connection/connection_request_samples/connection_give_group_access_attribute.xml
@@ -1,5 +1,5 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <groupconnection name="ESWIFT" group="TESTGRP0" operation="set" requestid="ConnectionRequest">
-    <racf:grpacc />
+    <racf:grpacc operation="set" />
   </groupconnection>
 </securityrequest>
\ No newline at end of file
diff --git a/tests/connection/connection_request_samples/connection_give_group_auditor_authority.xml b/tests/connection/connection_request_samples/connection_give_group_auditor_authority.xml
index fa848e9b..8bb8b7af 100644
--- a/tests/connection/connection_request_samples/connection_give_group_auditor_authority.xml
+++ b/tests/connection/connection_request_samples/connection_give_group_auditor_authority.xml
@@ -1,5 +1,5 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <groupconnection name="ESWIFT" group="TESTGRP0" operation="set" requestid="ConnectionRequest">
-    <racf:auditor />
+    <racf:auditor operation="set" />
   </groupconnection>
 </securityrequest>
\ No newline at end of file
diff --git a/tests/connection/connection_request_samples/connection_give_group_operations_authority.xml b/tests/connection/connection_request_samples/connection_give_group_operations_authority.xml
index c11cc010..cfaf13fa 100644
--- a/tests/connection/connection_request_samples/connection_give_group_operations_authority.xml
+++ b/tests/connection/connection_request_samples/connection_give_group_operations_authority.xml
@@ -1,5 +1,5 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <groupconnection name="ESWIFT" group="TESTGRP0" operation="set" requestid="ConnectionRequest">
-    <racf:oper />
+    <racf:oper operation="set" />
   </groupconnection>
 </securityrequest>
\ No newline at end of file
diff --git a/tests/connection/connection_request_samples/connection_give_group_special_authority.xml b/tests/connection/connection_request_samples/connection_give_group_special_authority.xml
index cffa6721..b39b16c9 100644
--- a/tests/connection/connection_request_samples/connection_give_group_special_authority.xml
+++ b/tests/connection/connection_request_samples/connection_give_group_special_authority.xml
@@ -1,5 +1,5 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <groupconnection name="ESWIFT" group="TESTGRP0" operation="set" requestid="ConnectionRequest">
-    <racf:special />
+    <racf:special operation="set" />
   </groupconnection>
 </securityrequest>
\ No newline at end of file
diff --git a/tests/setropts/setropts_log_samples/alter_setropts_error.log b/tests/setropts/setropts_log_samples/alter_setropts_error.log
index 6058b6ef..246e426c 100644
--- a/tests/setropts/setropts_log_samples/alter_setropts_error.log
+++ b/tests/setropts/setropts_log_samples/alter_setropts_error.log
@@ -21,7 +21,7 @@
 
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <systemsettings operation="set" requestid="SetroptsRequest">
-    <racf:raclist>ELIXTEST</racf:raclist>
+    <racf:raclist operation="set">ELIXTEST</racf:raclist>
   </systemsettings>
 </securityrequest>
 
diff --git a/tests/setropts/setropts_log_samples/alter_setropts_success.log b/tests/setropts/setropts_log_samples/alter_setropts_success.log
index 3f910df0..7bd71b7a 100644
--- a/tests/setropts/setropts_log_samples/alter_setropts_success.log
+++ b/tests/setropts/setropts_log_samples/alter_setropts_success.log
@@ -21,7 +21,7 @@
 
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <systemsettings operation="set" requestid="SetroptsRequest">
-    <racf:raclist>ELIJTEST</racf:raclist>
+    <racf:raclist operation="set">ELIJTEST</racf:raclist>
   </systemsettings>
 </securityrequest>
 
diff --git a/tests/setropts/setropts_request_samples/alter_setropts_request.xml b/tests/setropts/setropts_request_samples/alter_setropts_request.xml
index 6a4ea90e..fd44ed7d 100644
--- a/tests/setropts/setropts_request_samples/alter_setropts_request.xml
+++ b/tests/setropts/setropts_request_samples/alter_setropts_request.xml
@@ -1,5 +1,5 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <systemsettings operation="set" requestid="SetroptsRequest">
-    <racf:raclist>elijtest</racf:raclist>
+    <racf:raclist operation="set">elijtest</racf:raclist>
   </systemsettings>
 </securityrequest>
\ No newline at end of file
diff --git a/tests/setropts/setropts_request_samples/setropts_add_active_class.xml b/tests/setropts/setropts_request_samples/setropts_add_active_class.xml
index b958f256..56930364 100644
--- a/tests/setropts/setropts_request_samples/setropts_add_active_class.xml
+++ b/tests/setropts/setropts_request_samples/setropts_add_active_class.xml
@@ -1,5 +1,5 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <systemsettings operation="set" requestid="SetroptsRequest">
-    <racf:classact>elijtest</racf:classact>
+    <racf:classact operation="set">elijtest</racf:classact>
   </systemsettings>
 </securityrequest>
\ No newline at end of file
diff --git a/tests/setropts/setropts_request_samples/setropts_add_active_classes.xml b/tests/setropts/setropts_request_samples/setropts_add_active_classes.xml
index 91b4edcc..50c0b32d 100644
--- a/tests/setropts/setropts_request_samples/setropts_add_active_classes.xml
+++ b/tests/setropts/setropts_request_samples/setropts_add_active_classes.xml
@@ -1,5 +1,5 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <systemsettings operation="set" requestid="SetroptsRequest">
-    <racf:classact>elijtest xfacilit</racf:classact>
+    <racf:classact operation="set">elijtest xfacilit</racf:classact>
   </systemsettings>
 </securityrequest>
\ No newline at end of file
diff --git a/tests/setropts/setropts_request_samples/setropts_add_audit_class.xml b/tests/setropts/setropts_request_samples/setropts_add_audit_class.xml
index 661f213e..2be3f6d0 100644
--- a/tests/setropts/setropts_request_samples/setropts_add_audit_class.xml
+++ b/tests/setropts/setropts_request_samples/setropts_add_audit_class.xml
@@ -1,5 +1,5 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <systemsettings operation="set" requestid="SetroptsRequest">
-    <racf:audit>elijtest</racf:audit>
+    <racf:audit operation="set">elijtest</racf:audit>
   </systemsettings>
 </securityrequest>
\ No newline at end of file
diff --git a/tests/setropts/setropts_request_samples/setropts_add_audit_classes.xml b/tests/setropts/setropts_request_samples/setropts_add_audit_classes.xml
index 7871f86b..d6d71cb3 100644
--- a/tests/setropts/setropts_request_samples/setropts_add_audit_classes.xml
+++ b/tests/setropts/setropts_request_samples/setropts_add_audit_classes.xml
@@ -1,5 +1,5 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <systemsettings operation="set" requestid="SetroptsRequest">
-    <racf:audit>elijtest xfacilit</racf:audit>
+    <racf:audit operation="set">elijtest xfacilit</racf:audit>
   </systemsettings>
 </securityrequest>
\ No newline at end of file
diff --git a/tests/setropts/setropts_request_samples/setropts_add_generic_command_processing_class.xml b/tests/setropts/setropts_request_samples/setropts_add_generic_command_processing_class.xml
index cc8a60de..ad97a37a 100644
--- a/tests/setropts/setropts_request_samples/setropts_add_generic_command_processing_class.xml
+++ b/tests/setropts/setropts_request_samples/setropts_add_generic_command_processing_class.xml
@@ -1,5 +1,5 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <systemsettings operation="set" requestid="SetroptsRequest">
-    <racf:gencmd>elijtest</racf:gencmd>
+    <racf:gencmd operation="set">elijtest</racf:gencmd>
   </systemsettings>
 </securityrequest>
\ No newline at end of file
diff --git a/tests/setropts/setropts_request_samples/setropts_add_generic_command_processing_classes.xml b/tests/setropts/setropts_request_samples/setropts_add_generic_command_processing_classes.xml
index 4b6bea5c..1bf65492 100644
--- a/tests/setropts/setropts_request_samples/setropts_add_generic_command_processing_classes.xml
+++ b/tests/setropts/setropts_request_samples/setropts_add_generic_command_processing_classes.xml
@@ -1,5 +1,5 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <systemsettings operation="set" requestid="SetroptsRequest">
-    <racf:gencmd>elijtest xfacilit</racf:gencmd>
+    <racf:gencmd operation="set">elijtest xfacilit</racf:gencmd>
   </systemsettings>
 </securityrequest>
\ No newline at end of file
diff --git a/tests/setropts/setropts_request_samples/setropts_add_generic_profile_checking_class.xml b/tests/setropts/setropts_request_samples/setropts_add_generic_profile_checking_class.xml
index 2b1120f9..6687060e 100644
--- a/tests/setropts/setropts_request_samples/setropts_add_generic_profile_checking_class.xml
+++ b/tests/setropts/setropts_request_samples/setropts_add_generic_profile_checking_class.xml
@@ -1,5 +1,5 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <systemsettings operation="set" requestid="SetroptsRequest">
-    <racf:generic>elijtest</racf:generic>
+    <racf:generic operation="set">elijtest</racf:generic>
   </systemsettings>
 </securityrequest>
\ No newline at end of file
diff --git a/tests/setropts/setropts_request_samples/setropts_add_generic_profile_checking_classes.xml b/tests/setropts/setropts_request_samples/setropts_add_generic_profile_checking_classes.xml
index fb4d71d5..9a077c4d 100644
--- a/tests/setropts/setropts_request_samples/setropts_add_generic_profile_checking_classes.xml
+++ b/tests/setropts/setropts_request_samples/setropts_add_generic_profile_checking_classes.xml
@@ -1,5 +1,5 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <systemsettings operation="set" requestid="SetroptsRequest">
-    <racf:generic>elijtest xfacilit</racf:generic>
+    <racf:generic operation="set">elijtest xfacilit</racf:generic>
   </systemsettings>
 </securityrequest>
\ No newline at end of file
diff --git a/tests/setropts/setropts_request_samples/setropts_add_generic_profile_sharing_class.xml b/tests/setropts/setropts_request_samples/setropts_add_generic_profile_sharing_class.xml
index 4263b8b6..89407b8e 100644
--- a/tests/setropts/setropts_request_samples/setropts_add_generic_profile_sharing_class.xml
+++ b/tests/setropts/setropts_request_samples/setropts_add_generic_profile_sharing_class.xml
@@ -1,5 +1,5 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <systemsettings operation="set" requestid="SetroptsRequest">
-    <racf:genlist>elijtest</racf:genlist>
+    <racf:genlist operation="set">elijtest</racf:genlist>
   </systemsettings>
 </securityrequest>
\ No newline at end of file
diff --git a/tests/setropts/setropts_request_samples/setropts_add_generic_profile_sharing_classes.xml b/tests/setropts/setropts_request_samples/setropts_add_generic_profile_sharing_classes.xml
index 9334ea6d..ea221eeb 100644
--- a/tests/setropts/setropts_request_samples/setropts_add_generic_profile_sharing_classes.xml
+++ b/tests/setropts/setropts_request_samples/setropts_add_generic_profile_sharing_classes.xml
@@ -1,5 +1,5 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <systemsettings operation="set" requestid="SetroptsRequest">
-    <racf:genlist>elijtest xfacilit</racf:genlist>
+    <racf:genlist operation="set">elijtest xfacilit</racf:genlist>
   </systemsettings>
 </securityrequest>
\ No newline at end of file
diff --git a/tests/setropts/setropts_request_samples/setropts_add_global_access_class.xml b/tests/setropts/setropts_request_samples/setropts_add_global_access_class.xml
index d8c87459..ddc82b4a 100644
--- a/tests/setropts/setropts_request_samples/setropts_add_global_access_class.xml
+++ b/tests/setropts/setropts_request_samples/setropts_add_global_access_class.xml
@@ -1,5 +1,5 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <systemsettings operation="set" requestid="SetroptsRequest">
-    <racf:global>elijtest</racf:global>
+    <racf:global operation="set">elijtest</racf:global>
   </systemsettings>
 </securityrequest>
\ No newline at end of file
diff --git a/tests/setropts/setropts_request_samples/setropts_add_global_access_classes.xml b/tests/setropts/setropts_request_samples/setropts_add_global_access_classes.xml
index 979d0f52..cda59bd3 100644
--- a/tests/setropts/setropts_request_samples/setropts_add_global_access_classes.xml
+++ b/tests/setropts/setropts_request_samples/setropts_add_global_access_classes.xml
@@ -1,5 +1,5 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <systemsettings operation="set" requestid="SetroptsRequest">
-    <racf:global>elijtest xfacilit</racf:global>
+    <racf:global operation="set">elijtest xfacilit</racf:global>
   </systemsettings>
 </securityrequest>
\ No newline at end of file
diff --git a/tests/setropts/setropts_request_samples/setropts_add_raclist_class.xml b/tests/setropts/setropts_request_samples/setropts_add_raclist_class.xml
index 6a4ea90e..fd44ed7d 100644
--- a/tests/setropts/setropts_request_samples/setropts_add_raclist_class.xml
+++ b/tests/setropts/setropts_request_samples/setropts_add_raclist_class.xml
@@ -1,5 +1,5 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <systemsettings operation="set" requestid="SetroptsRequest">
-    <racf:raclist>elijtest</racf:raclist>
+    <racf:raclist operation="set">elijtest</racf:raclist>
   </systemsettings>
 </securityrequest>
\ No newline at end of file
diff --git a/tests/setropts/setropts_request_samples/setropts_add_raclist_classes.xml b/tests/setropts/setropts_request_samples/setropts_add_raclist_classes.xml
index effd0461..5bd8d4ac 100644
--- a/tests/setropts/setropts_request_samples/setropts_add_raclist_classes.xml
+++ b/tests/setropts/setropts_request_samples/setropts_add_raclist_classes.xml
@@ -1,5 +1,5 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <systemsettings operation="set" requestid="SetroptsRequest">
-    <racf:raclist>elijtest xfacilit</racf:raclist>
+    <racf:raclist operation="set">elijtest xfacilit</racf:raclist>
   </systemsettings>
 </securityrequest>
\ No newline at end of file
diff --git a/tests/setropts/setropts_request_samples/setropts_add_statistics_class.xml b/tests/setropts/setropts_request_samples/setropts_add_statistics_class.xml
index ea49762a..5a54beb9 100644
--- a/tests/setropts/setropts_request_samples/setropts_add_statistics_class.xml
+++ b/tests/setropts/setropts_request_samples/setropts_add_statistics_class.xml
@@ -1,5 +1,5 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <systemsettings operation="set" requestid="SetroptsRequest">
-    <racf:classtat>elijtest</racf:classtat>
+    <racf:classtat operation="set">elijtest</racf:classtat>
   </systemsettings>
 </securityrequest>
\ No newline at end of file
diff --git a/tests/setropts/setropts_request_samples/setropts_add_statistics_classes.xml b/tests/setropts/setropts_request_samples/setropts_add_statistics_classes.xml
index 0b24d2f4..f76ed3d5 100644
--- a/tests/setropts/setropts_request_samples/setropts_add_statistics_classes.xml
+++ b/tests/setropts/setropts_request_samples/setropts_add_statistics_classes.xml
@@ -1,5 +1,5 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <systemsettings operation="set" requestid="SetroptsRequest">
-    <racf:classtat>elijtest xfacilit</racf:classtat>
+    <racf:classtat operation="set">elijtest xfacilit</racf:classtat>
   </systemsettings>
 </securityrequest>
\ No newline at end of file
diff --git a/tests/setropts/setropts_request_samples/setropts_refresh_raclist.xml b/tests/setropts/setropts_request_samples/setropts_refresh_raclist.xml
index 0908b47c..e7f90159 100644
--- a/tests/setropts/setropts_request_samples/setropts_refresh_raclist.xml
+++ b/tests/setropts/setropts_request_samples/setropts_refresh_raclist.xml
@@ -1,6 +1,6 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <systemsettings operation="set" requestid="SetroptsRequest">
-    <racf:raclist>elijtest</racf:raclist>
-    <racf:refresh />
+    <racf:raclist operation="set">elijtest</racf:raclist>
+    <racf:refresh operation="set" />
   </systemsettings>
 </securityrequest>
\ No newline at end of file
diff --git a/tests/setropts/setropts_request_samples/setropts_refresh_raclist_multiple.xml b/tests/setropts/setropts_request_samples/setropts_refresh_raclist_multiple.xml
index a4b09c0e..eec7ec01 100644
--- a/tests/setropts/setropts_request_samples/setropts_refresh_raclist_multiple.xml
+++ b/tests/setropts/setropts_request_samples/setropts_refresh_raclist_multiple.xml
@@ -1,6 +1,6 @@
 <securityrequest xmlns="http://www.ibm.com/systems/zos/saf" xmlns:racf="http://www.ibm.com/systems/zos/racf">
   <systemsettings operation="set" requestid="SetroptsRequest">
-    <racf:raclist>elijtest xfacilit</racf:raclist>
-    <racf:refresh />
+    <racf:raclist operation="set">elijtest xfacilit</racf:raclist>
+    <racf:refresh operation="set" />
   </systemsettings>
 </securityrequest>
\ No newline at end of file