diff --git a/spec/epp/domain_spec.rb b/spec/epp/domain_spec.rb
index 074a503b0..25cf15cd4 100644
--- a/spec/epp/domain_spec.rb
+++ b/spec/epp/domain_spec.rb
@@ -243,7 +243,7 @@ describe 'EPP Domain', epp: true do
     end
 
     it 'checks a domain' do
-      response = epp_request('domains/check.xml')
+      response = epp_request(domain_check_xml, :xml)
       expect(response[:result_code]).to eq('1000')
       expect(response[:msg]).to eq('Command completed successfully')
 
@@ -253,7 +253,7 @@ describe 'EPP Domain', epp: true do
 
       Fabricate(:domain, name: 'example.ee')
 
-      response = epp_request('domains/check.xml')
+      response = epp_request(domain_check_xml, :xml)
       domain = response[:parsed].css('resData chkData cd').first
       name = domain.css('name').first
       reason = domain.css('reason').first
diff --git a/spec/epp/epp_helper_spec.rb b/spec/epp/epp_helper_spec.rb
index c4835f35c..ee0a6cea0 100644
--- a/spec/epp/epp_helper_spec.rb
+++ b/spec/epp/epp_helper_spec.rb
@@ -106,7 +106,7 @@ describe 'EPP Helper', epp: true do
       expect(generated).to eq(expected)
     end
 
-    it 'creates valid info request' do
+    it 'generates valid info xml' do
       expected = Nokogiri::XML('<?xml version="1.0" encoding="UTF-8" standalone="no"?>
         <epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
           <command>
@@ -149,5 +149,87 @@ describe 'EPP Helper', epp: true do
       generated = Nokogiri::XML(domain_info_xml(name_value: 'one.ee', name_hosts: 'sub', pw: 'b3rafsla')).to_s.squish
       expect(generated).to eq(expected)
     end
+
+    it 'generates valid check xml' do
+      expected = Nokogiri::XML('<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+        <epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
+          <command>
+            <check>
+              <domain:check
+               xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
+                <domain:name>example.ee</domain:name>
+              </domain:check>
+            </check>
+            <clTRID>ABC-12345</clTRID>
+          </command>
+        </epp>
+      ').to_s.squish
+
+
+      generated = Nokogiri::XML(domain_check_xml).to_s.squish
+      expect(generated).to eq(expected)
+
+      expected = Nokogiri::XML('<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+        <epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
+          <command>
+            <check>
+              <domain:check
+               xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
+                <domain:name>example.ee</domain:name>
+                <domain:name>example2.ee</domain:name>
+                <domain:name>example3.ee</domain:name>
+              </domain:check>
+            </check>
+            <clTRID>ABC-12345</clTRID>
+          </command>
+        </epp>
+      ').to_s.squish
+
+
+      generated = Nokogiri::XML(domain_check_xml(names: ['example.ee', 'example2.ee', 'example3.ee'])).to_s.squish
+      expect(generated).to eq(expected)
+    end
+
+    it 'generates valid renew xml' do
+      expected = Nokogiri::XML('<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+        <epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
+          <command>
+            <renew>
+              <domain:renew
+               xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
+                <domain:name>example.ee</domain:name>
+                <domain:curExpDate>2014-08-07</domain:curExpDate>
+                <domain:period unit="y">1</domain:period>
+              </domain:renew>
+            </renew>
+            <clTRID>ABC-12345</clTRID>
+          </command>
+        </epp>
+      ').to_s.squish
+
+
+      generated = Nokogiri::XML(domain_renew_xml).to_s.squish
+      expect(generated).to eq(expected)
+
+      expected = Nokogiri::XML('<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+        <epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
+          <command>
+            <renew>
+              <domain:renew
+               xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
+                <domain:name>one.ee</domain:name>
+                <domain:curExpDate>2009-11-15</domain:curExpDate>
+                <domain:period unit="d">365</domain:period>
+              </domain:renew>
+            </renew>
+            <clTRID>ABC-12345</clTRID>
+          </command>
+        </epp>
+      ').to_s.squish
+
+
+      generated = Nokogiri::XML(domain_renew_xml(name: 'one.ee', curExpDate: '2009-11-15', period_value: '365', period_unit: 'd')).to_s.squish
+      expect(generated).to eq(expected)
+    end
   end
 end
diff --git a/spec/epp/requests/domains/check.xml b/spec/epp/requests/domains/check.xml
deleted file mode 100644
index b55a4b129..000000000
--- a/spec/epp/requests/domains/check.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <check>
-      <domain:check
-       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>example.ee</domain:name>
-      </domain:check>
-    </check>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>