diff --git a/doc/epp_doc.txt b/doc/epp_doc.txt
index 199b778fb..9f0090fda 100644
--- a/doc/epp_doc.txt
+++ b/doc/epp_doc.txt
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------------------------------------------
 EPP REQUEST - RESPONSE DOCUMENTATION
-GENERATED AT: 2014-12-09 16:02:18 +0200
+GENERATED AT: 2014-12-09 16:34:08 +0200
 EXAMPLE COUNT: 91
 ----------------------------------------------------------------------------------------------------
 EPP Contact with valid user create command fails if request xml is missing
@@ -116,13 +116,13 @@ RESPONSE:
     </result>
     <resData>
       <creData>
-        <id>eebf1988</id>
-        <crDate>2014-12-09 14:02:24 UTC</crDate>
+        <id>cb66237d</id>
+        <crDate>2014-12-09 14:34:09 UTC</crDate>
       </creData>
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-9718007789</svTRID>
+  <svTRID>ccReg-2069658376</svTRID>
 </trID>
   </response>
 </epp>
@@ -164,13 +164,13 @@ RESPONSE:
     </result>
     <resData>
       <creData>
-        <id>cba91772</id>
-        <crDate>2014-12-09 14:02:27 UTC</crDate>
+        <id>2bcd7859</id>
+        <crDate>2014-12-09 14:34:09 UTC</crDate>
       </creData>
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6791922501</svTRID>
+  <svTRID>ccReg-3658129103</svTRID>
 </trID>
   </response>
 </epp>
@@ -212,13 +212,13 @@ RESPONSE:
     </result>
     <resData>
       <creData>
-        <id>3d7b4bd8</id>
-        <crDate>2014-12-09 14:02:29 UTC</crDate>
+        <id>9f05978b</id>
+        <crDate>2014-12-09 14:34:10 UTC</crDate>
       </creData>
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-4886119886</svTRID>
+  <svTRID>ccReg-6527034967</svTRID>
 </trID>
   </response>
 </epp>
@@ -268,13 +268,13 @@ RESPONSE:
     </result>
     <resData>
       <creData>
-        <id>bf22f8ad</id>
-        <crDate>2014-12-09 14:02:31 UTC</crDate>
+        <id>d96bd817</id>
+        <crDate>2014-12-09 14:34:10 UTC</crDate>
       </creData>
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-4024639446</svTRID>
+  <svTRID>ccReg-1945620342</svTRID>
 </trID>
   </response>
 </epp>
@@ -320,13 +320,13 @@ RESPONSE:
     </result>
     <resData>
       <creData>
-        <id>43e8a973</id>
-        <crDate>2014-12-09 14:02:33 UTC</crDate>
+        <id>55d5542b</id>
+        <crDate>2014-12-09 14:34:10 UTC</crDate>
       </creData>
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-2840843691</svTRID>
+  <svTRID>ccReg-0067048934</svTRID>
 </trID>
   </response>
 </epp>
@@ -409,7 +409,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-4918622803</svTRID>
+  <svTRID>ccReg-1201837433</svTRID>
 </trID>
 </epp>
 
@@ -455,12 +455,12 @@ RESPONSE:
     <resData>
       <creData>
         <id>sh8013</id>
-        <crDate>2014-12-09 14:02:40 UTC</crDate>
+        <crDate>2014-12-09 14:34:11 UTC</crDate>
       </creData>
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-4624867688</svTRID>
+  <svTRID>ccReg-4751540139</svTRID>
 </trID>
   </response>
 </epp>
@@ -510,7 +510,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-4465109785</svTRID>
+  <svTRID>ccReg-8049947418</svTRID>
 </trID>
 </epp>
 
@@ -556,12 +556,12 @@ RESPONSE:
     <resData>
       <creData>
         <id>sh8013</id>
-        <crDate>2014-12-09 14:02:44 UTC</crDate>
+        <crDate>2014-12-09 14:34:11 UTC</crDate>
       </creData>
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-0013386112</svTRID>
+  <svTRID>ccReg-9107113685</svTRID>
 </trID>
   </response>
 </epp>
@@ -625,7 +625,7 @@ RESPONSE:
     </result>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-9849047705</svTRID>
+  <svTRID>ccReg-6994463519</svTRID>
 </trID>
   </response>
 </epp>
@@ -664,7 +664,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-2302000681</svTRID>
+  <svTRID>ccReg-5775406594</svTRID>
 </trID>
 </epp>
 
@@ -696,7 +696,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-7073291608</svTRID>
+  <svTRID>ccReg-4053226000</svTRID>
 </trID>
 </epp>
 
@@ -771,7 +771,7 @@ RESPONSE:
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-1791427916</svTRID>
+  <svTRID>ccReg-7582643790</svTRID>
 </trID>
   </response>
 </epp>
@@ -808,14 +808,14 @@ RESPONSE:
   <name>Johnny Awesome</name>
   <org/>
   <addr>
-    <street>Gislason Path</street>
-    <city>Schmittview</city>
+    <street>Towne Manor</street>
+    <city>East Ianhaven</city>
   </addr>
 </postalInfo>
         <voice>+372.12345678</voice>
         <fax/>
-        <email>lorenz_keeling@lang.net</email>
-        <crDate>2014-12-09 14:02:59 UTC</crDate>
+        <email>bart@schummdaugherty.com</email>
+        <crDate>2014-12-09 14:34:13 UTC</crDate>
         <authInfo>
           <pw>asde</pw>
         </authInfo>
