diff --git a/spec/epp/epp_helper_spec.rb b/spec/epp/epp_helper_spec.rb
index f2dfb20e8..b0318eadb 100644
--- a/spec/epp/epp_helper_spec.rb
+++ b/spec/epp/epp_helper_spec.rb
@@ -248,7 +248,8 @@ describe 'EPP Helper', epp: true do
         </epp>
       ').to_s.squish
 
-      generated = Nokogiri::XML(domain_update_xml).to_s.squish
+      xml = domain_update_xml(add: nil)
+      generated = Nokogiri::XML(xml).to_s.squish
       expect(generated).to eq(expected)
 
       expected = Nokogiri::XML('<?xml version="1.0" encoding="UTF-8" standalone="no"?>
@@ -271,7 +272,16 @@ describe 'EPP Helper', epp: true do
         </epp>
       ').to_s.squish
 
-      xml = domain_update_xml(name: 'one.ee', registrant: 'sh8013', pw: 'b3rafsla')
+      xml = domain_update_xml(
+        name: { value: 'one.ee' },
+        add: nil,
+        chg: [
+          registrant: { value: 'sh8013' },
+          authInfo: [
+            pw: { value: 'b3rafsla' }
+          ]
+        ]
+      )
 
       generated = Nokogiri::XML(xml).to_s.squish
       expect(generated).to eq(expected)
diff --git a/spec/support/epp.rb b/spec/support/epp.rb
index be44804c5..7b17d36d9 100644
--- a/spec/support/epp.rb
+++ b/spec/support/epp.rb
@@ -161,58 +161,27 @@ module Epp
   end
 
   def domain_update_xml(xml_params = {})
-
-    # defaults = {
-    #   name: {value: 'example.ee'},
-    #   add: {
-    #     ns: [
-    #       { hostObj: { value: 'ns1.example.com' } },
-    #       { hostObj: { value: 'ns2.example.com' } }
-    #     ],
-    #     contact: [
-    #       {
-    #         attrs: { type: 'tech' },
-    #         value: 'mak21'
-    #       }
-    #     ],
-    #     status: [
-    #       { attrs: {s: 'clientHold', lang: 'en'}, value: 'Payment overdue.'},
-    #       { attrs: {s: 'clientUpdateProhibited' }}
-    #     ]
-    #   }
-    # }
-
     defaults = {
       name: { value: 'example.ee' },
       chg: [
-        { registrant: { value: 'mak21' } }
-      ],
-      add: {
-        ns: [
-          { hostObj: { value: 'ns1.example.com' } },
-          { hostObj: { value: 'ns2.example.com' } }
-        ],
-        _statuses: [
-          { status: { attrs: { s: 'clientHold', lang: 'en' }, value: 'Payment overdue.' } },
-          { status: { attrs: { s: 'clientUpdateProhibited' }, value: '' } }
-        ],
-        _contacts: [
-          { contact: { attrs: { type: 'tech' }, value: 'mak21' } }
+        registrant: { value: 'mak21' },
+        authInfo: [
+          pw: { value: '2BARfoo' }
         ]
-      }
+      ],
+      add: [
+        ns: [
+          hostObj: { value: 'ns1.example.com' },
+          hostObj: { value: 'ns2.example.com' }
+        ],
+        status: { attrs: { s: 'clientHold', lang: 'en' }, value: 'Payment overdue.' },
+        status: { attrs: { s: 'clientUpdateProhibited' }, value: '' },
+        contact: { attrs: { type: 'tech' }, value: 'mak21' }
+      ]
     }
 
     xml_params = defaults.deep_merge(xml_params)
 
-    # xml_params[:name] = xml_params[:name] || 'example.ee'
-
-    # xml_params[:add] = xml_params[:add] || {}
-
-    # xml_params[:add][:ns] = xml_params[:add][:ns] || {}
-    # xml_params[:add][:ns][:hostObj] = 'ns1.example.com'
-    # xml_params[:registrant] = xml_params[:registrant] || 'mak21'
-    # xml_params[:pw] = xml_params[:pw] || '2BARfoo'
-
     xml = Builder::XmlMarkup.new
 
     xml.instruct!(:xml, standalone: 'no')
@@ -240,17 +209,10 @@ module Epp
         end
       # Value is an array
       elsif v.is_a?(Array)
-        # underscore marks "internal" variable, not converted into xml
-        if k[0] == '_'
+        xml.tag!("#{ns}:#{k}") do
           v.each do |x|
             generate_xml_from_hash(x, xml, ns)
           end
-        else
-          xml.tag!("#{ns}:#{k}") do
-            v.each do |x|
-              generate_xml_from_hash(x, xml, ns)
-            end
-          end
         end
       end
     end