@@ -833,7 +833,7 @@ RESPONSE:
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6592783237</svTRID>
+  <svTRID>ccReg-6121981129</svTRID>
 </trID>
   </response>
 </epp>
@@ -869,7 +869,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8561742200</svTRID>
+  <svTRID>ccReg-5945232868</svTRID>
 </trID>
 </epp>
 
@@ -907,7 +907,7 @@ RESPONSE:
 <postalInfo type="int">
   <org/>
 </postalInfo>
-        <crDate>2014-12-09 14:03:03 UTC</crDate>
+        <crDate>2014-12-09 14:34:14 UTC</crDate>
 <disclose flag="0">
   <name/>
 </disclose>
@@ -922,7 +922,7 @@ RESPONSE:
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-3657498729</svTRID>
+  <svTRID>ccReg-4426304565</svTRID>
 </trID>
   </response>
 </epp>
@@ -959,14 +959,14 @@ RESPONSE:
   <name>Johnny Awesome</name>
   <org/>
   <addr>
-    <street>Gislason Path</street>
-    <city>Schmittview</city>
+    <street>Towne Manor</street>
+    <city>East Ianhaven</city>
   </addr>
 </postalInfo>
         <voice>+372.12345678</voice>
         <fax/>
-        <email>lorenz_keeling@lang.net</email>
-        <crDate>2014-12-09 14:03:05 UTC</crDate>
+        <email>bart@schummdaugherty.com</email>
+        <crDate>2014-12-09 14:34:14 UTC</crDate>
         <authInfo>
           <pw>password</pw>
         </authInfo>
@@ -984,7 +984,7 @@ RESPONSE:
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-3878648399</svTRID>
+  <svTRID>ccReg-5913291322</svTRID>
 </trID>
   </response>
 </epp>
@@ -1091,14 +1091,14 @@ RESPONSE:
   <name>Johnny Awesome</name>
   <org/>
   <addr>
-    <street>Gislason Path</street>
-    <city>Schmittview</city>
+    <street>Towne Manor</street>
+    <city>East Ianhaven</city>
   </addr>
 </postalInfo>
         <voice>+372.12345678</voice>
         <fax/>
-        <email>lorenz_keeling@lang.net</email>
-        <crDate>2014-12-09 14:03:11 UTC</crDate>
+        <email>bart@schummdaugherty.com</email>
+        <crDate>2014-12-09 14:34:14 UTC</crDate>
         <authInfo>
           <pw>ccds4324pok</pw>
         </authInfo>
@@ -1116,7 +1116,7 @@ RESPONSE:
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-9877539199</svTRID>
+  <svTRID>ccReg-7037114410</svTRID>
 </trID>
   </response>
 </epp>
@@ -1153,10 +1153,10 @@ RESPONSE:
       <chkData>
         <id>info-4444</id>
 <postalInfo type="int">
-  <name>Ora Ruecker</name>
+  <name>Savanah Witting</name>
   <org/>
 </postalInfo>
-        <crDate>2014-12-09 14:03:14 UTC</crDate>
+        <crDate>2014-12-09 14:34:15 UTC</crDate>
 <disclose flag="0">
   <email/>
   <phone/>
@@ -1171,7 +1171,7 @@ RESPONSE:
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8759591171</svTRID>
+  <svTRID>ccReg-1158405982</svTRID>
 </trID>
   </response>
 </epp>
@@ -1239,7 +1239,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-3834083683</svTRID>
+  <svTRID>ccReg-9785584076</svTRID>
 </trID>
 </epp>
 
@@ -1274,7 +1274,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-3653964101</svTRID>
+  <svTRID>ccReg-1776377346</svTRID>
 </trID>
 </epp>
 
@@ -1340,7 +1340,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-1038658311</svTRID>
+  <svTRID>ccReg-0642307524</svTRID>
 </trID>
 </epp>
 
@@ -1378,7 +1378,7 @@ RESPONSE:
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8553813297</svTRID>
+  <svTRID>ccReg-4713580512</svTRID>
 </trID>
   </response>
 </epp>
@@ -1413,7 +1413,7 @@ RESPONSE:
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8894942810</svTRID>
+  <svTRID>ccReg-4167598368</svTRID>
 </trID>
   </response>
 </epp>
@@ -1460,7 +1460,7 @@ RESPONSE:
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-1159073991</svTRID>
+  <svTRID>ccReg-7617692285</svTRID>
 </trID>
   </response>
 </epp>
@@ -1504,7 +1504,7 @@ RESPONSE:
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6373885429</svTRID>
+  <svTRID>ccReg-8097538424</svTRID>
 </trID>
   </response>
 </epp>
@@ -1543,7 +1543,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-1538414503</svTRID>
+  <svTRID>ccReg-7240255717</svTRID>
 </trID>
 </epp>
 
@@ -1560,7 +1560,7 @@ REQUEST:
       <domain:transfer xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>example.ee</domain:name>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">eb055bc0f79be3bb82fa88c297dbc7b0</domain:pw>
+          <domain:pw roid="JD1234-REP">473dfc3feafcc66ceeaf06c805e00b99</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>
@@ -1580,16 +1580,16 @@ RESPONSE:
         <name>example.ee</name>
         <trStatus>serverApproved</trStatus>
         <reID>123</reID>
-        <reDate>2014-12-09 14:03:34 UTC</reDate>
-        <acID>10577829</acID>
-        <acDate>2014-12-09 14:03:34 UTC</acDate>
+        <reDate>2014-12-09 14:34:17 UTC</reDate>
+        <acID>12345678</acID>
+        <acDate>2014-12-09 14:34:17 UTC</acDate>
         <exDate>2015-12-09 00:00:00 UTC</exDate>
       </trnData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8026767504</svTRID>
+  <svTRID>ccReg-9876192734</svTRID>
 </trID>
 </epp>
 
@@ -1601,7 +1601,7 @@ REQUEST:
       <domain:transfer xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>example.ee</domain:name>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">1221604c335e6eb85ca8be429603a4c2</domain:pw>
+          <domain:pw roid="JD1234-REP">3c11a28275cebea15117299c59391e88</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>
@@ -1620,17 +1620,17 @@ RESPONSE:
       <trnData>
         <name>example.ee</name>
         <trStatus>pending</trStatus>
-        <reID>10577829</reID>
-        <reDate>2014-12-09 14:03:34 UTC</reDate>
+        <reID>12345678</reID>
+        <reDate>2014-12-09 14:34:17 UTC</reDate>
         <acID>123</acID>
-        <acDate>2014-12-09 15:03:34 UTC</acDate>
+        <acDate>2014-12-09 15:34:17 UTC</acDate>
         <exDate>2015-12-09 00:00:00 UTC</exDate>
       </trnData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-2903803964</svTRID>
+  <svTRID>ccReg-0927708951</svTRID>
 </trID>
 </epp>
 
@@ -1642,7 +1642,7 @@ REQUEST:
       <domain:transfer xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>example.ee</domain:name>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">1221604c335e6eb85ca8be429603a4c2</domain:pw>
+          <domain:pw roid="JD1234-REP">3c11a28275cebea15117299c59391e88</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>
@@ -1661,17 +1661,17 @@ RESPONSE:
       <trnData>
         <name>example.ee</name>
         <trStatus>pending</trStatus>
-        <reID>10577829</reID>
-        <reDate>2014-12-09 14:03:34 UTC</reDate>
+        <reID>12345678</reID>
+        <reDate>2014-12-09 14:34:17 UTC</reDate>
         <acID>123</acID>
-        <acDate>2014-12-09 15:03:34 UTC</acDate>
+        <acDate>2014-12-09 15:34:17 UTC</acDate>
         <exDate>2015-12-09 00:00:00 UTC</exDate>
       </trnData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-7281122044</svTRID>
+  <svTRID>ccReg-5561158290</svTRID>
 </trID>
 </epp>
 
@@ -1692,23 +1692,23 @@ RESPONSE:
       <msg>Command completed successfully; ack to dequeue</msg>
     </result>
     <msgQ count="1" id="1">
-      <qDate>2014-12-09 14:03:34 UTC</qDate>
+      <qDate>2014-12-09 14:34:17 UTC</qDate>
       <msg>Transfer requested.</msg>
     </msgQ>
     <resData>
       <trnData>
         <name>example.ee</name>
         <trStatus>pending</trStatus>
-        <reID>10577829</reID>
-        <reDate>2014-12-09 14:03:34 UTC</reDate>
+        <reID>12345678</reID>
+        <reDate>2014-12-09 14:34:17 UTC</reDate>
         <acID>123</acID>
-        <acDate>2014-12-09 15:03:34 UTC</acDate>
+        <acDate>2014-12-09 15:34:17 UTC</acDate>
         <exDate>2015-12-09 00:00:00 UTC</exDate>
       </trnData>
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-4655145032</svTRID>
+  <svTRID>ccReg-4553148861</svTRID>
 </trID>
   </response>
 </epp>
@@ -1732,7 +1732,7 @@ RESPONSE:
     <msgQ count="0" id="1"/>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-3038613204</svTRID>
+  <svTRID>ccReg-2821120727</svTRID>
 </trID>
   </response>
 </epp>
@@ -1750,7 +1750,7 @@ REQUEST:
       <domain:transfer xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>example.ee</domain:name>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">fb525148000091000458e6bab9de29d2</domain:pw>
+          <domain:pw roid="JD1234-REP">33c6d220d32e67d958e57c34726b7c40</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>
@@ -1768,7 +1768,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-5332011044</svTRID>
+  <svTRID>ccReg-9718078886</svTRID>
 </trID>
 </epp>
 
@@ -1785,7 +1785,7 @@ REQUEST:
       <domain:transfer xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>example.ee</domain:name>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">d67a41db997dcef15c1a126873f1d6c0</domain:pw>
+          <domain:pw roid="JD1234-REP">884b85dc6b51bbac8e31e6fcf15fd0b6</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>
@@ -1805,16 +1805,16 @@ RESPONSE:
         <name>example.ee</name>
         <trStatus>clientApproved</trStatus>
         <reID>123</reID>
-        <reDate>2014-12-09 14:03:39 UTC</reDate>
-        <acID>10577829</acID>
-        <acDate>2014-12-09 14:03:39 UTC</acDate>
+        <reDate>2014-12-09 14:34:18 UTC</reDate>
+        <acID>12345678</acID>
+        <acDate>2014-12-09 14:34:18 UTC</acDate>
         <exDate>2015-12-09 00:00:00 UTC</exDate>
       </trnData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8562062463</svTRID>
+  <svTRID>ccReg-1597258116</svTRID>
 </trID>
 </epp>
 
@@ -1849,7 +1849,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6111630433</svTRID>
+  <svTRID>ccReg-1786703991</svTRID>
 </trID>
 </epp>
 
@@ -1866,7 +1866,7 @@ REQUEST:
       <domain:transfer xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>example.ee</domain:name>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">1d294a4a9941456d28f1f307e0cd7c06</domain:pw>
+          <domain:pw roid="JD1234-REP">2ba42a3ecf1ca0c12f4267bb652bf003</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>
@@ -1884,7 +1884,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6673501311</svTRID>
+  <svTRID>ccReg-2539444292</svTRID>
 </trID>
 </epp>
 
@@ -1954,7 +1954,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6667788447</svTRID>
+  <svTRID>ccReg-0145620659</svTRID>
 </trID>
 </epp>
 
@@ -1984,7 +1984,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-4477117557</svTRID>
+  <svTRID>ccReg-2247806298</svTRID>
 </trID>
 </epp>
 
@@ -2041,14 +2041,14 @@ RESPONSE:
     <resData>
       <creData>
         <name>example.ee</name>
-        <crDate>2014-12-09 14:03:51 UTC</crDate>
+        <crDate>2014-12-09 14:34:20 UTC</crDate>
         <exDate>2015-12-09 00:00:00 UTC</exDate>
       </creData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-1884410512</svTRID>
+  <svTRID>ccReg-5812366063</svTRID>
 </trID>
 </epp>
 
@@ -2105,14 +2105,14 @@ RESPONSE:
     <resData>
       <creData>
         <name>ria.ee</name>
-        <crDate>2014-12-09 14:03:54 UTC</crDate>
+        <crDate>2014-12-09 14:34:20 UTC</crDate>
         <exDate>2015-12-09 00:00:00 UTC</exDate>
       </creData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-0077325840</svTRID>
+  <svTRID>ccReg-0486679935</svTRID>
 </trID>
 </epp>
 
@@ -2167,7 +2167,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-4072918833</svTRID>
+  <svTRID>ccReg-3650156882</svTRID>
 </trID>
 </epp>
 
@@ -2224,14 +2224,14 @@ RESPONSE:
     <resData>
       <creData>
         <name>example.ee</name>
-        <crDate>2014-12-09 14:03:58 UTC</crDate>
+        <crDate>2014-12-09 14:34:21 UTC</crDate>
         <exDate>2015-12-09 00:00:00 UTC</exDate>
       </creData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-1995897622</svTRID>
+  <svTRID>ccReg-7906467438</svTRID>
 </trID>
 </epp>
 
@@ -2286,7 +2286,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8286953812</svTRID>
+  <svTRID>ccReg-8874437588</svTRID>
 </trID>
 </epp>
 
@@ -2346,7 +2346,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6132632489</svTRID>
+  <svTRID>ccReg-7224134456</svTRID>
 </trID>
 </epp>
 
@@ -2542,7 +2542,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6163229475</svTRID>
+  <svTRID>ccReg-6193748186</svTRID>
 </trID>
 </epp>
 
@@ -2606,7 +2606,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-3821694533</svTRID>
+  <svTRID>ccReg-5377623012</svTRID>
 </trID>
 </epp>
 
@@ -2705,14 +2705,14 @@ RESPONSE:
     <resData>
       <creData>
         <name>example.ee</name>
-        <crDate>2014-12-09 14:04:15 UTC</crDate>
+        <crDate>2014-12-09 14:34:23 UTC</crDate>
         <exDate>2015-12-09 00:00:00 UTC</exDate>
       </creData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8013582966</svTRID>
+  <svTRID>ccReg-0925990938</svTRID>
 </trID>
 </epp>
 
@@ -2769,7 +2769,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-2795423047</svTRID>
+  <svTRID>ccReg-6058599230</svTRID>
 </trID>
 </epp>
 
@@ -2826,14 +2826,14 @@ RESPONSE:
     <resData>
       <creData>
         <name>example.ee</name>
-        <crDate>2014-12-09 14:04:20 UTC</crDate>
+        <crDate>2014-12-09 14:34:23 UTC</crDate>
         <exDate>2015-12-09 00:00:00 UTC</exDate>
       </creData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-5094267496</svTRID>
+  <svTRID>ccReg-8971163079</svTRID>
 </trID>
 </epp>
 
@@ -2893,7 +2893,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-3607332087</svTRID>
+  <svTRID>ccReg-4602378919</svTRID>
 </trID>
 </epp>
 
@@ -2962,14 +2962,14 @@ RESPONSE:
     <resData>
       <creData>
         <name>example.ee</name>
-        <crDate>2014-12-09 14:04:25 UTC</crDate>
+        <crDate>2014-12-09 14:34:24 UTC</crDate>
         <exDate>2015-12-09 00:00:00 UTC</exDate>
       </creData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6921285927</svTRID>
+  <svTRID>ccReg-0913139662</svTRID>
 </trID>
 </epp>
 
@@ -3074,7 +3074,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-4259035558</svTRID>
+  <svTRID>ccReg-2371169449</svTRID>
 </trID>
 </epp>
 
@@ -3140,7 +3140,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-7712081050</svTRID>
+  <svTRID>ccReg-5764556447</svTRID>
 </trID>
 </epp>
 
@@ -3203,7 +3203,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6851530758</svTRID>
+  <svTRID>ccReg-7219060521</svTRID>
 </trID>
 </epp>
 
@@ -3260,14 +3260,14 @@ RESPONSE:
     <resData>
       <creData>
         <name>example.ee</name>
-        <crDate>2014-12-09 14:04:35 UTC</crDate>
+        <crDate>2014-12-09 14:34:25 UTC</crDate>
         <exDate>2015-12-09 00:00:00 UTC</exDate>
       </creData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-3277134470</svTRID>
+  <svTRID>ccReg-4200315023</svTRID>
 </trID>
 </epp>
 
@@ -3330,14 +3330,14 @@ RESPONSE:
     <resData>
       <creData>
         <name>example.ee</name>
-        <crDate>2014-12-09 14:04:37 UTC</crDate>
+        <crDate>2014-12-09 14:34:26 UTC</crDate>
         <exDate>2015-12-09 00:00:00 UTC</exDate>
       </creData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-9553003500</svTRID>
+  <svTRID>ccReg-1262080813</svTRID>
 </trID>
 </epp>
 
@@ -3400,7 +3400,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-1357320367</svTRID>
+  <svTRID>ccReg-1851154819</svTRID>
 </trID>
 </epp>
 
@@ -3463,7 +3463,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-2202798848</svTRID>
+  <svTRID>ccReg-1930960215</svTRID>
 </trID>
 </epp>
 
@@ -3520,7 +3520,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8730610937</svTRID>
+  <svTRID>ccReg-8135988800</svTRID>
 </trID>
 </epp>
 
@@ -3575,14 +3575,14 @@ RESPONSE:
     <resData>
       <creData>
         <name>example.ee</name>
-        <crDate>2014-12-09 14:04:47 UTC</crDate>
+        <crDate>2014-12-09 14:34:27 UTC</crDate>
         <exDate>2015-12-09 00:00:00 UTC</exDate>
       </creData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-2661441652</svTRID>
+  <svTRID>ccReg-4070533561</svTRID>
 </trID>
 </epp>
 
@@ -3637,7 +3637,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8004787481</svTRID>
+  <svTRID>ccReg-0491983597</svTRID>
 </trID>
 </epp>
 
@@ -3676,7 +3676,7 @@ RESPONSE:
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-9608778728</svTRID>
+  <svTRID>ccReg-9974298866</svTRID>
 </trID>
   </response>
 </epp>
@@ -3714,7 +3714,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6408602587</svTRID>
+  <svTRID>ccReg-8843568645</svTRID>
 </trID>
 </epp>
 
@@ -3751,7 +3751,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-1257236160</svTRID>
+  <svTRID>ccReg-9676807694</svTRID>
 </trID>
 </epp>
 
@@ -3787,33 +3787,33 @@ RESPONSE:
       <infData>
         <name>example.ee</name>
         <status s="ok"/>
-        <registrant>sh7433</registrant>
-        <contact type="tech">sh7433</contact>
-        <contact type="admin">sh3954</contact>
+        <registrant>sh0073</registrant>
+        <contact type="tech">sh0073</contact>
+        <contact type="admin">sh9081</contact>
         <ns>
           <hostAttr>
-            <hostName>ns.nienow.ee</hostName>
+            <hostName>ns.mayer.ee</hostName>
           </hostAttr>
           <hostAttr>
-            <hostName>ns.gottlieb.ee</hostName>
+            <hostName>ns.labadiebrown.ee</hostName>
           </hostAttr>
           <hostAttr>
-            <hostName>ns.bahringer.ee</hostName>
+            <hostName>ns.schulist.ee</hostName>
           </hostAttr>
         </ns>
         <clID>Registrar OÜ</clID>
         <crID>Registrar OÜ</crID>
-        <crDate>2014-12-09 14:04:59 UTC</crDate>
+        <crDate>2014-12-09 14:34:29 UTC</crDate>
         <exDate>2015-12-09 00:00:00 UTC</exDate>
         <authInfo>
-          <pw>4f21a32dba5f1b6e3c2f79884921acac</pw>
+          <pw>45aaee6adb2d25649a3dbfaba4802042</pw>
         </authInfo>
       </infData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-9332240852</svTRID>
+  <svTRID>ccReg-5954386926</svTRID>
 </trID>
 </epp>
 
@@ -3849,18 +3849,18 @@ RESPONSE:
       <infData>
         <name>example.ee</name>
         <status s="clientHold">Payment overdue.</status>
-        <registrant>sh8345</registrant>
-        <contact type="tech">sh8345</contact>
-        <contact type="admin">sh2914</contact>
+        <registrant>sh7220</registrant>
+        <contact type="tech">sh7220</contact>
+        <contact type="admin">sh7378</contact>
         <ns>
           <hostAttr>
-            <hostName>ns.wunsch.ee</hostName>
+            <hostName>ns.walker.ee</hostName>
           </hostAttr>
           <hostAttr>
-            <hostName>ns.hettingerbode.ee</hostName>
+            <hostName>ns.jacobson.ee</hostName>
           </hostAttr>
           <hostAttr>
-            <hostName>ns.kuhn.ee</hostName>
+            <hostName>ns.langworth.ee</hostName>
           </hostAttr>
           <hostAttr>
             <hostName>ns1.example.com</hostName>
@@ -3870,10 +3870,10 @@ RESPONSE:
         </ns>
         <clID>Registrar OÜ</clID>
         <crID>Registrar OÜ</crID>
-        <crDate>2014-12-09 14:05:01 UTC</crDate>
+        <crDate>2014-12-09 14:34:29 UTC</crDate>
         <exDate>2015-12-09 00:00:00 UTC</exDate>
         <authInfo>
-          <pw>bcff2a6bef1fc061a66f70f040a4bf31</pw>
+          <pw>0b162e3d7e88c47a06710990b2106944</pw>
         </authInfo>
       </infData>
     </resData>
@@ -3908,7 +3908,7 @@ RESPONSE:
   </extension>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-3353335670</svTRID>
+  <svTRID>ccReg-6683958582</svTRID>
 </trID>
 </epp>
 
@@ -3939,18 +3939,18 @@ RESPONSE:
       <infData>
         <name>example.ee</name>
         <status s="clientHold">Payment overdue.</status>
-        <registrant>sh8345</registrant>
-        <contact type="tech">sh8345</contact>
-        <contact type="admin">sh2914</contact>
+        <registrant>sh7220</registrant>
+        <contact type="tech">sh7220</contact>
+        <contact type="admin">sh7378</contact>
         <ns>
           <hostAttr>
-            <hostName>ns.wunsch.ee</hostName>
+            <hostName>ns.walker.ee</hostName>
           </hostAttr>
           <hostAttr>
-            <hostName>ns.hettingerbode.ee</hostName>
+            <hostName>ns.jacobson.ee</hostName>
           </hostAttr>
           <hostAttr>
-            <hostName>ns.kuhn.ee</hostName>
+            <hostName>ns.langworth.ee</hostName>
           </hostAttr>
           <hostAttr>
             <hostName>ns1.example.com</hostName>
@@ -3960,11 +3960,11 @@ RESPONSE:
         </ns>
         <clID>Registrar OÜ</clID>
         <crID>Registrar OÜ</crID>
-        <crDate>2014-12-09 14:05:01 UTC</crDate>
+        <crDate>2014-12-09 14:34:29 UTC</crDate>
         <exDate>2015-12-09 00:00:00 UTC</exDate>
-        <upDate>2014-12-09 14:05:01 UTC</upDate>
+        <upDate>2014-12-09 14:34:30 UTC</upDate>
         <authInfo>
-          <pw>bcff2a6bef1fc061a66f70f040a4bf31</pw>
+          <pw>0b162e3d7e88c47a06710990b2106944</pw>
         </authInfo>
       </infData>
     </resData>
@@ -3999,7 +3999,7 @@ RESPONSE:
   </extension>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-3329286170</svTRID>
+  <svTRID>ccReg-3058966044</svTRID>
 </trID>
 </epp>
 
@@ -4037,7 +4037,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8828339073</svTRID>
+  <svTRID>ccReg-0737643825</svTRID>
 </trID>
 </epp>
 
@@ -4099,7 +4099,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-1288861743</svTRID>
+  <svTRID>ccReg-5919410092</svTRID>
 </trID>
 </epp>
 
@@ -4153,7 +4153,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-0747798605</svTRID>
+  <svTRID>ccReg-4971815196</svTRID>
 </trID>
 </epp>
 
@@ -4264,7 +4264,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-0128409946</svTRID>
+  <svTRID>ccReg-8909555347</svTRID>
 </trID>
 </epp>
 
@@ -4307,7 +4307,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-1616442141</svTRID>
+  <svTRID>ccReg-3282601636</svTRID>
 </trID>
 </epp>
 
@@ -4365,7 +4365,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6978923523</svTRID>
+  <svTRID>ccReg-4244147090</svTRID>
 </trID>
 </epp>
 
@@ -4402,7 +4402,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-4452580314</svTRID>
+  <svTRID>ccReg-1273853486</svTRID>
 </trID>
 </epp>
 
@@ -4437,7 +4437,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-5343627138</svTRID>
+  <svTRID>ccReg-7599522074</svTRID>
 </trID>
 </epp>
 
@@ -4472,7 +4472,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-5854269419</svTRID>
+  <svTRID>ccReg-4756252113</svTRID>
 </trID>
 </epp>
 
@@ -4510,7 +4510,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8567424686</svTRID>
+  <svTRID>ccReg-3154214519</svTRID>
 </trID>
 </epp>
 
@@ -4542,7 +4542,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-2329881338</svTRID>
+  <svTRID>ccReg-2610298174</svTRID>
 </trID>
 </epp>
 
@@ -4574,7 +4574,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-0260749767</svTRID>
+  <svTRID>ccReg-5030783320</svTRID>
 </trID>
 </epp>
 
@@ -4601,7 +4601,7 @@ REQUEST:
         <secDNS:pubKey>cmlraXN0aGViZXN0</secDNS:pubKey>
       </ext:keyData>
       <ext:authInfo>
-        <domain:pw>4a264c3809256bf46053d0fcda6883ee</domain:pw>
+        <domain:pw>31904837b27fd48cf35b86aa89e6c01f</domain:pw>
       </ext:authInfo>
       <ext:expiry>
         <ext:relative>P1M13D</ext:relative>
@@ -4621,7 +4621,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-9912828484</svTRID>
+  <svTRID>ccReg-7793062408</svTRID>
 </trID>
 </epp>
 
@@ -4648,7 +4648,7 @@ RESPONSE:
     </result>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8894550356</svTRID>
+  <svTRID>ccReg-8101186830</svTRID>
 </trID>
   </response>
 </epp>
@@ -4676,7 +4676,7 @@ RESPONSE:
     </result>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-3302949443</svTRID>
+  <svTRID>ccReg-1529923710</svTRID>
 </trID>
   </response>
 </epp>
@@ -4698,12 +4698,12 @@ RESPONSE:
       <msg>Command completed successfully; ack to dequeue</msg>
     </result>
     <msgQ count="1" id="1">
-      <qDate>2014-12-09 14:05:30 UTC</qDate>
+      <qDate>2014-12-09 14:34:34 UTC</qDate>
       <msg>Balance low.</msg>
     </msgQ>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-7947671397</svTRID>
+  <svTRID>ccReg-8370128212</svTRID>
 </trID>
   </response>
 </epp>
@@ -4730,7 +4730,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6367802613</svTRID>
+  <svTRID>ccReg-9426657568</svTRID>
 </trID>
 </epp>
 
@@ -4753,7 +4753,7 @@ RESPONSE:
     <msgQ count="0" id="1"/>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-1100917544</svTRID>
+  <svTRID>ccReg-0584940832</svTRID>
 </trID>
   </response>
 </epp>
@@ -4780,7 +4780,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-0674191600</svTRID>
+  <svTRID>ccReg-1830165516</svTRID>
 </trID>
 </epp>
 
@@ -4834,12 +4834,12 @@ RESPONSE:
       <msg>Command completed successfully; ack to dequeue</msg>
     </result>
     <msgQ count="3" id="3">
-      <qDate>2014-12-09 14:05:36 UTC</qDate>
+      <qDate>2014-12-09 14:34:34 UTC</qDate>
       <msg>Smth else.</msg>
     </msgQ>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-2737169250</svTRID>
+  <svTRID>ccReg-3623976984</svTRID>
 </trID>
   </response>
 </epp>
@@ -4863,7 +4863,7 @@ RESPONSE:
     <msgQ count="2" id="3"/>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-9828279927</svTRID>
+  <svTRID>ccReg-1205007780</svTRID>
 </trID>
   </response>
 </epp>
@@ -4885,12 +4885,12 @@ RESPONSE:
       <msg>Command completed successfully; ack to dequeue</msg>
     </result>
     <msgQ count="2" id="2">
-      <qDate>2014-12-09 14:05:36 UTC</qDate>
+      <qDate>2014-12-09 14:34:34 UTC</qDate>
       <msg>Something.</msg>
     </msgQ>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-7317360034</svTRID>
+  <svTRID>ccReg-6612302117</svTRID>
 </trID>
   </response>
 </epp>
@@ -4914,7 +4914,7 @@ RESPONSE:
     <msgQ count="1" id="2"/>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-1447397946</svTRID>
+  <svTRID>ccReg-2502522267</svTRID>
 </trID>
   </response>
 </epp>
@@ -4936,12 +4936,12 @@ RESPONSE:
       <msg>Command completed successfully; ack to dequeue</msg>
     </result>
     <msgQ count="1" id="1">
-      <qDate>2014-12-09 14:05:36 UTC</qDate>
+      <qDate>2014-12-09 14:34:34 UTC</qDate>
       <msg>Balance low.</msg>
     </msgQ>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8946222060</svTRID>
+  <svTRID>ccReg-7099125283</svTRID>
 </trID>
   </response>
 </epp>
@@ -4965,7 +4965,7 @@ RESPONSE:
     <msgQ count="0" id="1"/>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-5118397024</svTRID>
+  <svTRID>ccReg-8963458369</svTRID>
 </trID>
   </response>
 </epp>
@@ -4988,7 +4988,7 @@ RESPONSE:
     </result>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8223340984</svTRID>
+  <svTRID>ccReg-0519324484</svTRID>
 </trID>
   </response>
 </epp>
@@ -5032,7 +5032,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-3336483070</svTRID>
+  <svTRID>ccReg-5302287992</svTRID>
 </trID>
 </epp>
 
@@ -5065,7 +5065,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8153726410</svTRID>
+  <svTRID>ccReg-5274237700</svTRID>
 </trID>
 </epp>
 
@@ -5135,7 +5135,7 @@ RESPONSE:
     </result>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-0231965160</svTRID>
+  <svTRID>ccReg-2433659562</svTRID>
 </trID>
   </response>
 </epp>
@@ -5173,7 +5173,7 @@ RESPONSE:
     </result>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-4268541900</svTRID>
+  <svTRID>ccReg-2886261356</svTRID>
 </trID>
   </response>
 </epp>
@@ -5197,7 +5197,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-3555513028</svTRID>
+  <svTRID>ccReg-7566118635</svTRID>
 </trID>
 </epp>
 
@@ -5234,7 +5234,7 @@ RESPONSE:
     </result>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-2734220823</svTRID>
+  <svTRID>ccReg-2804385673</svTRID>
 </trID>
   </response>
 </epp>
diff --git a/spec/epp/contact_spec.rb b/spec/epp/contact_spec.rb
index ce73acd72..45e250097 100644
--- a/spec/epp/contact_spec.rb
+++ b/spec/epp/contact_spec.rb
@@ -14,7 +14,7 @@ describe 'EPP Contact', epp: true do
   let(:server_zone) { Epp::Server.new({ server: 'localhost', tag: 'zone', password: 'ghyt9e4fu', port: 701 }) }
   let(:server_elkdata) { Epp::Server.new({ server: 'localhost', tag: 'elkdata', password: 'ghyt9e4fu', port: 701 }) }
   let(:elkdata) { Fabricate(:registrar, { name: 'Elkdata', reg_no: '123' }) }
-  let(:zone) { Registrar.where(reg_no: '10577829').first || Fabricate(:registrar) }
+  let(:zone) { Registrar.where(reg_no: '12345678').first || Fabricate(:registrar) }
 
   context 'with valid user' do
     before(:each) do
diff --git a/spec/epp/domain_spec.rb b/spec/epp/domain_spec.rb
index a36ea7e39..9b75fb238 100644
--- a/spec/epp/domain_spec.rb
+++ b/spec/epp/domain_spec.rb
@@ -66,7 +66,7 @@ describe 'EPP Domain', epp: true do
         expect(trn_data.css('trStatus').text).to eq('serverApproved')
         expect(trn_data.css('reID').text).to eq('123')
         expect(trn_data.css('reDate').text).to eq(dtl.transfer_requested_at.to_time.utc.to_s)
-        expect(trn_data.css('acID').text).to eq('10577829')
+        expect(trn_data.css('acID').text).to eq('12345678')
         expect(trn_data.css('acDate').text).to eq(dtl.transferred_at.to_time.utc.to_s)
         expect(trn_data.css('exDate').text).to eq(domain.valid_to.to_time.utc.to_s)
 
@@ -88,7 +88,7 @@ describe 'EPP Domain', epp: true do
 
         expect(trn_data.css('name').text).to eq('example.ee')
         expect(trn_data.css('trStatus').text).to eq('pending')
-        expect(trn_data.css('reID').text).to eq('10577829')
+        expect(trn_data.css('reID').text).to eq('12345678')
         expect(trn_data.css('reDate').text).to eq(dtl.transfer_requested_at.to_time.utc.to_s)
         expect(trn_data.css('acDate').text).to eq(dtl.wait_until.to_time.utc.to_s)
         expect(trn_data.css('acID').text).to eq('123')
@@ -103,7 +103,7 @@ describe 'EPP Domain', epp: true do
         expect(domain.domain_transfers.count).to eq(2)
         expect(trn_data.css('name').text).to eq('example.ee')
         expect(trn_data.css('trStatus').text).to eq('pending')
-        expect(trn_data.css('reID').text).to eq('10577829')
+        expect(trn_data.css('reID').text).to eq('12345678')
         expect(trn_data.css('reDate').text).to eq(dtl.transfer_requested_at.to_time.utc.to_s)
         expect(trn_data.css('acDate').text).to eq(dtl.wait_until.to_time.utc.to_s)
         expect(trn_data.css('acID').text).to eq('123')
@@ -165,7 +165,7 @@ describe 'EPP Domain', epp: true do
         expect(trn_data.css('trStatus').text).to eq('clientApproved')
         expect(trn_data.css('reID').text).to eq('123')
         expect(trn_data.css('reDate').text).to eq(dtl.transfer_requested_at.to_time.utc.to_s)
-        expect(trn_data.css('acID').text).to eq('10577829')
+        expect(trn_data.css('acID').text).to eq('12345678')
         expect(trn_data.css('exDate').text).to eq(domain.valid_to.to_time.utc.to_s)
       end
 
@@ -223,7 +223,7 @@ describe 'EPP Domain', epp: true do
 
         expect(response[:clTRID]).to eq('ABC-12345')
 
-        expect(d.registrar.name).to eq('Zone Media OÜ')
+        expect(d.registrar.name).to eq('Registrar OÜ')
         expect(d.tech_contacts.count).to eq 2
         expect(d.admin_contacts.count).to eq 1
 
diff --git a/spec/fabricators/registrar_fabricator.rb b/spec/fabricators/registrar_fabricator.rb
index b2e9c6555..57dd094b1 100644
--- a/spec/fabricators/registrar_fabricator.rb
+++ b/spec/fabricators/registrar_fabricator.rb
@@ -1,6 +1,6 @@
 Fabricator(:registrar) do
-  name 'Zone Media OÜ'
-  reg_no '10577829'
-  address 'Lõõtsa 2, Tallinna linn, Harju maakond, 11415'
+  name 'Registrar OÜ'
+  reg_no '12345678'
+  address 'Street 999, Town, County, Postal'
   country
 end
diff --git a/spec/features/sessions_spec.rb b/spec/features/sessions_spec.rb
index 8eb7340c4..658222c82 100644
--- a/spec/features/sessions_spec.rb
+++ b/spec/features/sessions_spec.rb
@@ -23,6 +23,6 @@ feature 'Sessions', type: :feature do
     expect(uri.path).to eq(admin_root_path)
 
     expect(page).to have_link('Elkdata', count: 2)
-    expect(page).to have_link('Zone Media OÜ', count: 2)
+    expect(page).to have_link('Registrar OÜ', count: 2)
   end
 end