diff --git a/test/target_default/2x4.ru b/test/target_default/2x4.ru
index 56ce77d..9f40813 100644
--- a/test/target_default/2x4.ru
+++ b/test/target_default/2x4.ru
@@ -1 +1 @@
-{"status": ["REGISTERED, DELEGATED, VERIFIED"], "updated_date": ["2013-11-20T08:16:36"], "contacts": {"admin": null, "tech": null, "registrant": {"name": "Private Person"}, "billing": null}, "expiration_date": ["2014-06-24T00:00:00"], "emails": null, "creation_date": ["2004-06-24T00:00:00"], "raw": ["% By submitting a query to RIPN's Whois Service\n% you agree to abide by the following terms of use:\n% http://www.ripn.net/about/servpol.html#3.2 (in Russian) \n% http://www.ripn.net/about/en/servpol.html#3.2 (in English).\n\ndomain: 2X4.RU\nnserver: dns1.yandex.net.\nnserver: dns2.yandex.net.\nstate: REGISTERED, DELEGATED, VERIFIED\nperson: Private Person\nregistrar: RU-CENTER-REG-RIPN\nadmin-contact: https://www.nic.ru/whois\ncreated: 2004.06.24\npaid-till: 2014.06.24\nfree-date: 2014.07.25\nsource: TCI\n\nLast updated on 2013.11.20 08:16:36 MSK\n\n\n"], "whois_server": null, "registrar": ["RU-CENTER-REG-RIPN"], "name_servers": ["dns1.yandex.net", "dns2.yandex.net"], "id": null}
\ No newline at end of file
+{"status": ["REGISTERED, DELEGATED, VERIFIED"], "updated_date": ["2013-11-20T08:16:36"], "contacts": {"admin": null, "tech": null, "registrant": {"name": "Private Person"}, "billing": null}, "nameservers": ["dns1.yandex.net", "dns2.yandex.net"], "expiration_date": ["2014-06-24T00:00:00"], "creation_date": ["2004-06-24T00:00:00"], "raw": ["% By submitting a query to RIPN's Whois Service\n% you agree to abide by the following terms of use:\n% http://www.ripn.net/about/servpol.html#3.2 (in Russian) \n% http://www.ripn.net/about/en/servpol.html#3.2 (in English).\n\ndomain: 2X4.RU\nnserver: dns1.yandex.net.\nnserver: dns2.yandex.net.\nstate: REGISTERED, DELEGATED, VERIFIED\nperson: Private Person\nregistrar: RU-CENTER-REG-RIPN\nadmin-contact: https://www.nic.ru/whois\ncreated: 2004.06.24\npaid-till: 2014.06.24\nfree-date: 2014.07.25\nsource: TCI\n\nLast updated on 2013.11.20 08:16:36 MSK\n\n\n"], "registrar": ["RU-CENTER-REG-RIPN"]}
\ No newline at end of file
diff --git a/test/target_default/about.museum b/test/target_default/about.museum
index cec3071..342cdec 100644
--- a/test/target_default/about.museum
+++ b/test/target_default/about.museum
@@ -1 +1 @@
-{"status": ["ok"], "updated_date": null, "contacts": {"admin": {"city": "Stockholm", "handle": "C728-MUSEUM", "name": "Cary Karp", "street": "Frescativaegen 40", "country": "SE", "postalcode": "104 05", "organization": "Museum Domain Management Association", "email": "ck@nic.museum"}, "tech": {"city": "Stockholm", "handle": "C728-MUSEUM", "name": "Cary Karp", "street": "Frescativaegen 40", "country": "SE", "postalcode": "104 05", "organization": "Museum Domain Management Association", "email": "ck@nic.museum"}, "registrant": {"city": "Stockholm", "handle": "C728-MUSEUM", "name": "Cary Karp", "street": "Frescativaegen 40", "country": "SE", "postalcode": "104 05", "organization": "Museum Domain Management Association", "email": "ck@nic.museum"}, "billing": {"city": "Stockholm", "handle": "C728-MUSEUM", "name": "Cary Karp", "street": "Frescativaegen 40", "country": "SE", "postalcode": "104 05", "organization": "Museum Domain Management Association", "email": "ck@nic.museum"}}, "expiration_date": ["2015-02-04T19:32:48"], "emails": [], "creation_date": ["2005-02-04T19:32:48", "2005-02-04T19:32:48"], "raw": ["% Musedoma Whois Server Copyright (C) 2007 Museum Domain Management Association\n%\n% NOTICE: Access to Musedoma Whois information is provided to assist in\n% determining the contents of an object name registration record in the\n% Musedoma database. The data in this record is provided by Musedoma for\n% informational purposes only, and Musedoma does not guarantee its\n% accuracy. This service is intended only for query-based access. You\n% agree that you will use this data only for lawful purposes and that,\n% under no circumstances will you use this data to: (a) allow, enable,\n% or otherwise support the transmission by e-mail, telephone or\n% facsimile of unsolicited, commercial advertising or solicitations; or\n% (b) enable automated, electronic processes that send queries or data\n% to the systems of Musedoma or registry operators, except as reasonably\n% necessary to register object names or modify existing registrations.\n% All rights reserved. Musedoma reserves the right to modify these terms at\n% any time. By submitting this query, you agree to abide by this policy.\n%\n% WARNING: THIS RESPONSE IS NOT AUTHENTIC\n%\n% The selected character encoding \"US-ASCII\" is not able to represent all\n% characters in this output. Those characters that could not be represented\n% have been replaced with the unaccented ASCII equivalents. Please\n% resubmit your query with a suitable character encoding in order to receive\n% an authentic response.\n%\nDomain ID: D6137686-MUSEUM\nDomain Name: about.museum\nDomain Name ACE: about.museum\nDomain Language: \nRegistrar ID: CORE-904 (Musedoma)\nCreated On: 2005-02-04 19:32:48 GMT\nExpiration Date: 2015-02-04 19:32:48 GMT\nMaintainer: http://musedoma.museum\nStatus: ok\nRegistrant ID: C728-MUSEUM\nRegistrant Name: Cary Karp\nRegistrant Organization: Museum Domain Management Association\nRegistrant Street: Frescativaegen 40\nRegistrant City: Stockholm\nRegistrant State/Province: \nRegistrant Postal Code: 104 05\nRegistrant Country: SE\nRegistrant Phone: \nRegistrant Phone Ext: \nRegistrant Fax: \nRegistrant Fax Ext: \nRegistrant Email: ck@nic.museum\nAdmin ID: C728-MUSEUM\nAdmin Name: Cary Karp\nAdmin Organization: Museum Domain Management Association\nAdmin Street: Frescativaegen 40\nAdmin City: Stockholm\nAdmin State/Province: \nAdmin Postal Code: 104 05\nAdmin Country: SE\nAdmin Phone: \nAdmin Phone Ext: \nAdmin Fax: \nAdmin Fax Ext: \nAdmin Email: ck@nic.museum\nTech ID: C728-MUSEUM\nTech Name: Cary Karp\nTech Organization: Museum Domain Management Association\nTech Street: Frescativaegen 40\nTech City: Stockholm\nTech State/Province: \nTech Postal Code: 104 05\nTech Country: SE\nTech Phone: \nTech Phone Ext: \nTech Fax: \nTech Fax Ext: \nTech Email: ck@nic.museum\nBilling ID: C728-MUSEUM\nBilling Name: Cary Karp\nBilling Organization: Museum Domain Management Association\nBilling Street: Frescativaegen 40\nBilling City: Stockholm\nBilling State/Province: \nBilling Postal Code: 104 05\nBilling Country: SE\nBilling Phone: \nBilling Phone Ext: \nBilling Fax: \nBilling Fax Ext: \nBilling Email: ck@nic.museum\nName Server: nic.frd.se \nName Server ACE: nic.frd.se \nName Server: nic.museum 130.242.24.5\nName Server ACE: nic.museum 130.242.24.5\n\n\n"], "whois_server": null, "registrar": null, "name_servers": ["nic.frd.se", "nic.museum"], "id": ["D6137686-MUSEUM"]}
\ No newline at end of file
+{"status": ["ok"], "contacts": {"admin": {"city": "Stockholm", "handle": "C728-MUSEUM", "name": "Cary Karp", "street": "Frescativaegen 40", "country": "SE", "postalcode": "104 05", "organization": "Museum Domain Management Association", "email": "ck@nic.museum"}, "tech": {"city": "Stockholm", "handle": "C728-MUSEUM", "name": "Cary Karp", "street": "Frescativaegen 40", "country": "SE", "postalcode": "104 05", "organization": "Museum Domain Management Association", "email": "ck@nic.museum"}, "registrant": {"city": "Stockholm", "handle": "C728-MUSEUM", "name": "Cary Karp", "street": "Frescativaegen 40", "country": "SE", "postalcode": "104 05", "organization": "Museum Domain Management Association", "email": "ck@nic.museum"}, "billing": {"city": "Stockholm", "handle": "C728-MUSEUM", "name": "Cary Karp", "street": "Frescativaegen 40", "country": "SE", "postalcode": "104 05", "organization": "Museum Domain Management Association", "email": "ck@nic.museum"}}, "nameservers": ["nic.frd.se", "nic.museum"], "expiration_date": ["2015-02-04T19:32:48"], "creation_date": ["2005-02-04T19:32:48", "2005-02-04T19:32:48"], "raw": ["% Musedoma Whois Server Copyright (C) 2007 Museum Domain Management Association\n%\n% NOTICE: Access to Musedoma Whois information is provided to assist in\n% determining the contents of an object name registration record in the\n% Musedoma database. The data in this record is provided by Musedoma for\n% informational purposes only, and Musedoma does not guarantee its\n% accuracy. This service is intended only for query-based access. You\n% agree that you will use this data only for lawful purposes and that,\n% under no circumstances will you use this data to: (a) allow, enable,\n% or otherwise support the transmission by e-mail, telephone or\n% facsimile of unsolicited, commercial advertising or solicitations; or\n% (b) enable automated, electronic processes that send queries or data\n% to the systems of Musedoma or registry operators, except as reasonably\n% necessary to register object names or modify existing registrations.\n% All rights reserved. Musedoma reserves the right to modify these terms at\n% any time. By submitting this query, you agree to abide by this policy.\n%\n% WARNING: THIS RESPONSE IS NOT AUTHENTIC\n%\n% The selected character encoding \"US-ASCII\" is not able to represent all\n% characters in this output. Those characters that could not be represented\n% have been replaced with the unaccented ASCII equivalents. Please\n% resubmit your query with a suitable character encoding in order to receive\n% an authentic response.\n%\nDomain ID: D6137686-MUSEUM\nDomain Name: about.museum\nDomain Name ACE: about.museum\nDomain Language: \nRegistrar ID: CORE-904 (Musedoma)\nCreated On: 2005-02-04 19:32:48 GMT\nExpiration Date: 2015-02-04 19:32:48 GMT\nMaintainer: http://musedoma.museum\nStatus: ok\nRegistrant ID: C728-MUSEUM\nRegistrant Name: Cary Karp\nRegistrant Organization: Museum Domain Management Association\nRegistrant Street: Frescativaegen 40\nRegistrant City: Stockholm\nRegistrant State/Province: \nRegistrant Postal Code: 104 05\nRegistrant Country: SE\nRegistrant Phone: \nRegistrant Phone Ext: \nRegistrant Fax: \nRegistrant Fax Ext: \nRegistrant Email: ck@nic.museum\nAdmin ID: C728-MUSEUM\nAdmin Name: Cary Karp\nAdmin Organization: Museum Domain Management Association\nAdmin Street: Frescativaegen 40\nAdmin City: Stockholm\nAdmin State/Province: \nAdmin Postal Code: 104 05\nAdmin Country: SE\nAdmin Phone: \nAdmin Phone Ext: \nAdmin Fax: \nAdmin Fax Ext: \nAdmin Email: ck@nic.museum\nTech ID: C728-MUSEUM\nTech Name: Cary Karp\nTech Organization: Museum Domain Management Association\nTech Street: Frescativaegen 40\nTech City: Stockholm\nTech State/Province: \nTech Postal Code: 104 05\nTech Country: SE\nTech Phone: \nTech Phone Ext: \nTech Fax: \nTech Fax Ext: \nTech Email: ck@nic.museum\nBilling ID: C728-MUSEUM\nBilling Name: Cary Karp\nBilling Organization: Museum Domain Management Association\nBilling Street: Frescativaegen 40\nBilling City: Stockholm\nBilling State/Province: \nBilling Postal Code: 104 05\nBilling Country: SE\nBilling Phone: \nBilling Phone Ext: \nBilling Fax: \nBilling Fax Ext: \nBilling Email: ck@nic.museum\nName Server: nic.frd.se \nName Server ACE: nic.frd.se \nName Server: nic.museum 130.242.24.5\nName Server ACE: nic.museum 130.242.24.5\n\n\n"], "id": ["D6137686-MUSEUM"]}
\ No newline at end of file
diff --git a/test/target_default/actu.org.au b/test/target_default/actu.org.au
index 4fb89b2..1e3826b 100644
--- a/test/target_default/actu.org.au
+++ b/test/target_default/actu.org.au
@@ -1 +1 @@
-{"status": ["ok"], "updated_date": ["2013-09-09T02:21:17"], "contacts": {"admin": null, "tech": {"handle": "WAPE1350", "name": "Peter Watkins"}, "registrant": {"organization": "Australian Council of Trade Unions", "handle": "WORO1080", "name": "Peter Watkins"}, "billing": null}, "expiration_date": null, "emails": null, "raw": ["Domain Name: actu.org.au\nLast Modified: 09-Sep-2013 02:21:17 UTC\nRegistrar ID: NetRegistry\nRegistrar Name: NetRegistry\nStatus: ok\n\nRegistrant: Australian Council of Trade Unions\nEligibility Type: Incorporated Association\nEligibility ID: ABN 67175982800\n\nRegistrant Contact ID: WORO1080\nRegistrant Contact Name: Peter Watkins\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: WAPE1350\nTech Contact Name: Peter Watkins\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: ns15.dnsmadeeasy.com\nName Server: ns10.dnsmadeeasy.com\nName Server: ns11.dnsmadeeasy.com\nName Server: ns12.dnsmadeeasy.com\nName Server: ns13.dnsmadeeasy.com\nName Server: ns14.dnsmadeeasy.com\n\n"], "whois_server": null, "registrar": ["NetRegistry"], "name_servers": ["ns15.dnsmadeeasy.com", "ns10.dnsmadeeasy.com", "ns11.dnsmadeeasy.com", "ns12.dnsmadeeasy.com", "ns13.dnsmadeeasy.com", "ns14.dnsmadeeasy.com"], "creation_date": null, "id": null}
\ No newline at end of file
+{"status": ["ok"], "updated_date": ["2013-09-09T02:21:17"], "contacts": {"admin": null, "tech": {"handle": "WAPE1350", "name": "Peter Watkins"}, "registrant": {"organization": "Australian Council of Trade Unions", "handle": "WORO1080", "name": "Peter Watkins"}, "billing": null}, "nameservers": ["ns15.dnsmadeeasy.com", "ns10.dnsmadeeasy.com", "ns11.dnsmadeeasy.com", "ns12.dnsmadeeasy.com", "ns13.dnsmadeeasy.com", "ns14.dnsmadeeasy.com"], "raw": ["Domain Name: actu.org.au\nLast Modified: 09-Sep-2013 02:21:17 UTC\nRegistrar ID: NetRegistry\nRegistrar Name: NetRegistry\nStatus: ok\n\nRegistrant: Australian Council of Trade Unions\nEligibility Type: Incorporated Association\nEligibility ID: ABN 67175982800\n\nRegistrant Contact ID: WORO1080\nRegistrant Contact Name: Peter Watkins\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: WAPE1350\nTech Contact Name: Peter Watkins\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: ns15.dnsmadeeasy.com\nName Server: ns10.dnsmadeeasy.com\nName Server: ns11.dnsmadeeasy.com\nName Server: ns12.dnsmadeeasy.com\nName Server: ns13.dnsmadeeasy.com\nName Server: ns14.dnsmadeeasy.com\n\n"], "registrar": ["NetRegistry"]}
\ No newline at end of file
diff --git a/test/target_default/alibaba.jp b/test/target_default/alibaba.jp
index f691b72..da41202 100644
--- a/test/target_default/alibaba.jp
+++ b/test/target_default/alibaba.jp
@@ -1 +1 @@
-{"status": ["Active"], "updated_date": ["2013-06-01T01:05:07"], "contacts": {"admin": null, "tech": null, "registrant": {"fax": "85222155200", "name": "Alibaba Group Holding Limited", "phone": "85222155100", "street": "George Town\nFourth Floor, One Capital Place\nP.O. Box 847", "postalcode": "KY1-1103", "email": "dnsadmin@hk.alibaba-inc.com"}, "billing": null}, "expiration_date": ["2014-05-31T00:00:00", "2014-05-31T00:00:00"], "id": null, "creation_date": ["2001-05-08T00:00:00", "2001-05-08T00:00:00"], "raw": ["[ JPRS database provides information on network administration. Its use is ]\n[ restricted to network administration purposes. For further information, ]\n[ use 'whois -h whois.jprs.jp help'. To suppress Japanese output, add'/e' ]\n[ at the end of command, e.g. 'whois -h whois.jprs.jp xxx/e'. ]\n\nDomain Information:\n[Domain Name] ALIBABA.JP\n\n[Registrant] Alibaba Group Holding Limited\n\n[Name Server] ns1.markmonitor.com\n[Name Server] ns6.markmonitor.com\n[Name Server] ns4.markmonitor.com\n[Name Server] ns3.markmonitor.com\n[Name Server] ns7.markmonitor.com\n[Name Server] ns2.markmonitor.com\n[Name Server] ns5.markmonitor.com\n[Signing Key] \n\n[Created on] 2001/05/08\n[Expires on] 2014/05/31\n[Status] Active\n[Last Updated] 2013/06/01 01:05:07 (JST)\n\nContact Information:\n[Name] Alibaba Group Holding Limited\n[Email] dnsadmin@hk.alibaba-inc.com\n[Web Page] \n[Postal code] KY1-1103\n[Postal Address] George Town\n Fourth Floor, One Capital Place\n P.O. Box 847\n[Phone] 85222155100\n[Fax] 85222155200\n\n\n"], "whois_server": null, "registrar": null, "name_servers": ["ns1.markmonitor.com", "ns6.markmonitor.com", "ns4.markmonitor.com", "ns3.markmonitor.com", "ns7.markmonitor.com", "ns2.markmonitor.com", "ns5.markmonitor.com"], "emails": []}
\ No newline at end of file
+{"status": ["Active"], "updated_date": ["2013-06-01T01:05:07"], "contacts": {"admin": null, "tech": null, "registrant": {"fax": "85222155200", "name": "Alibaba Group Holding Limited", "phone": "85222155100", "street": "George Town\nFourth Floor, One Capital Place\nP.O. Box 847", "postalcode": "KY1-1103", "email": "dnsadmin@hk.alibaba-inc.com"}, "billing": null}, "nameservers": ["ns1.markmonitor.com", "ns6.markmonitor.com", "ns4.markmonitor.com", "ns3.markmonitor.com", "ns7.markmonitor.com", "ns2.markmonitor.com", "ns5.markmonitor.com"], "expiration_date": ["2014-05-31T00:00:00", "2014-05-31T00:00:00"], "creation_date": ["2001-05-08T00:00:00", "2001-05-08T00:00:00"], "raw": ["[ JPRS database provides information on network administration. Its use is ]\n[ restricted to network administration purposes. For further information, ]\n[ use 'whois -h whois.jprs.jp help'. To suppress Japanese output, add'/e' ]\n[ at the end of command, e.g. 'whois -h whois.jprs.jp xxx/e'. ]\n\nDomain Information:\n[Domain Name] ALIBABA.JP\n\n[Registrant] Alibaba Group Holding Limited\n\n[Name Server] ns1.markmonitor.com\n[Name Server] ns6.markmonitor.com\n[Name Server] ns4.markmonitor.com\n[Name Server] ns3.markmonitor.com\n[Name Server] ns7.markmonitor.com\n[Name Server] ns2.markmonitor.com\n[Name Server] ns5.markmonitor.com\n[Signing Key] \n\n[Created on] 2001/05/08\n[Expires on] 2014/05/31\n[Status] Active\n[Last Updated] 2013/06/01 01:05:07 (JST)\n\nContact Information:\n[Name] Alibaba Group Holding Limited\n[Email] dnsadmin@hk.alibaba-inc.com\n[Web Page] \n[Postal code] KY1-1103\n[Postal Address] George Town\n Fourth Floor, One Capital Place\n P.O. Box 847\n[Phone] 85222155100\n[Fax] 85222155200\n\n\n"]}
\ No newline at end of file
diff --git a/test/target_default/anonne.ws b/test/target_default/anonne.ws
index 2c213af..f1c99cd 100644
--- a/test/target_default/anonne.ws
+++ b/test/target_default/anonne.ws
@@ -1 +1 @@
-{"updated_date": ["2013-04-06T00:00:00"], "status": null, "contacts": {"admin": {"city": "DORDRECHT", "fax": "+1.5555555555", "name": "SVEN SLOOTWEG", "state": "ZUID-HOLLAND", "phone": "+31.626519955", "street": "WIJNSTRAAT 211", "country": "NL", "postalcode": "3311BV", "email": "JAMSOFTGAMEDEV@GMAIL.COM"}, "tech": {"city": "DORDRECHT", "fax": "+1.5555555555", "name": "SVEN SLOOTWEG", "state": "ZUID-HOLLAND", "phone": "+31.626519955", "street": "WIJNSTRAAT 211", "country": "NL", "postalcode": "3311BV", "email": "JAMSOFTGAMEDEV@GMAIL.COM"}, "registrant": {"city": "DORDRECHT", "name": "SVEN SLOOTWEG", "state": "ZUID-HOLLAND", "street": "WIJNSTRAAT 211", "country": "NL", "postalcode": "3311BV"}, "billing": null}, "expiration_date": ["2014-04-07T19:40:22"], "id": null, "creation_date": ["2012-04-07T12:40:00"], "raw": ["\n\nDomain Name: ANONNE.WS\nCreation Date: 2012-04-07 12:40:00Z\nRegistrar Registration Expiration Date: 2014-04-07 19:40:22Z\nRegistrar: ENOM, INC.\nReseller: NAMECHEAP.COM\nRegistrant Name: SVEN SLOOTWEG\nRegistrant Organization: \nRegistrant Street: WIJNSTRAAT 211\nRegistrant City: DORDRECHT\nRegistrant State/Province: ZUID-HOLLAND\nRegistrant Postal Code: 3311BV\nRegistrant Country: NL\nAdmin Name: SVEN SLOOTWEG\nAdmin Organization: \nAdmin Street: WIJNSTRAAT 211\nAdmin City: DORDRECHT\nAdmin State/Province: ZUID-HOLLAND\nAdmin Postal Code: 3311BV\nAdmin Country: NL\nAdmin Phone: +31.626519955\nAdmin Phone Ext: \nAdmin Fax: +1.5555555555\nAdmin Fax Ext:\nAdmin Email: JAMSOFTGAMEDEV@GMAIL.COM\nTech Name: SVEN SLOOTWEG\nTech Organization: \nTech Street: WIJNSTRAAT 211\nTech City: DORDRECHT\nTech State/Province: ZUID-HOLLAND\nTech Postal Code: 3311BV\nTech Country: NL\nTech Phone: +31.626519955\nTech Phone Ext: \nTech Fax: +1.5555555555\nTech Fax Ext: \nTech Email: JAMSOFTGAMEDEV@GMAIL.COM\nName Server: NS1.HE.NET\nName Server: NS2.HE.NET\nName Server: NS3.HE.NET\nName Server: NS4.HE.NET\nName Server: NS5.HE.NET\n\nThe data in this whois database is provided to you for information\npurposes only, that is, to assist you in obtaining information about or\nrelated to a domain name registration record. We make this information\navailable \"as is,\" and do not guarantee its accuracy. By submitting a\nwhois query, you agree that you will use this data only for lawful\npurposes and that, under no circumstances will you use this data to: (1)\nenable high volume, automated, electronic processes that stress or load\nthis whois database system providing you this information; or (2) allow,\nenable, or otherwise support the transmission of mass unsolicited,\ncommercial advertising or solicitations via direct mail, electronic\nmail, or by telephone. The compilation, repackaging, dissemination or\nother use of this data is expressly prohibited without prior written\nconsent from us. \n\nWe reserve the right to modify these terms at any time. By submitting \nthis query, you agree to abide by these terms.\nVersion 6.3 4/3/2002\n", "\n\nWelcome to the .WS Whois Server\n\nUse of this service for any purpose other\nthan determining the availability of a domain\nin the .WS TLD to be registered is strictly\nprohibited.\n\n Domain Name: ANONNE.WS\n\n Registrant Name: Use registrar whois listed below\n Registrant Email: Use registrar whois listed below\n\n Administrative Contact Email: Use registrar whois listed below\n Administrative Contact Telephone: Use registrar whois listed below\n\n Registrar Name: eNom\n Registrar Email: info@enom.com\n Registrar Telephone: 425-974-4500\n Registrar Whois: whois.enom.com\n\n Domain Created: 2012-04-07\n Domain Last Updated: 2013-04-06\n Domain Currently Expires: 2014-04-07\n\n Current Nameservers:\n\n ns1.he.net\n ns2.he.net\n ns3.he.net\n ns4.he.net\n ns5.he.net\n\n\n\n"], "whois_server": ["whois.enom.com"], "registrar": ["ENOM, INC."], "name_servers": ["NS1.HE.NET", "NS2.HE.NET", "NS3.HE.NET", "NS4.HE.NET", "NS5.HE.NET"], "emails": []}
\ No newline at end of file
+{"updated_date": ["2013-04-06T00:00:00"], "contacts": {"admin": {"city": "DORDRECHT", "fax": "+1.5555555555", "name": "SVEN SLOOTWEG", "state": "ZUID-HOLLAND", "phone": "+31.626519955", "street": "WIJNSTRAAT 211", "country": "NL", "postalcode": "3311BV", "email": "JAMSOFTGAMEDEV@GMAIL.COM"}, "tech": {"city": "DORDRECHT", "fax": "+1.5555555555", "name": "SVEN SLOOTWEG", "state": "ZUID-HOLLAND", "phone": "+31.626519955", "street": "WIJNSTRAAT 211", "country": "NL", "postalcode": "3311BV", "email": "JAMSOFTGAMEDEV@GMAIL.COM"}, "registrant": {"city": "DORDRECHT", "name": "SVEN SLOOTWEG", "state": "ZUID-HOLLAND", "street": "WIJNSTRAAT 211", "country": "NL", "postalcode": "3311BV"}, "billing": null}, "nameservers": ["NS1.HE.NET", "NS2.HE.NET", "NS3.HE.NET", "NS4.HE.NET", "NS5.HE.NET"], "expiration_date": ["2014-04-07T19:40:22"], "creation_date": ["2012-04-07T12:40:00"], "raw": ["\n\nDomain Name: ANONNE.WS\nCreation Date: 2012-04-07 12:40:00Z\nRegistrar Registration Expiration Date: 2014-04-07 19:40:22Z\nRegistrar: ENOM, INC.\nReseller: NAMECHEAP.COM\nRegistrant Name: SVEN SLOOTWEG\nRegistrant Organization: \nRegistrant Street: WIJNSTRAAT 211\nRegistrant City: DORDRECHT\nRegistrant State/Province: ZUID-HOLLAND\nRegistrant Postal Code: 3311BV\nRegistrant Country: NL\nAdmin Name: SVEN SLOOTWEG\nAdmin Organization: \nAdmin Street: WIJNSTRAAT 211\nAdmin City: DORDRECHT\nAdmin State/Province: ZUID-HOLLAND\nAdmin Postal Code: 3311BV\nAdmin Country: NL\nAdmin Phone: +31.626519955\nAdmin Phone Ext: \nAdmin Fax: +1.5555555555\nAdmin Fax Ext:\nAdmin Email: JAMSOFTGAMEDEV@GMAIL.COM\nTech Name: SVEN SLOOTWEG\nTech Organization: \nTech Street: WIJNSTRAAT 211\nTech City: DORDRECHT\nTech State/Province: ZUID-HOLLAND\nTech Postal Code: 3311BV\nTech Country: NL\nTech Phone: +31.626519955\nTech Phone Ext: \nTech Fax: +1.5555555555\nTech Fax Ext: \nTech Email: JAMSOFTGAMEDEV@GMAIL.COM\nName Server: NS1.HE.NET\nName Server: NS2.HE.NET\nName Server: NS3.HE.NET\nName Server: NS4.HE.NET\nName Server: NS5.HE.NET\n\nThe data in this whois database is provided to you for information\npurposes only, that is, to assist you in obtaining information about or\nrelated to a domain name registration record. We make this information\navailable \"as is,\" and do not guarantee its accuracy. By submitting a\nwhois query, you agree that you will use this data only for lawful\npurposes and that, under no circumstances will you use this data to: (1)\nenable high volume, automated, electronic processes that stress or load\nthis whois database system providing you this information; or (2) allow,\nenable, or otherwise support the transmission of mass unsolicited,\ncommercial advertising or solicitations via direct mail, electronic\nmail, or by telephone. The compilation, repackaging, dissemination or\nother use of this data is expressly prohibited without prior written\nconsent from us. \n\nWe reserve the right to modify these terms at any time. By submitting \nthis query, you agree to abide by these terms.\nVersion 6.3 4/3/2002\n", "\n\nWelcome to the .WS Whois Server\n\nUse of this service for any purpose other\nthan determining the availability of a domain\nin the .WS TLD to be registered is strictly\nprohibited.\n\n Domain Name: ANONNE.WS\n\n Registrant Name: Use registrar whois listed below\n Registrant Email: Use registrar whois listed below\n\n Administrative Contact Email: Use registrar whois listed below\n Administrative Contact Telephone: Use registrar whois listed below\n\n Registrar Name: eNom\n Registrar Email: info@enom.com\n Registrar Telephone: 425-974-4500\n Registrar Whois: whois.enom.com\n\n Domain Created: 2012-04-07\n Domain Last Updated: 2013-04-06\n Domain Currently Expires: 2014-04-07\n\n Current Nameservers:\n\n ns1.he.net\n ns2.he.net\n ns3.he.net\n ns4.he.net\n ns5.he.net\n\n\n\n"], "whois_server": ["whois.enom.com"], "registrar": ["ENOM, INC."]}
\ No newline at end of file
diff --git a/test/target_default/anonnews.org b/test/target_default/anonnews.org
index cd43d22..896ca23 100644
--- a/test/target_default/anonnews.org
+++ b/test/target_default/anonnews.org
@@ -1 +1 @@
-{"status": ["CLIENT TRANSFER PROHIBITED", "RENEWPERIOD"], "updated_date": ["2013-11-16T12:22:49"], "contacts": {"admin": {"city": "Panama", "handle": "INTErkiewm5586ze", "name": "Domain Administrator", "phone": "+507.65995877", "street": "Attn: anonnews.org\nAptds. 0850-00056", "country": "PA", "postalcode": "Zona 15", "organization": "Fundacion Private Whois", "email": "52300fa7x2yb6oe6@5225b4d0pi3627q9.privatewhois.net"}, "tech": {"city": "Panama", "handle": "INTEl92g5h18b12w", "name": "Domain Administrator", "phone": "+507.65995877", "street": "Attn: anonnews.org\nAptds. 0850-00056", "country": "PA", "postalcode": "Zona 15", "organization": "Fundacion Private Whois", "email": "52300fa6vwq931xf@5225b4d0pi3627q9.privatewhois.net"}, "registrant": {"city": "Panama", "handle": "INTE381xro4k9z0m", "name": "Domain Administrator", "phone": "+507.65995877", "street": "Attn: anonnews.org\nAptds. 0850-00056", "country": "PA", "postalcode": "Zona 15", "organization": "Fundacion Private Whois", "email": "52300fa6c2nzfacc@5225b4d0pi3627q9.privatewhois.net"}, "billing": null}, "expiration_date": ["2014-12-12T20:31:54"], "emails": [], "raw": ["Access to .ORG WHOIS information is provided to assist persons in \ndetermining the contents of a domain name registration record in the \nPublic Interest Registry registry database. The data in this record is provided by \nPublic Interest Registry for informational purposes only, and Public Interest Registry does not \nguarantee its accuracy. This service is intended only for query-based \naccess. You agree that you will use this data only for lawful purposes \nand that, under no circumstances will you use this data to: (a) allow, \nenable, or otherwise support the transmission by e-mail, telephone, or \nfacsimile of mass unsolicited, commercial advertising or solicitations \nto entities other than the data recipient's own existing customers; or \n(b) enable high volume, automated, electronic processes that send \nqueries or data to the systems of Registry Operator, a Registrar, or \nAfilias except as reasonably necessary to register domain names or \nmodify existing registrations. All rights reserved. Public Interest Registry reserves \nthe right to modify these terms at any time. By submitting this query, \nyou agree to abide by this policy. \n\nDomain ID:D160909486-LROR\nDomain Name:ANONNEWS.ORG\nCreated On:12-Dec-2010 20:31:54 UTC\nLast Updated On:16-Nov-2013 12:22:49 UTC\nExpiration Date:12-Dec-2014 20:31:54 UTC\nSponsoring Registrar:Internet.bs Corp. (R1601-LROR)\nStatus:CLIENT TRANSFER PROHIBITED\nStatus:RENEWPERIOD\nRegistrant ID:INTE381xro4k9z0m\nRegistrant Name:Domain Administrator\nRegistrant Organization:Fundacion Private Whois\nRegistrant Street1:Attn: anonnews.org\nRegistrant Street2:Aptds. 0850-00056\nRegistrant Street3:\nRegistrant City:Panama\nRegistrant State/Province:\nRegistrant Postal Code:Zona 15\nRegistrant Country:PA\nRegistrant Phone:+507.65995877\nRegistrant Phone Ext.:\nRegistrant FAX:\nRegistrant FAX Ext.:\nRegistrant Email:52300fa6c2nzfacc@5225b4d0pi3627q9.privatewhois.net\nAdmin ID:INTErkiewm5586ze\nAdmin Name:Domain Administrator\nAdmin Organization:Fundacion Private Whois\nAdmin Street1:Attn: anonnews.org\nAdmin Street2:Aptds. 0850-00056\nAdmin Street3:\nAdmin City:Panama\nAdmin State/Province:\nAdmin Postal Code:Zona 15\nAdmin Country:PA\nAdmin Phone:+507.65995877\nAdmin Phone Ext.:\nAdmin FAX:\nAdmin FAX Ext.:\nAdmin Email:52300fa7x2yb6oe6@5225b4d0pi3627q9.privatewhois.net\nTech ID:INTEl92g5h18b12w\nTech Name:Domain Administrator\nTech Organization:Fundacion Private Whois\nTech Street1:Attn: anonnews.org\nTech Street2:Aptds. 0850-00056\nTech Street3:\nTech City:Panama\nTech State/Province:\nTech Postal Code:Zona 15\nTech Country:PA\nTech Phone:+507.65995877\nTech Phone Ext.:\nTech FAX:\nTech FAX Ext.:\nTech Email:52300fa6vwq931xf@5225b4d0pi3627q9.privatewhois.net\nName Server:LISA.NS.CLOUDFLARE.COM\nName Server:ED.NS.CLOUDFLARE.COM\nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nDNSSEC:Unsigned\n\n\n\n"], "whois_server": null, "registrar": ["Internet.bs Corp. (R1601-LROR)"], "name_servers": ["LISA.NS.CLOUDFLARE.COM", "ED.NS.CLOUDFLARE.COM"], "creation_date": ["2010-12-12T20:31:54", "2010-12-12T20:31:54"], "id": ["D160909486-LROR"]}
\ No newline at end of file
+{"status": ["CLIENT TRANSFER PROHIBITED", "RENEWPERIOD"], "updated_date": ["2013-11-16T12:22:49"], "contacts": {"admin": {"city": "Panama", "handle": "INTErkiewm5586ze", "name": "Domain Administrator", "phone": "+507.65995877", "street": "Attn: anonnews.org\nAptds. 0850-00056", "country": "PA", "postalcode": "Zona 15", "organization": "Fundacion Private Whois", "email": "52300fa7x2yb6oe6@5225b4d0pi3627q9.privatewhois.net"}, "tech": {"city": "Panama", "handle": "INTEl92g5h18b12w", "name": "Domain Administrator", "phone": "+507.65995877", "street": "Attn: anonnews.org\nAptds. 0850-00056", "country": "PA", "postalcode": "Zona 15", "organization": "Fundacion Private Whois", "email": "52300fa6vwq931xf@5225b4d0pi3627q9.privatewhois.net"}, "registrant": {"city": "Panama", "handle": "INTE381xro4k9z0m", "name": "Domain Administrator", "phone": "+507.65995877", "street": "Attn: anonnews.org\nAptds. 0850-00056", "country": "PA", "postalcode": "Zona 15", "organization": "Fundacion Private Whois", "email": "52300fa6c2nzfacc@5225b4d0pi3627q9.privatewhois.net"}, "billing": null}, "nameservers": ["LISA.NS.CLOUDFLARE.COM", "ED.NS.CLOUDFLARE.COM"], "expiration_date": ["2014-12-12T20:31:54"], "raw": ["Access to .ORG WHOIS information is provided to assist persons in \ndetermining the contents of a domain name registration record in the \nPublic Interest Registry registry database. The data in this record is provided by \nPublic Interest Registry for informational purposes only, and Public Interest Registry does not \nguarantee its accuracy. This service is intended only for query-based \naccess. You agree that you will use this data only for lawful purposes \nand that, under no circumstances will you use this data to: (a) allow, \nenable, or otherwise support the transmission by e-mail, telephone, or \nfacsimile of mass unsolicited, commercial advertising or solicitations \nto entities other than the data recipient's own existing customers; or \n(b) enable high volume, automated, electronic processes that send \nqueries or data to the systems of Registry Operator, a Registrar, or \nAfilias except as reasonably necessary to register domain names or \nmodify existing registrations. All rights reserved. Public Interest Registry reserves \nthe right to modify these terms at any time. By submitting this query, \nyou agree to abide by this policy. \n\nDomain ID:D160909486-LROR\nDomain Name:ANONNEWS.ORG\nCreated On:12-Dec-2010 20:31:54 UTC\nLast Updated On:16-Nov-2013 12:22:49 UTC\nExpiration Date:12-Dec-2014 20:31:54 UTC\nSponsoring Registrar:Internet.bs Corp. (R1601-LROR)\nStatus:CLIENT TRANSFER PROHIBITED\nStatus:RENEWPERIOD\nRegistrant ID:INTE381xro4k9z0m\nRegistrant Name:Domain Administrator\nRegistrant Organization:Fundacion Private Whois\nRegistrant Street1:Attn: anonnews.org\nRegistrant Street2:Aptds. 0850-00056\nRegistrant Street3:\nRegistrant City:Panama\nRegistrant State/Province:\nRegistrant Postal Code:Zona 15\nRegistrant Country:PA\nRegistrant Phone:+507.65995877\nRegistrant Phone Ext.:\nRegistrant FAX:\nRegistrant FAX Ext.:\nRegistrant Email:52300fa6c2nzfacc@5225b4d0pi3627q9.privatewhois.net\nAdmin ID:INTErkiewm5586ze\nAdmin Name:Domain Administrator\nAdmin Organization:Fundacion Private Whois\nAdmin Street1:Attn: anonnews.org\nAdmin Street2:Aptds. 0850-00056\nAdmin Street3:\nAdmin City:Panama\nAdmin State/Province:\nAdmin Postal Code:Zona 15\nAdmin Country:PA\nAdmin Phone:+507.65995877\nAdmin Phone Ext.:\nAdmin FAX:\nAdmin FAX Ext.:\nAdmin Email:52300fa7x2yb6oe6@5225b4d0pi3627q9.privatewhois.net\nTech ID:INTEl92g5h18b12w\nTech Name:Domain Administrator\nTech Organization:Fundacion Private Whois\nTech Street1:Attn: anonnews.org\nTech Street2:Aptds. 0850-00056\nTech Street3:\nTech City:Panama\nTech State/Province:\nTech Postal Code:Zona 15\nTech Country:PA\nTech Phone:+507.65995877\nTech Phone Ext.:\nTech FAX:\nTech FAX Ext.:\nTech Email:52300fa6vwq931xf@5225b4d0pi3627q9.privatewhois.net\nName Server:LISA.NS.CLOUDFLARE.COM\nName Server:ED.NS.CLOUDFLARE.COM\nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nDNSSEC:Unsigned\n\n\n\n"], "registrar": ["Internet.bs Corp. (R1601-LROR)"], "creation_date": ["2010-12-12T20:31:54", "2010-12-12T20:31:54"], "id": ["D160909486-LROR"]}
\ No newline at end of file
diff --git a/test/target_default/aol.com b/test/target_default/aol.com
index 9e7b4eb..2ca0975 100644
--- a/test/target_default/aol.com
+++ b/test/target_default/aol.com
@@ -1 +1 @@
-{"status": ["clientTransferProhibited", "serverDeleteProhibited", "serverTransferProhibited", "serverUpdateProhibited"], "updated_date": ["2013-09-24T00:00:00", "2013-11-23T14:39:22"], "contacts": {"admin": {"city": "Dulles", "name": "Domain Admin", "phone": "+1.7032654670", "state": "VA", "street": "AOL Inc.\n22000 AOL Way", "country": "UNITED STATES", "postalcode": "20166", "email": "domain-adm@corp.aol.com"}, "tech": {"city": "Dulles", "name": "Domain Admin", "phone": "+1.7032654670", "state": "VA", "street": "AOL Inc.\n22000 AOL Way", "country": "UNITED STATES", "postalcode": "20166", "email": "domain-adm@corp.aol.com"}, "registrant": {"city": "Dulles", "name": "AOL Inc.", "state": "VA", "street": "22000 AOL Way", "country": "UNITED STATES", "postalcode": "20166"}, "billing": null}, "expiration_date": ["2014-11-23T00:00:00"], "id": null, "creation_date": ["1995-06-22T00:00:00"], "raw": ["\nDomain Name.......... aol.com\n Creation Date........ 1995-06-22\n Registration Date.... 2009-10-03\n Expiry Date.......... 2014-11-24\n Organisation Name.... AOL Inc.\n Organisation Address. 22000 AOL Way\n Organisation Address. \n Organisation Address. \n Organisation Address. Dulles\n Organisation Address. 20166\n Organisation Address. VA\n Organisation Address. UNITED STATES\n\nAdmin Name........... Domain Admin\n Admin Address........ AOL Inc.\n Admin Address........ 22000 AOL Way\n Admin Address........ \n Admin Address. Dulles\n Admin Address........ 20166\n Admin Address........ VA\n Admin Address........ UNITED STATES\n Admin Email.......... domain-adm@corp.aol.com\n Admin Phone.......... +1.7032654670\n Admin Fax............ \n\nTech Name............ Domain Admin\n Tech Address......... AOL Inc.\n Tech Address......... 22000 AOL Way\n Tech Address......... \n Tech Address......... Dulles\n Tech Address......... 20166\n Tech Address......... VA\n Tech Address......... UNITED STATES\n Tech Email........... domain-adm@corp.aol.com\n Tech Phone........... +1.7032654670\n Tech Fax............. \n Name Server.......... DNS-02.NS.AOL.COM\n Name Server.......... DNS-01.NS.AOL.COM\n Name Server.......... DNS-07.NS.AOL.COM\n Name Server.......... DNS-06.NS.AOL.COM\n\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Server Name: AOL.COM.ZZZZZ.GET.LAID.AT.WWW.SWINGINGCOMMUNITY.COM\n IP Address: 69.41.185.197\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: AOL.COM.MORE.INFO.AT.WWW.BEYONDWHOIS.COM\n IP Address: 203.36.226.2\n Registrar: INSTRA CORPORATION PTY, LTD.\n Whois Server: whois.instra.net\n Referral URL: http://www.instra.com\n\n Server Name: AOL.COM.IS.N0T.AS.1337.AS.GULLI.COM\n IP Address: 80.190.192.24\n Registrar: CORE INTERNET COUNCIL OF REGISTRARS\n Whois Server: whois.corenic.net\n Referral URL: http://www.corenic.net\n\n Server Name: AOL.COM.IS.0WNED.BY.SUB7.NET\n IP Address: 216.78.25.45\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: AOL.COM.BR\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: AOL.COM.AINT.GOT.AS.MUCH.FREE.PORN.AS.SECZ.COM\n IP Address: 209.187.114.133\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Domain Name: AOL.COM\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n Name Server: DNS-01.NS.AOL.COM\n Name Server: DNS-02.NS.AOL.COM\n Name Server: DNS-06.NS.AOL.COM\n Name Server: DNS-07.NS.AOL.COM\n Status: clientTransferProhibited\n Status: serverDeleteProhibited\n Status: serverTransferProhibited\n Status: serverUpdateProhibited\n Updated Date: 24-sep-2013\n Creation Date: 22-jun-1995\n Expiration Date: 23-nov-2014\n\n>>> Last update of whois database: Sat, 23 Nov 2013 14:39:22 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.tucows.com", "whois.instra.net", "whois.corenic.net", "whois.tucows.com", "whois.enom.com", "whois.tucows.com", "whois.melbourneit.com"], "registrar": ["TUCOWS DOMAINS INC.", "INSTRA CORPORATION PTY, LTD.", "CORE INTERNET COUNCIL OF REGISTRARS", "ENOM, INC.", "MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE"], "name_servers": ["DNS-02.NS.AOL.COM", "DNS-01.NS.AOL.COM", "DNS-07.NS.AOL.COM", "DNS-06.NS.AOL.COM"], "emails": []}
\ No newline at end of file
+{"status": ["clientTransferProhibited", "serverDeleteProhibited", "serverTransferProhibited", "serverUpdateProhibited"], "updated_date": ["2013-09-24T00:00:00", "2013-11-23T14:39:22"], "contacts": {"admin": {"city": "Dulles", "name": "Domain Admin", "phone": "+1.7032654670", "state": "VA", "street": "AOL Inc.\n22000 AOL Way", "country": "UNITED STATES", "postalcode": "20166", "email": "domain-adm@corp.aol.com"}, "tech": {"city": "Dulles", "name": "Domain Admin", "phone": "+1.7032654670", "state": "VA", "street": "AOL Inc.\n22000 AOL Way", "country": "UNITED STATES", "postalcode": "20166", "email": "domain-adm@corp.aol.com"}, "registrant": {"city": "Dulles", "name": "AOL Inc.", "state": "VA", "street": "22000 AOL Way", "country": "UNITED STATES", "postalcode": "20166"}, "billing": null}, "nameservers": ["DNS-02.NS.AOL.COM", "DNS-01.NS.AOL.COM", "DNS-07.NS.AOL.COM", "DNS-06.NS.AOL.COM"], "expiration_date": ["2014-11-23T00:00:00"], "creation_date": ["1995-06-22T00:00:00"], "raw": ["\nDomain Name.......... aol.com\n Creation Date........ 1995-06-22\n Registration Date.... 2009-10-03\n Expiry Date.......... 2014-11-24\n Organisation Name.... AOL Inc.\n Organisation Address. 22000 AOL Way\n Organisation Address. \n Organisation Address. \n Organisation Address. Dulles\n Organisation Address. 20166\n Organisation Address. VA\n Organisation Address. UNITED STATES\n\nAdmin Name........... Domain Admin\n Admin Address........ AOL Inc.\n Admin Address........ 22000 AOL Way\n Admin Address........ \n Admin Address. Dulles\n Admin Address........ 20166\n Admin Address........ VA\n Admin Address........ UNITED STATES\n Admin Email.......... domain-adm@corp.aol.com\n Admin Phone.......... +1.7032654670\n Admin Fax............ \n\nTech Name............ Domain Admin\n Tech Address......... AOL Inc.\n Tech Address......... 22000 AOL Way\n Tech Address......... \n Tech Address......... Dulles\n Tech Address......... 20166\n Tech Address......... VA\n Tech Address......... UNITED STATES\n Tech Email........... domain-adm@corp.aol.com\n Tech Phone........... +1.7032654670\n Tech Fax............. \n Name Server.......... DNS-02.NS.AOL.COM\n Name Server.......... DNS-01.NS.AOL.COM\n Name Server.......... DNS-07.NS.AOL.COM\n Name Server.......... DNS-06.NS.AOL.COM\n\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Server Name: AOL.COM.ZZZZZ.GET.LAID.AT.WWW.SWINGINGCOMMUNITY.COM\n IP Address: 69.41.185.197\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: AOL.COM.MORE.INFO.AT.WWW.BEYONDWHOIS.COM\n IP Address: 203.36.226.2\n Registrar: INSTRA CORPORATION PTY, LTD.\n Whois Server: whois.instra.net\n Referral URL: http://www.instra.com\n\n Server Name: AOL.COM.IS.N0T.AS.1337.AS.GULLI.COM\n IP Address: 80.190.192.24\n Registrar: CORE INTERNET COUNCIL OF REGISTRARS\n Whois Server: whois.corenic.net\n Referral URL: http://www.corenic.net\n\n Server Name: AOL.COM.IS.0WNED.BY.SUB7.NET\n IP Address: 216.78.25.45\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: AOL.COM.BR\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: AOL.COM.AINT.GOT.AS.MUCH.FREE.PORN.AS.SECZ.COM\n IP Address: 209.187.114.133\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Domain Name: AOL.COM\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n Name Server: DNS-01.NS.AOL.COM\n Name Server: DNS-02.NS.AOL.COM\n Name Server: DNS-06.NS.AOL.COM\n Name Server: DNS-07.NS.AOL.COM\n Status: clientTransferProhibited\n Status: serverDeleteProhibited\n Status: serverTransferProhibited\n Status: serverUpdateProhibited\n Updated Date: 24-sep-2013\n Creation Date: 22-jun-1995\n Expiration Date: 23-nov-2014\n\n>>> Last update of whois database: Sat, 23 Nov 2013 14:39:22 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.tucows.com", "whois.instra.net", "whois.corenic.net", "whois.tucows.com", "whois.enom.com", "whois.tucows.com", "whois.melbourneit.com"], "registrar": ["TUCOWS DOMAINS INC.", "INSTRA CORPORATION PTY, LTD.", "CORE INTERNET COUNCIL OF REGISTRARS", "ENOM, INC.", "MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE"]}
\ No newline at end of file
diff --git a/test/target_default/aridns.net.au b/test/target_default/aridns.net.au
index 16ed28a..7c7be6d 100644
--- a/test/target_default/aridns.net.au
+++ b/test/target_default/aridns.net.au
@@ -1 +1 @@
-{"status": ["serverDeleteProhibited (Protected by .auLOCKDOWN)", "serverUpdateProhibited (Protected by .auLOCKDOWN)"], "updated_date": ["2013-07-12T08:26:40"], "contacts": {"admin": null, "tech": {"handle": "83053T1868269", "name": "Domain Administrator"}, "registrant": {"organization": "AusRegistry International Pty. Ltd.", "handle": "83052O1868269", "name": "Domain Administrator"}, "billing": null}, "expiration_date": null, "emails": null, "raw": ["Domain Name: aridns.net.au\nLast Modified: 12-Jul-2013 08:26:40 UTC\nRegistrar ID: Melbourne IT\nRegistrar Name: Melbourne IT\nStatus: serverDeleteProhibited (Protected by .auLOCKDOWN)\nStatus: serverUpdateProhibited (Protected by .auLOCKDOWN)\n\nRegistrant: AusRegistry International Pty. Ltd.\nRegistrant ID: ABN 16103729620\nEligibility Type: Company\n\nRegistrant Contact ID: 83052O1868269\nRegistrant Contact Name: Domain Administrator\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: 83053T1868269\nTech Contact Name: Domain Administrator\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: ari.alpha.aridns.net.au\nName Server IP: 2001:dcd:1:0:0:0:0:2\nName Server IP: 37.209.192.2\nName Server: ari.beta.aridns.net.au\nName Server IP: 2001:dcd:2:0:0:0:0:2\nName Server IP: 37.209.194.2\nName Server: ari.gamma.aridns.net.au\nName Server IP: 2001:dcd:3:0:0:0:0:2\nName Server IP: 37.209.196.2\nName Server: ari.delta.aridns.net.au\nName Server IP: 2001:dcd:4:0:0:0:0:2\nName Server IP: 37.209.198.2\n\n"], "whois_server": null, "registrar": ["Melbourne IT"], "name_servers": ["ari.alpha.aridns.net.au", "ari.beta.aridns.net.au", "ari.gamma.aridns.net.au", "ari.delta.aridns.net.au"], "creation_date": null, "id": null}
\ No newline at end of file
+{"status": ["serverDeleteProhibited (Protected by .auLOCKDOWN)", "serverUpdateProhibited (Protected by .auLOCKDOWN)"], "updated_date": ["2013-07-12T08:26:40"], "contacts": {"admin": null, "tech": {"handle": "83053T1868269", "name": "Domain Administrator"}, "registrant": {"organization": "AusRegistry International Pty. Ltd.", "handle": "83052O1868269", "name": "Domain Administrator"}, "billing": null}, "nameservers": ["ari.alpha.aridns.net.au", "ari.beta.aridns.net.au", "ari.gamma.aridns.net.au", "ari.delta.aridns.net.au"], "raw": ["Domain Name: aridns.net.au\nLast Modified: 12-Jul-2013 08:26:40 UTC\nRegistrar ID: Melbourne IT\nRegistrar Name: Melbourne IT\nStatus: serverDeleteProhibited (Protected by .auLOCKDOWN)\nStatus: serverUpdateProhibited (Protected by .auLOCKDOWN)\n\nRegistrant: AusRegistry International Pty. Ltd.\nRegistrant ID: ABN 16103729620\nEligibility Type: Company\n\nRegistrant Contact ID: 83052O1868269\nRegistrant Contact Name: Domain Administrator\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: 83053T1868269\nTech Contact Name: Domain Administrator\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: ari.alpha.aridns.net.au\nName Server IP: 2001:dcd:1:0:0:0:0:2\nName Server IP: 37.209.192.2\nName Server: ari.beta.aridns.net.au\nName Server IP: 2001:dcd:2:0:0:0:0:2\nName Server IP: 37.209.194.2\nName Server: ari.gamma.aridns.net.au\nName Server IP: 2001:dcd:3:0:0:0:0:2\nName Server IP: 37.209.196.2\nName Server: ari.delta.aridns.net.au\nName Server IP: 2001:dcd:4:0:0:0:0:2\nName Server IP: 37.209.198.2\n\n"], "registrar": ["Melbourne IT"]}
\ No newline at end of file
diff --git a/test/target_default/atheme.org b/test/target_default/atheme.org
index cb43e42..4d07e45 100644
--- a/test/target_default/atheme.org
+++ b/test/target_default/atheme.org
@@ -1 +1 @@
-{"status": ["OK"], "updated_date": ["2013-06-20T04:41:04"], "contacts": {"admin": {"city": "Tulsa", "handle": "WP684-GANDI", "name": "William Pitcock", "state": "OK", "phone": "+1.9188949052", "street": "217 E Zion St", "country": "US", "postalcode": "74106", "email": "f4256b942aa5a0a7e65f2a91e62e95c2-1580801@contact.gandi.net"}, "tech": {"city": "Tulsa", "handle": "WP684-GANDI", "name": "William Pitcock", "state": "OK", "phone": "+1.9188949052", "street": "217 E Zion St", "country": "US", "postalcode": "74106", "email": "f4256b942aa5a0a7e65f2a91e62e95c2-1580801@contact.gandi.net"}, "registrant": {"city": "Tulsa", "handle": "0-1280133-GANDI", "name": "William Pitcock", "phone": "+1.9188949052", "street": "217 E Zion St", "country": "US", "postalcode": "74106", "organization": "atheme.org", "email": "e370de2cae0d52f8b0c6da942578cef1-815986@contact.gandi.net"}, "billing": null}, "expiration_date": ["2014-06-19T22:15:59"], "emails": [], "raw": ["Access to .ORG WHOIS information is provided to assist persons in \ndetermining the contents of a domain name registration record in the \nPublic Interest Registry registry database. The data in this record is provided by \nPublic Interest Registry for informational purposes only, and Public Interest Registry does not \nguarantee its accuracy. This service is intended only for query-based \naccess. You agree that you will use this data only for lawful purposes \nand that, under no circumstances will you use this data to: (a) allow, \nenable, or otherwise support the transmission by e-mail, telephone, or \nfacsimile of mass unsolicited, commercial advertising or solicitations \nto entities other than the data recipient's own existing customers; or \n(b) enable high volume, automated, electronic processes that send \nqueries or data to the systems of Registry Operator, a Registrar, or \nAfilias except as reasonably necessary to register domain names or \nmodify existing registrations. All rights reserved. Public Interest Registry reserves \nthe right to modify these terms at any time. By submitting this query, \nyou agree to abide by this policy. \n\nDomain ID:D106661323-LROR\nDomain Name:ATHEME.ORG\nCreated On:19-Jun-2005 22:15:59 UTC\nLast Updated On:20-Jun-2013 04:41:04 UTC\nExpiration Date:19-Jun-2014 22:15:59 UTC\nSponsoring Registrar:Gandi SAS (R42-LROR)\nStatus:OK\nRegistrant ID:0-1280133-GANDI\nRegistrant Name:William Pitcock\nRegistrant Organization:atheme.org\nRegistrant Street1:217 E Zion St\nRegistrant Street2:\nRegistrant Street3:\nRegistrant City:Tulsa\nRegistrant State/Province:\nRegistrant Postal Code:74106\nRegistrant Country:US\nRegistrant Phone:+1.9188949052\nRegistrant Phone Ext.:\nRegistrant FAX:\nRegistrant FAX Ext.:\nRegistrant Email:e370de2cae0d52f8b0c6da942578cef1-815986@contact.gandi.net\nAdmin ID:WP684-GANDI\nAdmin Name:William Pitcock\nAdmin Street1:217 E Zion St\nAdmin Street2:\nAdmin Street3:\nAdmin City:Tulsa\nAdmin State/Province:OK\nAdmin Postal Code:74106\nAdmin Country:US\nAdmin Phone:+1.9188949052\nAdmin Phone Ext.:\nAdmin FAX:\nAdmin FAX Ext.:\nAdmin Email:f4256b942aa5a0a7e65f2a91e62e95c2-1580801@contact.gandi.net\nTech ID:WP684-GANDI\nTech Name:William Pitcock\nTech Street1:217 E Zion St\nTech Street2:\nTech Street3:\nTech City:Tulsa\nTech State/Province:OK\nTech Postal Code:74106\nTech Country:US\nTech Phone:+1.9188949052\nTech Phone Ext.:\nTech FAX:\nTech FAX Ext.:\nTech Email:f4256b942aa5a0a7e65f2a91e62e95c2-1580801@contact.gandi.net\nName Server:C.DNS.GANDI.NET\nName Server:B.DNS.GANDI.NET\nName Server:A.DNS.GANDI.NET\nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nDNSSEC:Unsigned\n\n\n"], "whois_server": null, "registrar": ["Gandi SAS (R42-LROR)"], "name_servers": ["C.DNS.GANDI.NET", "B.DNS.GANDI.NET", "A.DNS.GANDI.NET"], "creation_date": ["2005-06-19T22:15:59", "2005-06-19T22:15:59"], "id": ["D106661323-LROR"]}
\ No newline at end of file
+{"status": ["OK"], "updated_date": ["2013-06-20T04:41:04"], "contacts": {"admin": {"city": "Tulsa", "handle": "WP684-GANDI", "name": "William Pitcock", "state": "OK", "phone": "+1.9188949052", "street": "217 E Zion St", "country": "US", "postalcode": "74106", "email": "f4256b942aa5a0a7e65f2a91e62e95c2-1580801@contact.gandi.net"}, "tech": {"city": "Tulsa", "handle": "WP684-GANDI", "name": "William Pitcock", "state": "OK", "phone": "+1.9188949052", "street": "217 E Zion St", "country": "US", "postalcode": "74106", "email": "f4256b942aa5a0a7e65f2a91e62e95c2-1580801@contact.gandi.net"}, "registrant": {"city": "Tulsa", "handle": "0-1280133-GANDI", "name": "William Pitcock", "phone": "+1.9188949052", "street": "217 E Zion St", "country": "US", "postalcode": "74106", "organization": "atheme.org", "email": "e370de2cae0d52f8b0c6da942578cef1-815986@contact.gandi.net"}, "billing": null}, "nameservers": ["C.DNS.GANDI.NET", "B.DNS.GANDI.NET", "A.DNS.GANDI.NET"], "expiration_date": ["2014-06-19T22:15:59"], "raw": ["Access to .ORG WHOIS information is provided to assist persons in \ndetermining the contents of a domain name registration record in the \nPublic Interest Registry registry database. The data in this record is provided by \nPublic Interest Registry for informational purposes only, and Public Interest Registry does not \nguarantee its accuracy. This service is intended only for query-based \naccess. You agree that you will use this data only for lawful purposes \nand that, under no circumstances will you use this data to: (a) allow, \nenable, or otherwise support the transmission by e-mail, telephone, or \nfacsimile of mass unsolicited, commercial advertising or solicitations \nto entities other than the data recipient's own existing customers; or \n(b) enable high volume, automated, electronic processes that send \nqueries or data to the systems of Registry Operator, a Registrar, or \nAfilias except as reasonably necessary to register domain names or \nmodify existing registrations. All rights reserved. Public Interest Registry reserves \nthe right to modify these terms at any time. By submitting this query, \nyou agree to abide by this policy. \n\nDomain ID:D106661323-LROR\nDomain Name:ATHEME.ORG\nCreated On:19-Jun-2005 22:15:59 UTC\nLast Updated On:20-Jun-2013 04:41:04 UTC\nExpiration Date:19-Jun-2014 22:15:59 UTC\nSponsoring Registrar:Gandi SAS (R42-LROR)\nStatus:OK\nRegistrant ID:0-1280133-GANDI\nRegistrant Name:William Pitcock\nRegistrant Organization:atheme.org\nRegistrant Street1:217 E Zion St\nRegistrant Street2:\nRegistrant Street3:\nRegistrant City:Tulsa\nRegistrant State/Province:\nRegistrant Postal Code:74106\nRegistrant Country:US\nRegistrant Phone:+1.9188949052\nRegistrant Phone Ext.:\nRegistrant FAX:\nRegistrant FAX Ext.:\nRegistrant Email:e370de2cae0d52f8b0c6da942578cef1-815986@contact.gandi.net\nAdmin ID:WP684-GANDI\nAdmin Name:William Pitcock\nAdmin Street1:217 E Zion St\nAdmin Street2:\nAdmin Street3:\nAdmin City:Tulsa\nAdmin State/Province:OK\nAdmin Postal Code:74106\nAdmin Country:US\nAdmin Phone:+1.9188949052\nAdmin Phone Ext.:\nAdmin FAX:\nAdmin FAX Ext.:\nAdmin Email:f4256b942aa5a0a7e65f2a91e62e95c2-1580801@contact.gandi.net\nTech ID:WP684-GANDI\nTech Name:William Pitcock\nTech Street1:217 E Zion St\nTech Street2:\nTech Street3:\nTech City:Tulsa\nTech State/Province:OK\nTech Postal Code:74106\nTech Country:US\nTech Phone:+1.9188949052\nTech Phone Ext.:\nTech FAX:\nTech FAX Ext.:\nTech Email:f4256b942aa5a0a7e65f2a91e62e95c2-1580801@contact.gandi.net\nName Server:C.DNS.GANDI.NET\nName Server:B.DNS.GANDI.NET\nName Server:A.DNS.GANDI.NET\nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nDNSSEC:Unsigned\n\n\n"], "registrar": ["Gandi SAS (R42-LROR)"], "creation_date": ["2005-06-19T22:15:59", "2005-06-19T22:15:59"], "id": ["D106661323-LROR"]}
\ No newline at end of file
diff --git a/test/target_default/australia.gov.au b/test/target_default/australia.gov.au
index 9df9a3e..72bb573 100644
--- a/test/target_default/australia.gov.au
+++ b/test/target_default/australia.gov.au
@@ -1 +1 @@
-{"status": ["ok"], "updated_date": ["2013-06-04T02:20:37"], "contacts": {"admin": null, "tech": {"handle": "GOVAU-SUTE1002", "name": "Technical Support"}, "registrant": {"organization": "Department of Finance and Deregulation", "handle": "GOVAU-IVLY1033", "name": "Web Manager"}, "billing": null}, "expiration_date": null, "emails": null, "raw": ["Domain Name: australia.gov.au\nLast Modified: 04-Jun-2013 02:20:37 UTC\nRegistrar ID: Finance\nRegistrar Name: Department of Finance\nStatus: ok\n\nRegistrant: Department of Finance and Deregulation\nEligibility Type: Other\n\nRegistrant Contact ID: GOVAU-IVLY1033\nRegistrant Contact Name: Web Manager\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: GOVAU-SUTE1002\nTech Contact Name: Technical Support\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: dns1.sge.net\nName Server: dns2.sge.net\nName Server: dns3.sge.net\nName Server: dns4.sge.net\n\n"], "whois_server": null, "registrar": ["Department of Finance"], "name_servers": ["dns1.sge.net", "dns2.sge.net", "dns3.sge.net", "dns4.sge.net"], "creation_date": null, "id": null}
\ No newline at end of file
+{"status": ["ok"], "updated_date": ["2013-06-04T02:20:37"], "contacts": {"admin": null, "tech": {"handle": "GOVAU-SUTE1002", "name": "Technical Support"}, "registrant": {"organization": "Department of Finance and Deregulation", "handle": "GOVAU-IVLY1033", "name": "Web Manager"}, "billing": null}, "nameservers": ["dns1.sge.net", "dns2.sge.net", "dns3.sge.net", "dns4.sge.net"], "raw": ["Domain Name: australia.gov.au\nLast Modified: 04-Jun-2013 02:20:37 UTC\nRegistrar ID: Finance\nRegistrar Name: Department of Finance\nStatus: ok\n\nRegistrant: Department of Finance and Deregulation\nEligibility Type: Other\n\nRegistrant Contact ID: GOVAU-IVLY1033\nRegistrant Contact Name: Web Manager\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: GOVAU-SUTE1002\nTech Contact Name: Technical Support\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: dns1.sge.net\nName Server: dns2.sge.net\nName Server: dns3.sge.net\nName Server: dns4.sge.net\n\n"], "registrar": ["Department of Finance"]}
\ No newline at end of file
diff --git a/test/target_default/cryto.net b/test/target_default/cryto.net
index 149b187..35795cf 100644
--- a/test/target_default/cryto.net
+++ b/test/target_default/cryto.net
@@ -1 +1 @@
-{"status": ["clientTransferProhibited"], "updated_date": ["2013-02-11T00:00:00", "2013-11-20T04:12:42"], "contacts": {"admin": {"city": "Dordrecht", "name": "Sven Slootweg", "country": "Netherlands", "phone": "+31.626519955", "street": "Wijnstraat 211", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "tech": {"city": "Dordrecht", "name": "Sven Slootweg", "country": "Netherlands", "phone": "+31.626519955", "street": "Wijnstraat 211", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "registrant": {"city": "Dordrecht", "name": "Sven Slootweg", "country": "Netherlands", "phone": "+31.626519955", "street": "Wijnstraat 211", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "billing": null}, "expiration_date": ["2014-02-14T00:00:00"], "id": null, "creation_date": ["2010-02-14T00:00:00"], "raw": ["Domain cryto.net\n\nDate Registered: 2010-2-14\nExpiry Date: 2014-2-14\n\nDNS1: ns1.he.net\nDNS2: ns2.he.net\nDNS3: ns3.he.net\nDNS4: ns4.he.net\nDNS5: ns5.he.net\n\nRegistrant\n Sven Slootweg\n Email:jamsoftgamedev@gmail.com\n Wijnstraat 211\n 3311BV Dordrecht\n Netherlands\n Tel: +31.626519955\n\nAdministrative Contact\n Sven Slootweg\n Email:jamsoftgamedev@gmail.com\n Wijnstraat 211\n 3311BV Dordrecht\n Netherlands\n Tel: +31.626519955\n\nTechnical Contact\n Sven Slootweg\n Email:jamsoftgamedev@gmail.com\n Wijnstraat 211\n 3311BV Dordrecht\n Netherlands\n Tel: +31.626519955\n\nRegistrar: Internet.bs Corp.\nRegistrar's Website : http://www.internetbs.net/\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: CRYTO.NET\n Registrar: INTERNET.BS CORP.\n Whois Server: whois.internet.bs\n Referral URL: http://www.internet.bs\n Name Server: NS1.HE.NET\n Name Server: NS2.HE.NET\n Name Server: NS3.HE.NET\n Name Server: NS4.HE.NET\n Name Server: NS5.HE.NET\n Status: clientTransferProhibited\n Updated Date: 11-feb-2013\n Creation Date: 14-feb-2010\n Expiration Date: 14-feb-2014\n\n>>> Last update of whois database: Wed, 20 Nov 2013 04:12:42 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.internet.bs"], "registrar": ["Internet.bs Corp."], "name_servers": ["ns1.he.net", "ns2.he.net", "ns3.he.net", "ns4.he.net", "ns5.he.net"], "emails": []}
\ No newline at end of file
+{"status": ["clientTransferProhibited"], "updated_date": ["2013-02-11T00:00:00", "2013-11-20T04:12:42"], "contacts": {"admin": {"city": "Dordrecht", "name": "Sven Slootweg", "country": "Netherlands", "phone": "+31.626519955", "street": "Wijnstraat 211", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "tech": {"city": "Dordrecht", "name": "Sven Slootweg", "country": "Netherlands", "phone": "+31.626519955", "street": "Wijnstraat 211", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "registrant": {"city": "Dordrecht", "name": "Sven Slootweg", "country": "Netherlands", "phone": "+31.626519955", "street": "Wijnstraat 211", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "billing": null}, "nameservers": ["ns1.he.net", "ns2.he.net", "ns3.he.net", "ns4.he.net", "ns5.he.net"], "expiration_date": ["2014-02-14T00:00:00"], "creation_date": ["2010-02-14T00:00:00"], "raw": ["Domain cryto.net\n\nDate Registered: 2010-2-14\nExpiry Date: 2014-2-14\n\nDNS1: ns1.he.net\nDNS2: ns2.he.net\nDNS3: ns3.he.net\nDNS4: ns4.he.net\nDNS5: ns5.he.net\n\nRegistrant\n Sven Slootweg\n Email:jamsoftgamedev@gmail.com\n Wijnstraat 211\n 3311BV Dordrecht\n Netherlands\n Tel: +31.626519955\n\nAdministrative Contact\n Sven Slootweg\n Email:jamsoftgamedev@gmail.com\n Wijnstraat 211\n 3311BV Dordrecht\n Netherlands\n Tel: +31.626519955\n\nTechnical Contact\n Sven Slootweg\n Email:jamsoftgamedev@gmail.com\n Wijnstraat 211\n 3311BV Dordrecht\n Netherlands\n Tel: +31.626519955\n\nRegistrar: Internet.bs Corp.\nRegistrar's Website : http://www.internetbs.net/\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: CRYTO.NET\n Registrar: INTERNET.BS CORP.\n Whois Server: whois.internet.bs\n Referral URL: http://www.internet.bs\n Name Server: NS1.HE.NET\n Name Server: NS2.HE.NET\n Name Server: NS3.HE.NET\n Name Server: NS4.HE.NET\n Name Server: NS5.HE.NET\n Status: clientTransferProhibited\n Updated Date: 11-feb-2013\n Creation Date: 14-feb-2010\n Expiration Date: 14-feb-2014\n\n>>> Last update of whois database: Wed, 20 Nov 2013 04:12:42 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.internet.bs"], "registrar": ["Internet.bs Corp."]}
\ No newline at end of file
diff --git a/test/target_default/daemonrage.net b/test/target_default/daemonrage.net
index e5f4d3b..0875634 100644
--- a/test/target_default/daemonrage.net
+++ b/test/target_default/daemonrage.net
@@ -1 +1 @@
-{"status": ["clientTransferProhibited"], "updated_date": ["2013-10-18T00:00:00", "2013-11-21T04:08:18"], "contacts": {"admin": {"city": "LINCOLN", "name": "PAUL WEBSTER", "state": "LINCOLNSHIRE", "phone": "01522718954", "street": "WORLDFORMEE\n257 MONKS ROAD", "country": "GB", "postalcode": "LN25JX", "email": "PAUL.G.WEBSTER@GOOGLEMAIL.COM"}, "tech": {"city": "LINCOLN", "name": "PAUL WEBSTER", "state": "LINCOLNSHIRE", "phone": "01522718954", "street": "WORLDFORMEE\n257 MONKS ROAD", "country": "GB", "postalcode": "LN25JX", "email": "PAUL.G.WEBSTER@GOOGLEMAIL.COM"}, "registrant": {"city": "LINCOLN", "state": "LINCOLNSHIRE", "street": "257 MONKS ROAD", "country": "GB", "postalcode": "LN25JX", "organization": "WORLDFORMEE"}, "billing": null}, "expiration_date": ["2014-10-02T21:37:48"], "id": null, "creation_date": ["2009-10-02T21:37:00"], "raw": ["\nDomain Name: DAEMONRAGE.NET\nCreation Date: 2009-10-02 21:37:00Z\nRegistrar Registration Expiration Date: 2014-10-02 21:37:48Z\nRegistrar: ENOM, INC.\nReseller: NAMECHEAP.COM\nRegistrant Name: \nRegistrant Organization: WORLDFORMEE\nRegistrant Street: 257 MONKS ROAD\nRegistrant City: LINCOLN\nRegistrant State/Province: LINCOLNSHIRE\nRegistrant Postal Code: LN25JX\nRegistrant Country: GB\nAdmin Name: PAUL WEBSTER\nAdmin Organization: \nAdmin Street: WORLDFORMEE\nAdmin Street: 257 MONKS ROAD\nAdmin City: LINCOLN\nAdmin State/Province: LINCOLNSHIRE\nAdmin Postal Code: LN25JX\nAdmin Country: GB\nAdmin Phone: 01522718954\nAdmin Phone Ext: \nAdmin Fax: \nAdmin Fax Ext:\nAdmin Email: PAUL.G.WEBSTER@GOOGLEMAIL.COM\nTech Name: PAUL WEBSTER\nTech Organization: \nTech Street: WORLDFORMEE\nTech Street: 257 MONKS ROAD\nTech City: LINCOLN\nTech State/Province: LINCOLNSHIRE\nTech Postal Code: LN25JX\nTech Country: GB\nTech Phone: 01522718954\nTech Phone Ext: \nTech Fax: \nTech Fax Ext: \nTech Email: PAUL.G.WEBSTER@GOOGLEMAIL.COM\nName Server: NS1.HE.NET\nName Server: NS2.HE.NET\nName Server: NS3.HE.NET\nName Server: NS4.HE.NET\nName Server: NS5.HE.NET\n\nThe data in this whois database is provided to you for information\npurposes only, that is, to assist you in obtaining information about or\nrelated to a domain name registration record. We make this information\navailable \"as is,\" and do not guarantee its accuracy. By submitting a\nwhois query, you agree that you will use this data only for lawful\npurposes and that, under no circumstances will you use this data to: (1)\nenable high volume, automated, electronic processes that stress or load\nthis whois database system providing you this information; or (2) allow,\nenable, or otherwise support the transmission of mass unsolicited,\ncommercial advertising or solicitations via direct mail, electronic\nmail, or by telephone. The compilation, repackaging, dissemination or\nother use of this data is expressly prohibited without prior written\nconsent from us. \n\nWe reserve the right to modify these terms at any time. By submitting \nthis query, you agree to abide by these terms.\nVersion 6.3 4/3/2002\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: DAEMONRAGE.NET\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n Name Server: NS1.HE.NET\n Name Server: NS2.HE.NET\n Name Server: NS3.HE.NET\n Name Server: NS4.HE.NET\n Name Server: NS5.HE.NET\n Status: clientTransferProhibited\n Updated Date: 18-oct-2013\n Creation Date: 02-oct-2009\n Expiration Date: 02-oct-2014\n\n>>> Last update of whois database: Thu, 21 Nov 2013 04:08:18 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.enom.com"], "registrar": ["ENOM, INC."], "name_servers": ["NS1.HE.NET", "NS2.HE.NET", "NS3.HE.NET", "NS4.HE.NET", "NS5.HE.NET"], "emails": []}
\ No newline at end of file
+{"status": ["clientTransferProhibited"], "updated_date": ["2013-10-18T00:00:00", "2013-11-21T04:08:18"], "contacts": {"admin": {"city": "LINCOLN", "name": "PAUL WEBSTER", "state": "LINCOLNSHIRE", "phone": "01522718954", "street": "WORLDFORMEE\n257 MONKS ROAD", "country": "GB", "postalcode": "LN25JX", "email": "PAUL.G.WEBSTER@GOOGLEMAIL.COM"}, "tech": {"city": "LINCOLN", "name": "PAUL WEBSTER", "state": "LINCOLNSHIRE", "phone": "01522718954", "street": "WORLDFORMEE\n257 MONKS ROAD", "country": "GB", "postalcode": "LN25JX", "email": "PAUL.G.WEBSTER@GOOGLEMAIL.COM"}, "registrant": {"city": "LINCOLN", "state": "LINCOLNSHIRE", "street": "257 MONKS ROAD", "country": "GB", "postalcode": "LN25JX", "organization": "WORLDFORMEE"}, "billing": null}, "nameservers": ["NS1.HE.NET", "NS2.HE.NET", "NS3.HE.NET", "NS4.HE.NET", "NS5.HE.NET"], "expiration_date": ["2014-10-02T21:37:48"], "creation_date": ["2009-10-02T21:37:00"], "raw": ["\nDomain Name: DAEMONRAGE.NET\nCreation Date: 2009-10-02 21:37:00Z\nRegistrar Registration Expiration Date: 2014-10-02 21:37:48Z\nRegistrar: ENOM, INC.\nReseller: NAMECHEAP.COM\nRegistrant Name: \nRegistrant Organization: WORLDFORMEE\nRegistrant Street: 257 MONKS ROAD\nRegistrant City: LINCOLN\nRegistrant State/Province: LINCOLNSHIRE\nRegistrant Postal Code: LN25JX\nRegistrant Country: GB\nAdmin Name: PAUL WEBSTER\nAdmin Organization: \nAdmin Street: WORLDFORMEE\nAdmin Street: 257 MONKS ROAD\nAdmin City: LINCOLN\nAdmin State/Province: LINCOLNSHIRE\nAdmin Postal Code: LN25JX\nAdmin Country: GB\nAdmin Phone: 01522718954\nAdmin Phone Ext: \nAdmin Fax: \nAdmin Fax Ext:\nAdmin Email: PAUL.G.WEBSTER@GOOGLEMAIL.COM\nTech Name: PAUL WEBSTER\nTech Organization: \nTech Street: WORLDFORMEE\nTech Street: 257 MONKS ROAD\nTech City: LINCOLN\nTech State/Province: LINCOLNSHIRE\nTech Postal Code: LN25JX\nTech Country: GB\nTech Phone: 01522718954\nTech Phone Ext: \nTech Fax: \nTech Fax Ext: \nTech Email: PAUL.G.WEBSTER@GOOGLEMAIL.COM\nName Server: NS1.HE.NET\nName Server: NS2.HE.NET\nName Server: NS3.HE.NET\nName Server: NS4.HE.NET\nName Server: NS5.HE.NET\n\nThe data in this whois database is provided to you for information\npurposes only, that is, to assist you in obtaining information about or\nrelated to a domain name registration record. We make this information\navailable \"as is,\" and do not guarantee its accuracy. By submitting a\nwhois query, you agree that you will use this data only for lawful\npurposes and that, under no circumstances will you use this data to: (1)\nenable high volume, automated, electronic processes that stress or load\nthis whois database system providing you this information; or (2) allow,\nenable, or otherwise support the transmission of mass unsolicited,\ncommercial advertising or solicitations via direct mail, electronic\nmail, or by telephone. The compilation, repackaging, dissemination or\nother use of this data is expressly prohibited without prior written\nconsent from us. \n\nWe reserve the right to modify these terms at any time. By submitting \nthis query, you agree to abide by these terms.\nVersion 6.3 4/3/2002\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: DAEMONRAGE.NET\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n Name Server: NS1.HE.NET\n Name Server: NS2.HE.NET\n Name Server: NS3.HE.NET\n Name Server: NS4.HE.NET\n Name Server: NS5.HE.NET\n Status: clientTransferProhibited\n Updated Date: 18-oct-2013\n Creation Date: 02-oct-2009\n Expiration Date: 02-oct-2014\n\n>>> Last update of whois database: Thu, 21 Nov 2013 04:08:18 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.enom.com"], "registrar": ["ENOM, INC."]}
\ No newline at end of file
diff --git a/test/target_default/dns4pro.com b/test/target_default/dns4pro.com
index 3495308..8bb12ab 100644
--- a/test/target_default/dns4pro.com
+++ b/test/target_default/dns4pro.com
@@ -1 +1 @@
-{"status": ["clientTransferProhibited"], "updated_date": ["2013-08-12T00:00:00", "2013-11-21T08:54:31"], "contacts": {"admin": {"city": "M\u00fcnchen", "handle": "107329", "name": "Florian Moschner", "country": "DE", "phone": "+49.1781415353", "street": "Walter-Flex-Str. 4", "postalcode": "80637", "email": "florian@moschner.biz"}, "tech": {"city": "Berlin", "fax": "+49 30 66400138", "handle": "1", "name": "Hostmaster Of The Day", "country": "DE", "phone": "+49 30 66400137", "street": "Tempelhofer Damm 140", "postalcode": "12099", "organization": "InterNetworX Ltd. & Co. KG", "email": "hostmaster@inwx.de"}, "registrant": {"city": "M\u00fcnchen", "handle": "107329", "name": "Florian Moschner", "country": "DE", "phone": "+49.1781415353", "street": "Walter-Flex-Str. 4", "postalcode": "80637", "email": "florian@moschner.biz"}, "billing": {"city": "Berlin", "fax": "+49 30 66400138", "handle": "1", "name": "Hostmaster Of The Day", "country": "DE", "phone": "+49 30 66400137", "street": "Tempelhofer Damm 140", "postalcode": "12099", "organization": "InterNetworX Ltd. & Co. KG", "email": "hostmaster@inwx.de"}}, "expiration_date": ["2015-04-06T00:00:00"], "id": null, "creation_date": ["2013-08-12T00:00:00"], "raw": ["; This data is provided by InterNetworX Ltd. & Co. KG\n; for information purposes, and to assist persons obtaining information\n; about or related to domain name registration records.\n; InterNetworX Ltd. & Co. KG does not guarantee its accuracy.\n; By submitting a WHOIS query, you agree that you will use this data\n; only for lawful purposes and that, under no circumstances, you will\n; use this data to\n; 1) allow, enable, or otherwise support the transmission of mass\n; unsolicited, commercial advertising or solicitations via E-mail\n; (spam); or\n; 2) enable high volume, automated, electronic processes that apply\n; to this WHOIS server.\n; These terms may be changed without prior notice.\n; By submitting this query, you agree to abide by this policy.\n\nISP: InterNetworX Ltd. & Co. KG\nURL: www.inwx.de\n\ndomain: dns4pro.com\n\ncreated-date: 2013-08-12\nupdated-date: 2013-08-12\nexpiration-date: 2015-04-06\n\nowner-id: 107329\nowner-name: Florian Moschner\nowner-street: Walter-Flex-Str. 4\nowner-city: M\u00fcnchen\nowner-zip: 80637\nowner-country: DE\nowner-phone: +49.1781415353\nowner-email: florian@moschner.biz\n\nadmin-id: 107329\nadmin-name: Florian Moschner\nadmin-street: Walter-Flex-Str. 4\nadmin-city: M\u00fcnchen\nadmin-zip: 80637\nadmin-country: DE\nadmin-phone: +49.1781415353\nadmin-email: florian@moschner.biz\n\ntech-id: 1\ntech-organization: InterNetworX Ltd. & Co. KG\ntech-name: Hostmaster Of The Day\ntech-street: Tempelhofer Damm 140\ntech-city: Berlin\ntech-zip: 12099\ntech-country: DE\ntech-phone: +49 30 66400137\ntech-fax: +49 30 66400138\ntech-email: hostmaster@inwx.de\n\nbilling-id: 1\nbilling-organization: InterNetworX Ltd. & Co. KG\nbilling-name: Hostmaster Of The Day\nbilling-street: Tempelhofer Damm 140\nbilling-city: Berlin\nbilling-zip: 12099\nbilling-country: DE\nbilling-phone: +49 30 66400137\nbilling-fax: +49 30 66400138\nbilling-email: hostmaster@inwx.de\n\nnameserver: ns1.as199438.net\nnameserver: ns2.as199438.net\n\n; Please register your domains at\n; www.inwx.de\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: DNS4PRO.COM\n Registrar: INTERNETWORX LTD. & CO. KG\n Whois Server: whois.domrobot.com\n Referral URL: http://www.domrobot.com\n Name Server: NS1.AS199438.NET\n Name Server: NS2.AS199438.NET\n Status: clientTransferProhibited\n Updated Date: 12-aug-2013\n Creation Date: 06-apr-2013\n Expiration Date: 06-apr-2015\n\n>>> Last update of whois database: Thu, 21 Nov 2013 08:54:31 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.domrobot.com"], "registrar": ["INTERNETWORX LTD. & CO. KG"], "name_servers": ["ns1.as199438.net", "ns2.as199438.net"], "emails": []}
\ No newline at end of file
+{"status": ["clientTransferProhibited"], "updated_date": ["2013-08-12T00:00:00", "2013-11-21T08:54:31"], "contacts": {"admin": {"city": "M\u00fcnchen", "handle": "107329", "name": "Florian Moschner", "country": "DE", "phone": "+49.1781415353", "street": "Walter-Flex-Str. 4", "postalcode": "80637", "email": "florian@moschner.biz"}, "tech": {"city": "Berlin", "fax": "+49 30 66400138", "handle": "1", "name": "Hostmaster Of The Day", "country": "DE", "phone": "+49 30 66400137", "street": "Tempelhofer Damm 140", "postalcode": "12099", "organization": "InterNetworX Ltd. & Co. KG", "email": "hostmaster@inwx.de"}, "registrant": {"city": "M\u00fcnchen", "handle": "107329", "name": "Florian Moschner", "country": "DE", "phone": "+49.1781415353", "street": "Walter-Flex-Str. 4", "postalcode": "80637", "email": "florian@moschner.biz"}, "billing": {"city": "Berlin", "fax": "+49 30 66400138", "handle": "1", "name": "Hostmaster Of The Day", "country": "DE", "phone": "+49 30 66400137", "street": "Tempelhofer Damm 140", "postalcode": "12099", "organization": "InterNetworX Ltd. & Co. KG", "email": "hostmaster@inwx.de"}}, "nameservers": ["ns1.as199438.net", "ns2.as199438.net"], "expiration_date": ["2015-04-06T00:00:00"], "creation_date": ["2013-08-12T00:00:00"], "raw": ["; This data is provided by InterNetworX Ltd. & Co. KG\n; for information purposes, and to assist persons obtaining information\n; about or related to domain name registration records.\n; InterNetworX Ltd. & Co. KG does not guarantee its accuracy.\n; By submitting a WHOIS query, you agree that you will use this data\n; only for lawful purposes and that, under no circumstances, you will\n; use this data to\n; 1) allow, enable, or otherwise support the transmission of mass\n; unsolicited, commercial advertising or solicitations via E-mail\n; (spam); or\n; 2) enable high volume, automated, electronic processes that apply\n; to this WHOIS server.\n; These terms may be changed without prior notice.\n; By submitting this query, you agree to abide by this policy.\n\nISP: InterNetworX Ltd. & Co. KG\nURL: www.inwx.de\n\ndomain: dns4pro.com\n\ncreated-date: 2013-08-12\nupdated-date: 2013-08-12\nexpiration-date: 2015-04-06\n\nowner-id: 107329\nowner-name: Florian Moschner\nowner-street: Walter-Flex-Str. 4\nowner-city: M\u00fcnchen\nowner-zip: 80637\nowner-country: DE\nowner-phone: +49.1781415353\nowner-email: florian@moschner.biz\n\nadmin-id: 107329\nadmin-name: Florian Moschner\nadmin-street: Walter-Flex-Str. 4\nadmin-city: M\u00fcnchen\nadmin-zip: 80637\nadmin-country: DE\nadmin-phone: +49.1781415353\nadmin-email: florian@moschner.biz\n\ntech-id: 1\ntech-organization: InterNetworX Ltd. & Co. KG\ntech-name: Hostmaster Of The Day\ntech-street: Tempelhofer Damm 140\ntech-city: Berlin\ntech-zip: 12099\ntech-country: DE\ntech-phone: +49 30 66400137\ntech-fax: +49 30 66400138\ntech-email: hostmaster@inwx.de\n\nbilling-id: 1\nbilling-organization: InterNetworX Ltd. & Co. KG\nbilling-name: Hostmaster Of The Day\nbilling-street: Tempelhofer Damm 140\nbilling-city: Berlin\nbilling-zip: 12099\nbilling-country: DE\nbilling-phone: +49 30 66400137\nbilling-fax: +49 30 66400138\nbilling-email: hostmaster@inwx.de\n\nnameserver: ns1.as199438.net\nnameserver: ns2.as199438.net\n\n; Please register your domains at\n; www.inwx.de\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: DNS4PRO.COM\n Registrar: INTERNETWORX LTD. & CO. KG\n Whois Server: whois.domrobot.com\n Referral URL: http://www.domrobot.com\n Name Server: NS1.AS199438.NET\n Name Server: NS2.AS199438.NET\n Status: clientTransferProhibited\n Updated Date: 12-aug-2013\n Creation Date: 06-apr-2013\n Expiration Date: 06-apr-2015\n\n>>> Last update of whois database: Thu, 21 Nov 2013 08:54:31 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.domrobot.com"], "registrar": ["INTERNETWORX LTD. & CO. KG"]}
\ No newline at end of file
diff --git a/test/target_default/donuts.co b/test/target_default/donuts.co
index 4ec7ac3..89deaac 100644
--- a/test/target_default/donuts.co
+++ b/test/target_default/donuts.co
@@ -1 +1 @@
-{"status": ["clientDeleteProhibited", "clientRenewProhibited", "clientTransferProhibited", "clientUpdateProhibited"], "updated_date": ["2013-08-08T21:52:32", "2013-11-20T04:14:46"], "contacts": {"admin": {"city": "Bellevue", "handle": "CR86259720", "name": "Chris Cowherd", "phone": "+1.4252966802", "state": "Washington", "street": "10500 Ne 8th St\nSte 350", "country_code": "US", "country": "United States", "postalcode": "98004", "organization": "Donuts Inc.", "email": "it@donuts.co"}, "tech": {"city": "Bellevue", "handle": "CR86259718", "name": "Chris Cowherd", "phone": "+1.4252966802", "state": "Washington", "street": "10500 Ne 8th St\nSte 350", "country_code": "US", "country": "United States", "postalcode": "98004", "organization": "Donuts Inc.", "email": "it@donuts.co"}, "registrant": {"city": "Bellevue", "handle": "CR86259716", "name": "Chris Cowherd", "phone": "+1.4252966802", "state": "Washington", "street": "10500 Ne 8th St\nSte 350", "country_code": "US", "country": "United States", "postalcode": "98004", "organization": "Donuts Inc.", "email": "it@donuts.co"}, "billing": {"city": "Bellevue", "handle": "CR86259722", "name": "Chris Cowherd", "phone": "+1.4252966802", "state": "Washington", "street": "10500 Ne 8th St\nSte 350", "country_code": "US", "country": "United States", "postalcode": "98004", "organization": "Donuts Inc.", "email": "it@donuts.co"}}, "expiration_date": ["2014-07-19T23:59:59"], "emails": [], "raw": ["Domain Name: DONUTS.CO\nDomain ID: D1142814-CO\nSponsoring Registrar: GODADDY.COM, INC.\nSponsoring Registrar IANA ID: 146\nRegistrar URL (registration services): www.godaddy.com\nDomain Status: clientDeleteProhibited\nDomain Status: clientRenewProhibited\nDomain Status: clientTransferProhibited\nDomain Status: clientUpdateProhibited\nRegistrant ID: CR86259716\nRegistrant Name: Chris Cowherd\nRegistrant Organization: Donuts Inc.\nRegistrant Address1: 10500 Ne 8th St\nRegistrant Address2: Ste 350\nRegistrant City: Bellevue\nRegistrant State/Province: Washington\nRegistrant Postal Code: 98004\nRegistrant Country: United States\nRegistrant Country Code: US\nRegistrant Phone Number: +1.4252966802\nRegistrant Email: it@donuts.co\nAdministrative Contact ID: CR86259720\nAdministrative Contact Name: Chris Cowherd\nAdministrative Contact Organization: Donuts Inc.\nAdministrative Contact Address1: 10500 Ne 8th St\nAdministrative Contact Address2: Ste 350\nAdministrative Contact City: Bellevue\nAdministrative Contact State/Province: Washington\nAdministrative Contact Postal Code: 98004\nAdministrative Contact Country: United States\nAdministrative Contact Country Code: US\nAdministrative Contact Phone Number: +1.4252966802\nAdministrative Contact Email: it@donuts.co\nBilling Contact ID: CR86259722\nBilling Contact Name: Chris Cowherd\nBilling Contact Organization: Donuts Inc.\nBilling Contact Address1: 10500 Ne 8th St\nBilling Contact Address2: Ste 350\nBilling Contact City: Bellevue\nBilling Contact State/Province: Washington\nBilling Contact Postal Code: 98004\nBilling Contact Country: United States\nBilling Contact Country Code: US\nBilling Contact Phone Number: +1.4252966802\nBilling Contact Email: it@donuts.co\nTechnical Contact ID: CR86259718\nTechnical Contact Name: Chris Cowherd\nTechnical Contact Organization: Donuts Inc.\nTechnical Contact Address1: 10500 Ne 8th St\nTechnical Contact Address2: Ste 350\nTechnical Contact City: Bellevue\nTechnical Contact State/Province: Washington\nTechnical Contact Postal Code: 98004\nTechnical Contact Country: United States\nTechnical Contact Country Code: US\nTechnical Contact Phone Number: +1.4252966802\nTechnical Contact Email: it@donuts.co\nName Server: NS1.DREAMHOST.COM\nName Server: NS2.DREAMHOST.COM\nName Server: NS3.DREAMHOST.COM\nCreated by Registrar: INTERNETX GMBH\nLast Updated by Registrar: GODADDY.COM, INC.\nLast Transferred Date: Sun Jan 30 16:35:56 GMT 2011\nDomain Registration Date: Tue Jul 20 18:01:35 GMT 2010\nDomain Expiration Date: Sat Jul 19 23:59:59 GMT 2014\nDomain Last Updated Date: Thu Aug 08 21:52:32 GMT 2013\n\n>>>> Whois database was last updated on: Wed Nov 20 04:14:46 GMT 2013 <<<<\n.CO Internet, S.A.S., the Administrator for .CO, has collected this\ninformation for the WHOIS database through Accredited Registrars. \nThis information is provided to you for informational purposes only \nand is designed to assist persons in determining contents of a domain \nname registration record in the .CO Internet registry database. .CO \nInternet makes this information available to you \"as is\" and does not \nguarantee its accuracy.\n \nBy submitting a WHOIS query, you agree that you will use this data \nonly for lawful purposes and that, under no circumstances will you \nuse this data: (1) to allow, enable, or otherwise support the transmission \nof mass unsolicited, commercial advertising or solicitations via direct \nmail, electronic mail, or by telephone; (2) in contravention of any \napplicable data and privacy protection laws; or (3) to enable high volume, \nautomated, electronic processes that apply to the registry (or its systems). \nCompilation, repackaging, dissemination, or other use of the WHOIS \ndatabase in its entirety, or of a substantial portion thereof, is not allowed \nwithout .CO Internet's prior written permission. .CO Internet reserves the \nright to modify or change these conditions at any time without prior or \nsubsequent notification of any kind. By executing this query, in any manner \nwhatsoever, you agree to abide by these terms. In some limited cases, \ndomains that might appear as available in whois might not actually be \navailable as they could be already registered and the whois not yet updated \nand/or they could be part of the Restricted list. In this cases, performing a \ncheck through your Registrar's (EPP check) will give you the actual status \nof the domain. Additionally, domains currently or previously used as \nextensions in 3rd level domains will not be available for registration in the \n2nd level. For example, org.co,mil.co,edu.co,com.co,net.co,nom.co,arts.co,\nfirm.co,info.co,int.co,web.co,rec.co,co.co. \n \nNOTE: FAILURE TO LOCATE A RECORD IN THE WHOIS DATABASE IS NOT \nINDICATIVE OF THE AVAILABILITY OF A DOMAIN NAME. \n \nAll domain names are subject to certain additional domain name registration \nrules. For details, please visit our site at www.cointernet.co .\n\n"], "whois_server": null, "registrar": ["GODADDY.COM, INC.", "INTERNETX GMBH"], "name_servers": ["NS1.DREAMHOST.COM", "NS2.DREAMHOST.COM", "NS3.DREAMHOST.COM"], "creation_date": ["2010-07-20T18:01:35", "2010-07-20T18:01:35"], "id": ["D1142814-CO"]}
\ No newline at end of file
+{"status": ["clientDeleteProhibited", "clientRenewProhibited", "clientTransferProhibited", "clientUpdateProhibited"], "updated_date": ["2013-08-08T21:52:32", "2013-11-20T04:14:46"], "contacts": {"admin": {"city": "Bellevue", "handle": "CR86259720", "name": "Chris Cowherd", "phone": "+1.4252966802", "state": "Washington", "street": "10500 Ne 8th St\nSte 350", "country_code": "US", "country": "United States", "postalcode": "98004", "organization": "Donuts Inc.", "email": "it@donuts.co"}, "tech": {"city": "Bellevue", "handle": "CR86259718", "name": "Chris Cowherd", "phone": "+1.4252966802", "state": "Washington", "street": "10500 Ne 8th St\nSte 350", "country_code": "US", "country": "United States", "postalcode": "98004", "organization": "Donuts Inc.", "email": "it@donuts.co"}, "registrant": {"city": "Bellevue", "handle": "CR86259716", "name": "Chris Cowherd", "phone": "+1.4252966802", "state": "Washington", "street": "10500 Ne 8th St\nSte 350", "country_code": "US", "country": "United States", "postalcode": "98004", "organization": "Donuts Inc.", "email": "it@donuts.co"}, "billing": {"city": "Bellevue", "handle": "CR86259722", "name": "Chris Cowherd", "phone": "+1.4252966802", "state": "Washington", "street": "10500 Ne 8th St\nSte 350", "country_code": "US", "country": "United States", "postalcode": "98004", "organization": "Donuts Inc.", "email": "it@donuts.co"}}, "nameservers": ["NS1.DREAMHOST.COM", "NS2.DREAMHOST.COM", "NS3.DREAMHOST.COM"], "expiration_date": ["2014-07-19T23:59:59"], "raw": ["Domain Name: DONUTS.CO\nDomain ID: D1142814-CO\nSponsoring Registrar: GODADDY.COM, INC.\nSponsoring Registrar IANA ID: 146\nRegistrar URL (registration services): www.godaddy.com\nDomain Status: clientDeleteProhibited\nDomain Status: clientRenewProhibited\nDomain Status: clientTransferProhibited\nDomain Status: clientUpdateProhibited\nRegistrant ID: CR86259716\nRegistrant Name: Chris Cowherd\nRegistrant Organization: Donuts Inc.\nRegistrant Address1: 10500 Ne 8th St\nRegistrant Address2: Ste 350\nRegistrant City: Bellevue\nRegistrant State/Province: Washington\nRegistrant Postal Code: 98004\nRegistrant Country: United States\nRegistrant Country Code: US\nRegistrant Phone Number: +1.4252966802\nRegistrant Email: it@donuts.co\nAdministrative Contact ID: CR86259720\nAdministrative Contact Name: Chris Cowherd\nAdministrative Contact Organization: Donuts Inc.\nAdministrative Contact Address1: 10500 Ne 8th St\nAdministrative Contact Address2: Ste 350\nAdministrative Contact City: Bellevue\nAdministrative Contact State/Province: Washington\nAdministrative Contact Postal Code: 98004\nAdministrative Contact Country: United States\nAdministrative Contact Country Code: US\nAdministrative Contact Phone Number: +1.4252966802\nAdministrative Contact Email: it@donuts.co\nBilling Contact ID: CR86259722\nBilling Contact Name: Chris Cowherd\nBilling Contact Organization: Donuts Inc.\nBilling Contact Address1: 10500 Ne 8th St\nBilling Contact Address2: Ste 350\nBilling Contact City: Bellevue\nBilling Contact State/Province: Washington\nBilling Contact Postal Code: 98004\nBilling Contact Country: United States\nBilling Contact Country Code: US\nBilling Contact Phone Number: +1.4252966802\nBilling Contact Email: it@donuts.co\nTechnical Contact ID: CR86259718\nTechnical Contact Name: Chris Cowherd\nTechnical Contact Organization: Donuts Inc.\nTechnical Contact Address1: 10500 Ne 8th St\nTechnical Contact Address2: Ste 350\nTechnical Contact City: Bellevue\nTechnical Contact State/Province: Washington\nTechnical Contact Postal Code: 98004\nTechnical Contact Country: United States\nTechnical Contact Country Code: US\nTechnical Contact Phone Number: +1.4252966802\nTechnical Contact Email: it@donuts.co\nName Server: NS1.DREAMHOST.COM\nName Server: NS2.DREAMHOST.COM\nName Server: NS3.DREAMHOST.COM\nCreated by Registrar: INTERNETX GMBH\nLast Updated by Registrar: GODADDY.COM, INC.\nLast Transferred Date: Sun Jan 30 16:35:56 GMT 2011\nDomain Registration Date: Tue Jul 20 18:01:35 GMT 2010\nDomain Expiration Date: Sat Jul 19 23:59:59 GMT 2014\nDomain Last Updated Date: Thu Aug 08 21:52:32 GMT 2013\n\n>>>> Whois database was last updated on: Wed Nov 20 04:14:46 GMT 2013 <<<<\n.CO Internet, S.A.S., the Administrator for .CO, has collected this\ninformation for the WHOIS database through Accredited Registrars. \nThis information is provided to you for informational purposes only \nand is designed to assist persons in determining contents of a domain \nname registration record in the .CO Internet registry database. .CO \nInternet makes this information available to you \"as is\" and does not \nguarantee its accuracy.\n \nBy submitting a WHOIS query, you agree that you will use this data \nonly for lawful purposes and that, under no circumstances will you \nuse this data: (1) to allow, enable, or otherwise support the transmission \nof mass unsolicited, commercial advertising or solicitations via direct \nmail, electronic mail, or by telephone; (2) in contravention of any \napplicable data and privacy protection laws; or (3) to enable high volume, \nautomated, electronic processes that apply to the registry (or its systems). \nCompilation, repackaging, dissemination, or other use of the WHOIS \ndatabase in its entirety, or of a substantial portion thereof, is not allowed \nwithout .CO Internet's prior written permission. .CO Internet reserves the \nright to modify or change these conditions at any time without prior or \nsubsequent notification of any kind. By executing this query, in any manner \nwhatsoever, you agree to abide by these terms. In some limited cases, \ndomains that might appear as available in whois might not actually be \navailable as they could be already registered and the whois not yet updated \nand/or they could be part of the Restricted list. In this cases, performing a \ncheck through your Registrar's (EPP check) will give you the actual status \nof the domain. Additionally, domains currently or previously used as \nextensions in 3rd level domains will not be available for registration in the \n2nd level. For example, org.co,mil.co,edu.co,com.co,net.co,nom.co,arts.co,\nfirm.co,info.co,int.co,web.co,rec.co,co.co. \n \nNOTE: FAILURE TO LOCATE A RECORD IN THE WHOIS DATABASE IS NOT \nINDICATIVE OF THE AVAILABILITY OF A DOMAIN NAME. \n \nAll domain names are subject to certain additional domain name registration \nrules. For details, please visit our site at www.cointernet.co .\n\n"], "registrar": ["GODADDY.COM, INC.", "INTERNETX GMBH"], "creation_date": ["2010-07-20T18:01:35", "2010-07-20T18:01:35"], "id": ["D1142814-CO"]}
\ No newline at end of file
diff --git a/test/target_default/edis.at b/test/target_default/edis.at
index b1fa86b..73faa03 100644
--- a/test/target_default/edis.at
+++ b/test/target_default/edis.at
@@ -1 +1 @@
-{"updated_date": ["2011-10-24T14:51:40", "2013-08-09T15:17:35"], "status": null, "contacts": {"admin": {"city": "Graz", "fax": "+43316827500777", "handle": "KG8294627-NICAT", "name": "EDIS GmbH", "country": "Austria", "phone": "+43316827500300", "street": "Hauptplatz 3", "postalcode": "8010", "organization": "Kleewein Gerhard", "email": "domreg@edis.at", "changedate": "2013-08-09T15:17:35"}, "tech": {"city": "Graz", "fax": "+43316827500777", "handle": "KG8294627-NICAT", "name": "EDIS GmbH", "country": "Austria", "phone": "+43316827500300", "street": "Hauptplatz 3", "postalcode": "8010", "organization": "Kleewein Gerhard", "email": "domreg@edis.at", "changedate": "2013-08-09T15:17:35"}, "registrant": {"city": "Graz", "fax": "+43316827500777", "handle": "KG8294626-NICAT", "name": "EDIS GmbH", "country": "Austria", "phone": "+43316827500300", "street": "Widmannstettergasse 3", "postalcode": "8053", "organization": "Kleewein Gerhard", "email": "support@edis.at", "changedate": "2011-10-24T14:51:40"}, "billing": null}, "expiration_date": null, "id": null, "raw": ["% Copyright (c)2013 by NIC.AT (1) \n%\n% Restricted rights.\n%\n% Except for agreed Internet operational purposes, no part of this\n% information may be reproduced, stored in a retrieval system, or\n% transmitted, in any form or by any means, electronic, mechanical,\n% recording, or otherwise, without prior permission of NIC.AT on behalf\n% of itself and/or the copyright holders. Any use of this material to\n% target advertising or similar activities is explicitly forbidden and\n% can be prosecuted.\n%\n% It is furthermore strictly forbidden to use the Whois-Database in such\n% a way that jeopardizes or could jeopardize the stability of the\n% technical systems of NIC.AT under any circumstances. In particular,\n% this includes any misuse of the Whois-Database and any use of the\n% Whois-Database which disturbs its operation.\n%\n% Should the user violate these points, NIC.AT reserves the right to\n% deactivate the Whois-Database entirely or partly for the user.\n% Moreover, the user shall be held liable for any and all damage\n% arising from a violation of these points.\n\ndomain: edis.at\nregistrant: KG8294626-NICAT\nadmin-c: KG8294627-NICAT\ntech-c: KG8294627-NICAT\nnserver: ns1.edis.at\nremarks: 91.227.204.227\nnserver: ns2.edis.at\nremarks: 91.227.205.227\nnserver: ns5.edis.at\nremarks: 46.17.57.5\nnserver: ns6.edis.at\nremarks: 178.209.42.105\nchanged: 20111024 14:51:40\nsource: AT-DOM\n\npersonname: EDIS GmbH\norganization: Kleewein Gerhard\nstreet address: Widmannstettergasse 3\npostal code: 8053\ncity: Graz\ncountry: Austria\nphone: +43316827500300\nfax-no: +43316827500777\ne-mail: support@edis.at\nnic-hdl: KG8294626-NICAT\nchanged: 20111024 14:51:40\nsource: AT-DOM\n\npersonname: EDIS GmbH\norganization: Kleewein Gerhard\nstreet address: Hauptplatz 3\npostal code: 8010\ncity: Graz\ncountry: Austria\nphone: +43316827500300\nfax-no: +43316827500777\ne-mail: domreg@edis.at\nnic-hdl: KG8294627-NICAT\nchanged: 20130809 15:17:35\nsource: AT-DOM\n\n\n"], "whois_server": null, "registrar": null, "name_servers": ["ns1.edis.at", "ns2.edis.at", "ns5.edis.at", "ns6.edis.at"], "creation_date": null, "emails": []}
\ No newline at end of file
+{"updated_date": ["2011-10-24T14:51:40", "2013-08-09T15:17:35"], "nameservers": ["ns1.edis.at", "ns2.edis.at", "ns5.edis.at", "ns6.edis.at"], "raw": ["% Copyright (c)2013 by NIC.AT (1) \n%\n% Restricted rights.\n%\n% Except for agreed Internet operational purposes, no part of this\n% information may be reproduced, stored in a retrieval system, or\n% transmitted, in any form or by any means, electronic, mechanical,\n% recording, or otherwise, without prior permission of NIC.AT on behalf\n% of itself and/or the copyright holders. Any use of this material to\n% target advertising or similar activities is explicitly forbidden and\n% can be prosecuted.\n%\n% It is furthermore strictly forbidden to use the Whois-Database in such\n% a way that jeopardizes or could jeopardize the stability of the\n% technical systems of NIC.AT under any circumstances. In particular,\n% this includes any misuse of the Whois-Database and any use of the\n% Whois-Database which disturbs its operation.\n%\n% Should the user violate these points, NIC.AT reserves the right to\n% deactivate the Whois-Database entirely or partly for the user.\n% Moreover, the user shall be held liable for any and all damage\n% arising from a violation of these points.\n\ndomain: edis.at\nregistrant: KG8294626-NICAT\nadmin-c: KG8294627-NICAT\ntech-c: KG8294627-NICAT\nnserver: ns1.edis.at\nremarks: 91.227.204.227\nnserver: ns2.edis.at\nremarks: 91.227.205.227\nnserver: ns5.edis.at\nremarks: 46.17.57.5\nnserver: ns6.edis.at\nremarks: 178.209.42.105\nchanged: 20111024 14:51:40\nsource: AT-DOM\n\npersonname: EDIS GmbH\norganization: Kleewein Gerhard\nstreet address: Widmannstettergasse 3\npostal code: 8053\ncity: Graz\ncountry: Austria\nphone: +43316827500300\nfax-no: +43316827500777\ne-mail: support@edis.at\nnic-hdl: KG8294626-NICAT\nchanged: 20111024 14:51:40\nsource: AT-DOM\n\npersonname: EDIS GmbH\norganization: Kleewein Gerhard\nstreet address: Hauptplatz 3\npostal code: 8010\ncity: Graz\ncountry: Austria\nphone: +43316827500300\nfax-no: +43316827500777\ne-mail: domreg@edis.at\nnic-hdl: KG8294627-NICAT\nchanged: 20130809 15:17:35\nsource: AT-DOM\n\n\n"], "contacts": {"admin": {"city": "Graz", "fax": "+43316827500777", "handle": "KG8294627-NICAT", "name": "EDIS GmbH", "country": "Austria", "phone": "+43316827500300", "street": "Hauptplatz 3", "postalcode": "8010", "organization": "Kleewein Gerhard", "email": "domreg@edis.at", "changedate": "2013-08-09T15:17:35"}, "tech": {"city": "Graz", "fax": "+43316827500777", "handle": "KG8294627-NICAT", "name": "EDIS GmbH", "country": "Austria", "phone": "+43316827500300", "street": "Hauptplatz 3", "postalcode": "8010", "organization": "Kleewein Gerhard", "email": "domreg@edis.at", "changedate": "2013-08-09T15:17:35"}, "registrant": {"city": "Graz", "fax": "+43316827500777", "handle": "KG8294626-NICAT", "name": "EDIS GmbH", "country": "Austria", "phone": "+43316827500300", "street": "Widmannstettergasse 3", "postalcode": "8053", "organization": "Kleewein Gerhard", "email": "support@edis.at", "changedate": "2011-10-24T14:51:40"}, "billing": null}}
\ No newline at end of file
diff --git a/test/target_default/f63.net b/test/target_default/f63.net
index 04ecebe..94d8231 100644
--- a/test/target_default/f63.net
+++ b/test/target_default/f63.net
@@ -1 +1 @@
-{"status": ["ACTIVE", "NB", "NB", "NB", "NB"], "updated_date": ["2013-09-28T20:31:36"], "contacts": {"admin": {"city": "Eindhoven", "handle": "P-CAT559", "name": "Chris Talma", "country": "NL", "state": "NB", "phone": "+31.408200199", "street": "Cranendonck 2", "postalcode": "5653LA", "organization": "Orange Lemon BV", "email": "info@orangelemon.nl"}, "tech": {"city": "Eindhoven", "handle": "P-CAT559", "name": "Chris Talma", "country": "NL", "state": "NB", "phone": "+31.408200199", "street": "Cranendonck 2", "postalcode": "5653LA", "organization": "Orange Lemon BV", "email": "info@orangelemon.nl"}, "registrant": {"city": "Eindhoven", "handle": "P-CAT559", "name": "Chris Talma", "country": "NL", "state": "NB", "phone": "+31.408200199", "street": "Cranendonck 2", "postalcode": "5653LA", "organization": "Orange Lemon BV", "email": "info@orangelemon.nl"}, "billing": {"city": "Eindhoven", "handle": "P-CAT559", "name": "Chris Talma", "country": "NL", "state": "NB", "phone": "+31.408200199", "street": "Cranendonck 2", "postalcode": "5653LA", "organization": "Orange Lemon BV", "email": "info@orangelemon.nl"}}, "expiration_date": ["2014-01-14T19:23:35"], "emails": [], "raw": ["; This data is provided by Orange Lemon BV\n; for information purposes, and to assist persons obtaining information\n; about or related to domain name registration records.\n; Orange Lemon BV does not guarantee its accuracy.\n; By submitting a WHOIS query, you agree that you will use this data\n; only for lawful purposes and that, under no circumstances, you will\n; use this data to\n; 1) allow, enable, or otherwise support the transmission of mass\n; unsolicited, commercial advertising or solicitations via E-mail\n; (spam); or\n; 2) enable high volume, automated, electronic processes that apply\n; to this WHOIS server.\n; These terms may be changed without prior notice.\n; By submitting this query, you agree to abide by this policy.\n; Please register your domains at; http://www.orangelemon.nl/\n\nDomain: f63.net\nRegistry Domain ID: 1773437237_DOMAIN_NET-VRSN\nRegistrar WHOIS Server: whois.rrpproxy.net\nRegistrar URL: http://www.orangelemon.nl/\nCreated Date: 2013-01-14T19:23:35.0Z\nUpdated Date: 2013-09-28T20:31:36.0Z\nRegistrar Registration Expiration Date: 2014-01-14T19:23:35.0Z\nRegistrar: Key-Systems GmbH\nRegistrar IANA ID: 269\nRegistrar Abuse Contact Email: abuse[at]key-systems.net\nRegistrar Abuse Contact Phone: - (Please send an email)\nReseller: Orange Lemon BV\nDomain Status: ACTIVE\nRegistrant Contact: P-CAT559\nRegistrant Organization: Orange Lemon BV\nRegistrant Name: Chris Talma\nRegistrant Street: Cranendonck 2\nRegistrant City: Eindhoven\nRegistrant Postal Code: 5653LA\nRegistrant State: NB\nRegistrant Country: NL\nRegistrant Phone: +31.408200199\nRegistrant Phone Ext: \nRegistrant Fax: \nRegistrant Fax Ext: \nRegistrant Email: info@orangelemon.nl\nAdmin Contact: P-CAT559\nAdmin Organization: Orange Lemon BV\nAdmin Name: Chris Talma\nAdmin Street: Cranendonck 2\nAdmin City: Eindhoven\nAdmin State: NB\nAdmin Postal Code: 5653LA\nAdmin Country: NL\nAdmin Phone: +31.408200199\nAdmin Phone Ext: \nAdmin Fax: \nAdmin Fax Ext: \nAdmin Email: info@orangelemon.nl\nTech Contact: P-CAT559\nTech Organization: Orange Lemon BV\nTech Name: Chris Talma\nTech Street: Cranendonck 2\nTech City: Eindhoven\nTech Postal Code: 5653LA\nTech State: NB\nTech Country: NL\nTech Phone: +31.408200199\nTech Phone Ext: \nTech Fax: \nTech Fax Ext: \nTech Email: info@orangelemon.nl\nBilling Contact: P-CAT559\nBilling Organization: Orange Lemon BV\nBilling Name: Chris Talma\nBilling Street: Cranendonck 2\nBilling City: Eindhoven\nBilling Postal Code: 5653LA\nBilling State: NB\nBilling Country: NL\nBilling Phone: +31.408200199\nBilling Phone Ext: \nBilling Fax: \nBilling Fax Ext: \nBilling Email: info@orangelemon.nl\nName Server: lucy.ns.cloudflare.com \nName Server: sid.ns.cloudflare.com \nDNSSEC: unsigned\nURL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/\n>>> Last update of WHOIS database: 2013-11-20T04:15:32.0Z <<<\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: F63.NET\n Registrar: KEY-SYSTEMS GMBH\n Whois Server: whois.rrpproxy.net\n Referral URL: http://www.key-systems.net\n Name Server: LUCY.NS.CLOUDFLARE.COM\n Name Server: SID.NS.CLOUDFLARE.COM\n Status: ok\n Updated Date: 28-sep-2013\n Creation Date: 14-jan-2013\n Expiration Date: 14-jan-2014\n\n>>> Last update of whois database: Wed, 20 Nov 2013 04:14:59 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.rrpproxy.net"], "registrar": ["Key-Systems GmbH"], "name_servers": ["lucy.ns.cloudflare.com", "sid.ns.cloudflare.com"], "creation_date": ["2013-01-14T19:23:35", "2013-01-14T19:23:35"], "id": ["1773437237_DOMAIN_NET-VRSN"]}
\ No newline at end of file
+{"status": ["ACTIVE", "NB", "NB", "NB", "NB"], "updated_date": ["2013-09-28T20:31:36"], "contacts": {"admin": {"city": "Eindhoven", "handle": "P-CAT559", "name": "Chris Talma", "country": "NL", "state": "NB", "phone": "+31.408200199", "street": "Cranendonck 2", "postalcode": "5653LA", "organization": "Orange Lemon BV", "email": "info@orangelemon.nl"}, "tech": {"city": "Eindhoven", "handle": "P-CAT559", "name": "Chris Talma", "country": "NL", "state": "NB", "phone": "+31.408200199", "street": "Cranendonck 2", "postalcode": "5653LA", "organization": "Orange Lemon BV", "email": "info@orangelemon.nl"}, "registrant": {"city": "Eindhoven", "handle": "P-CAT559", "name": "Chris Talma", "country": "NL", "state": "NB", "phone": "+31.408200199", "street": "Cranendonck 2", "postalcode": "5653LA", "organization": "Orange Lemon BV", "email": "info@orangelemon.nl"}, "billing": {"city": "Eindhoven", "handle": "P-CAT559", "name": "Chris Talma", "country": "NL", "state": "NB", "phone": "+31.408200199", "street": "Cranendonck 2", "postalcode": "5653LA", "organization": "Orange Lemon BV", "email": "info@orangelemon.nl"}}, "nameservers": ["lucy.ns.cloudflare.com", "sid.ns.cloudflare.com"], "expiration_date": ["2014-01-14T19:23:35"], "raw": ["; This data is provided by Orange Lemon BV\n; for information purposes, and to assist persons obtaining information\n; about or related to domain name registration records.\n; Orange Lemon BV does not guarantee its accuracy.\n; By submitting a WHOIS query, you agree that you will use this data\n; only for lawful purposes and that, under no circumstances, you will\n; use this data to\n; 1) allow, enable, or otherwise support the transmission of mass\n; unsolicited, commercial advertising or solicitations via E-mail\n; (spam); or\n; 2) enable high volume, automated, electronic processes that apply\n; to this WHOIS server.\n; These terms may be changed without prior notice.\n; By submitting this query, you agree to abide by this policy.\n; Please register your domains at; http://www.orangelemon.nl/\n\nDomain: f63.net\nRegistry Domain ID: 1773437237_DOMAIN_NET-VRSN\nRegistrar WHOIS Server: whois.rrpproxy.net\nRegistrar URL: http://www.orangelemon.nl/\nCreated Date: 2013-01-14T19:23:35.0Z\nUpdated Date: 2013-09-28T20:31:36.0Z\nRegistrar Registration Expiration Date: 2014-01-14T19:23:35.0Z\nRegistrar: Key-Systems GmbH\nRegistrar IANA ID: 269\nRegistrar Abuse Contact Email: abuse[at]key-systems.net\nRegistrar Abuse Contact Phone: - (Please send an email)\nReseller: Orange Lemon BV\nDomain Status: ACTIVE\nRegistrant Contact: P-CAT559\nRegistrant Organization: Orange Lemon BV\nRegistrant Name: Chris Talma\nRegistrant Street: Cranendonck 2\nRegistrant City: Eindhoven\nRegistrant Postal Code: 5653LA\nRegistrant State: NB\nRegistrant Country: NL\nRegistrant Phone: +31.408200199\nRegistrant Phone Ext: \nRegistrant Fax: \nRegistrant Fax Ext: \nRegistrant Email: info@orangelemon.nl\nAdmin Contact: P-CAT559\nAdmin Organization: Orange Lemon BV\nAdmin Name: Chris Talma\nAdmin Street: Cranendonck 2\nAdmin City: Eindhoven\nAdmin State: NB\nAdmin Postal Code: 5653LA\nAdmin Country: NL\nAdmin Phone: +31.408200199\nAdmin Phone Ext: \nAdmin Fax: \nAdmin Fax Ext: \nAdmin Email: info@orangelemon.nl\nTech Contact: P-CAT559\nTech Organization: Orange Lemon BV\nTech Name: Chris Talma\nTech Street: Cranendonck 2\nTech City: Eindhoven\nTech Postal Code: 5653LA\nTech State: NB\nTech Country: NL\nTech Phone: +31.408200199\nTech Phone Ext: \nTech Fax: \nTech Fax Ext: \nTech Email: info@orangelemon.nl\nBilling Contact: P-CAT559\nBilling Organization: Orange Lemon BV\nBilling Name: Chris Talma\nBilling Street: Cranendonck 2\nBilling City: Eindhoven\nBilling Postal Code: 5653LA\nBilling State: NB\nBilling Country: NL\nBilling Phone: +31.408200199\nBilling Phone Ext: \nBilling Fax: \nBilling Fax Ext: \nBilling Email: info@orangelemon.nl\nName Server: lucy.ns.cloudflare.com \nName Server: sid.ns.cloudflare.com \nDNSSEC: unsigned\nURL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/\n>>> Last update of WHOIS database: 2013-11-20T04:15:32.0Z <<<\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: F63.NET\n Registrar: KEY-SYSTEMS GMBH\n Whois Server: whois.rrpproxy.net\n Referral URL: http://www.key-systems.net\n Name Server: LUCY.NS.CLOUDFLARE.COM\n Name Server: SID.NS.CLOUDFLARE.COM\n Status: ok\n Updated Date: 28-sep-2013\n Creation Date: 14-jan-2013\n Expiration Date: 14-jan-2014\n\n>>> Last update of whois database: Wed, 20 Nov 2013 04:14:59 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.rrpproxy.net"], "registrar": ["Key-Systems GmbH"], "creation_date": ["2013-01-14T19:23:35", "2013-01-14T19:23:35"], "id": ["1773437237_DOMAIN_NET-VRSN"]}
\ No newline at end of file
diff --git a/test/target_default/geko.dk b/test/target_default/geko.dk
index b8d5f67..49345a3 100644
--- a/test/target_default/geko.dk
+++ b/test/target_default/geko.dk
@@ -1 +1 @@
-{"status": ["Active"], "updated_date": null, "contacts": {"admin": null, "tech": null, "registrant": null, "billing": null}, "expiration_date": ["2014-03-31T00:00:00"], "emails": null, "creation_date": ["2001-02-23T00:00:00"], "raw": ["# Hello 77.162.55.23. Your session has been logged.\n#\n# Copyright (c) 2002 - 2013 by DK Hostmaster A/S\n# \n# The data in the DK Whois database is provided by DK Hostmaster A/S\n# for information purposes only, and to assist persons in obtaining\n# information about or related to a domain name registration record.\n# We do not guarantee its accuracy. We will reserve the right to remove\n# access for entities abusing the data, without notice.\n# \n# Any use of this material to target advertising or similar activities\n# are explicitly forbidden and will be prosecuted. DK Hostmaster A/S\n# requests to be notified of any such activities or suspicions thereof.\n\nDomain: geko.dk\nDNS: geko.dk\nRegistered: 2001-02-23\nExpires: 2014-03-31\nRegistration period: 1 year\nVID: no\nStatus: Active\n\nNameservers\nHostname: ns1.cb.dk\nHostname: ns2.cb.dk\n\n# Use option --show-handles to get handle information.\n# Whois HELP for more help.\n\n\n"], "whois_server": null, "registrar": null, "name_servers": ["ns1.cb.dk", "ns2.cb.dk"], "id": null}
\ No newline at end of file
+{"status": ["Active"], "contacts": {"admin": null, "tech": null, "registrant": null, "billing": null}, "nameservers": ["ns1.cb.dk", "ns2.cb.dk"], "expiration_date": ["2014-03-31T00:00:00"], "creation_date": ["2001-02-23T00:00:00"], "raw": ["# Hello 77.162.55.23. Your session has been logged.\n#\n# Copyright (c) 2002 - 2013 by DK Hostmaster A/S\n# \n# The data in the DK Whois database is provided by DK Hostmaster A/S\n# for information purposes only, and to assist persons in obtaining\n# information about or related to a domain name registration record.\n# We do not guarantee its accuracy. We will reserve the right to remove\n# access for entities abusing the data, without notice.\n# \n# Any use of this material to target advertising or similar activities\n# are explicitly forbidden and will be prosecuted. DK Hostmaster A/S\n# requests to be notified of any such activities or suspicions thereof.\n\nDomain: geko.dk\nDNS: geko.dk\nRegistered: 2001-02-23\nExpires: 2014-03-31\nRegistration period: 1 year\nVID: no\nStatus: Active\n\nNameservers\nHostname: ns1.cb.dk\nHostname: ns2.cb.dk\n\n# Use option --show-handles to get handle information.\n# Whois HELP for more help.\n\n\n"]}
\ No newline at end of file
diff --git a/test/target_default/google.com b/test/target_default/google.com
index 5f516ad..6913845 100644
--- a/test/target_default/google.com
+++ b/test/target_default/google.com
@@ -1 +1 @@
-{"status": ["clientUpdateProhibited", "clientTransferProhibited", "clientDeleteProhibited"], "updated_date": ["2013-10-29T11:50:06"], "contacts": {"admin": {"city": "Mountain View", "fax": "+1.6506188571", "name": "DNS Admin", "state": "CA", "phone": "+1.6506234000", "street": "1600 Amphitheatre Parkway", "country": "US", "postalcode": "94043", "organization": "Google Inc.", "email": "dns-admin@google.com"}, "tech": {"city": "Mountain View", "fax": "+1.6506181499", "name": "DNS Admin", "state": "CA", "phone": "+1.6503300100", "street": "2400 E. Bayshore Pkwy", "country": "US", "postalcode": "94043", "organization": "Google Inc.", "email": "dns-admin@google.com"}, "registrant": {"city": "Mountain View", "fax": "+1.6506188571", "name": "Dns Admin", "state": "CA", "phone": "+1.6502530000", "street": "Please contact contact-admin@google.com, 1600 Amphitheatre Parkway", "country": "US", "postalcode": "94043", "organization": "Google Inc.", "email": "dns-admin@google.com"}, "billing": null}, "expiration_date": ["2020-09-13T21:00:00", "2020-09-13T21:00:00"], "id": null, "creation_date": ["2002-10-02T00:00:00"], "raw": ["Domain Name: google.com\nRegistry Domain ID: \nRegistrar WHOIS Server: whois.markmonitor.com\nRegistrar URL: http://www.markmonitor.com\nUpdated Date: 2013-10-29T11:50:06-0700\nCreation Date: 2002-10-02T00:00:00-0700\nRegistrar Registration Expiration Date: 2020-09-13T21:00:00-0700\nRegistrar: MarkMonitor, Inc.\nRegistrar IANA ID: 292\nRegistrar Abuse Contact Email: compliance@markmonitor.com\nRegistrar Abuse Contact Phone: +1.2083895740\nDomain Status: clientUpdateProhibited\nDomain Status: clientTransferProhibited\nDomain Status: clientDeleteProhibited\nRegistry Registrant ID: \nRegistrant Name: Dns Admin\nRegistrant Organization: Google Inc.\nRegistrant Street: Please contact contact-admin@google.com, 1600 Amphitheatre Parkway\nRegistrant City: Mountain View\nRegistrant State/Province: CA\nRegistrant Postal Code: 94043\nRegistrant Country: US\nRegistrant Phone: +1.6502530000\nRegistrant Phone Ext: \nRegistrant Fax: +1.6506188571\nRegistrant Fax Ext: \nRegistrant Email: dns-admin@google.com\nRegistry Admin ID: \nAdmin Name: DNS Admin\nAdmin Organization: Google Inc.\nAdmin Street: 1600 Amphitheatre Parkway\nAdmin City: Mountain View\nAdmin State/Province: CA\nAdmin Postal Code: 94043\nAdmin Country: US\nAdmin Phone: +1.6506234000\nAdmin Phone Ext: \nAdmin Fax: +1.6506188571\nAdmin Fax Ext: \nAdmin Email: dns-admin@google.com\nRegistry Tech ID: \nTech Name: DNS Admin\nTech Organization: Google Inc.\nTech Street: 2400 E. Bayshore Pkwy\nTech City: Mountain View\nTech State/Province: CA\nTech Postal Code: 94043\nTech Country: US\nTech Phone: +1.6503300100\nTech Phone Ext: \nTech Fax: +1.6506181499\nTech Fax Ext: \nTech Email: dns-admin@google.com\nName Server: ns4.google.com\nName Server: ns3.google.com\nName Server: ns2.google.com\nName Server: ns1.google.com\nURL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/\n>>> Last update of WHOIS database: 2013-11-23T06:21:09-0800 <<<\n\nThe Data in MarkMonitor.com's WHOIS database is provided by MarkMonitor.com for\ninformation purposes, and to assist persons in obtaining information about or\nrelated to a domain name registration record. MarkMonitor.com does not guarantee\nits accuracy. By submitting a WHOIS query, you agree that you will use this Data\nonly for lawful purposes and that, under no circumstances will you use this Data to:\n (1) allow, enable, or otherwise support the transmission of mass unsolicited,\n commercial advertising or solicitations via e-mail (spam); or\n (2) enable high volume, automated, electronic processes that apply to\n MarkMonitor.com (or its systems).\nMarkMonitor.com reserves the right to modify these terms at any time.\nBy submitting this query, you agree to abide by this policy.\n\nMarkMonitor is the Global Leader in Online Brand Protection.\n\nMarkMonitor Domain Management(TM)\nMarkMonitor Brand Protection(TM)\nMarkMonitor AntiPiracy(TM)\nMarkMonitor AntiFraud(TM)\nProfessional and Managed Services\n\nVisit MarkMonitor at http://www.markmonitor.com\nContact us at +1.8007459229\nIn Europe, at +44.02032062220", "", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Server Name: GOOGLE.COM.ZZZZZZZZZZZZZZZZZZZZZZZZZZ.HAVENDATA.COM\n IP Address: 50.23.75.44\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.ZZZZZZZZZZZZZ.GET.ONE.MILLION.DOLLARS.AT.WWW.UNIMUNDI.COM\n IP Address: 209.126.190.70\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.ZZZZZ.GET.LAID.AT.WWW.SWINGINGCOMMUNITY.COM\n IP Address: 69.41.185.195\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: GOOGLE.COM.ZOMBIED.AND.HACKED.BY.WWW.WEB-HACK.COM\n IP Address: 217.107.217.167\n Registrar: DOMAINCONTEXT, INC.\n Whois Server: whois.domaincontext.com\n Referral URL: http://www.domaincontext.com\n\n Server Name: GOOGLE.COM.ZNAET.PRODOMEN.COM\n IP Address: 62.149.23.126\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.YUCEKIRBAC.COM\n IP Address: 88.246.115.134\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.YUCEHOCA.COM\n IP Address: 88.246.115.134\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.WORDT.DOOR.VEEL.WHTERS.GEBRUIKT.SERVERTJE.NET\n IP Address: 62.41.27.144\n Registrar: KEY-SYSTEMS GMBH\n Whois Server: whois.rrpproxy.net\n Referral URL: http://www.key-systems.net\n\n Server Name: GOOGLE.COM.VN\n Registrar: ONLINENIC, INC.\n Whois Server: whois.onlinenic.com\n Referral URL: http://www.OnlineNIC.com\n\n Server Name: GOOGLE.COM.VABDAYOFF.COM\n IP Address: 8.8.8.8\n Registrar: DOMAIN.COM, LLC\n Whois Server: whois.domain.com\n Referral URL: http://www.domain.com\n\n Server Name: GOOGLE.COM.UY\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.UA\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.TW\n Registrar: WEB COMMERCE COMMUNICATIONS LIMITED DBA WEBNIC.CC\n Whois Server: whois.webnic.cc\n Referral URL: http://www.webnic.cc\n\n Server Name: GOOGLE.COM.TR\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.SUCKS.FIND.CRACKZ.WITH.SEARCH.GULLI.COM\n IP Address: 80.190.192.24\n Registrar: CORE INTERNET COUNCIL OF REGISTRARS\n Whois Server: whois.corenic.net\n Referral URL: http://www.corenic.net\n\n Server Name: GOOGLE.COM.SPROSIUYANDEKSA.RU\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n\n Server Name: GOOGLE.COM.SPAMMING.IS.UNETHICAL.PLEASE.STOP.THEM.HUAXUEERBAN.COM\n IP Address: 211.64.175.66\n IP Address: 211.64.175.67\n Registrar: GODADDY.COM, LLC\n Whois Server: whois.godaddy.com\n Referral URL: http://registrar.godaddy.com\n\n Server Name: GOOGLE.COM.SOUTHBEACHNEEDLEARTISTRY.COM\n IP Address: 74.125.229.52\n Registrar: GODADDY.COM, LLC\n Whois Server: whois.godaddy.com\n Referral URL: http://registrar.godaddy.com\n\n Server Name: GOOGLE.COM.SHQIPERIA.COM\n IP Address: 70.84.145.107\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: GOOGLE.COM.SA\n Registrar: OMNIS NETWORK, LLC\n Whois Server: whois.omnis.com\n Referral URL: http://domains.omnis.com\n\n Server Name: GOOGLE.COM.PK\n Registrar: BIGROCK SOLUTIONS LIMITED\n Whois Server: Whois.bigrock.com\n Referral URL: http://www.bigrock.com\n\n Server Name: GOOGLE.COM.PE\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.NS2.CHALESHGAR.COM\n IP Address: 8.8.8.8\n Registrar: REALTIME REGISTER BV\n Whois Server: whois.yoursrs.com\n Referral URL: http://www.realtimeregister.com\n\n Server Name: GOOGLE.COM.NS1.CHALESHGAR.COM\n IP Address: 8.8.8.8\n Registrar: REALTIME REGISTER BV\n Whois Server: whois.yoursrs.com\n Referral URL: http://www.realtimeregister.com\n\n Server Name: GOOGLE.COM.MY\n Registrar: WILD WEST DOMAINS, LLC\n Whois Server: whois.wildwestdomains.com\n Referral URL: http://www.wildwestdomains.com\n\n Server Name: GOOGLE.COM.MX\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.LOLOLOLOLOL.SHTHEAD.COM\n IP Address: 123.123.123.123\n Registrar: CRAZY DOMAINS FZ-LLC\n Whois Server: whois.syra.com.au\n Referral URL: http://www.crazydomains.com \n\n Server Name: GOOGLE.COM.LASERPIPE.COM\n IP Address: 209.85.227.106\n Registrar: REALTIME REGISTER BV\n Whois Server: whois.yoursrs.com\n Referral URL: http://www.realtimeregister.com\n\n Server Name: GOOGLE.COM.IS.NOT.HOSTED.BY.ACTIVEDOMAINDNS.NET\n IP Address: 217.148.161.5\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: GOOGLE.COM.IS.HOSTED.ON.PROFITHOSTING.NET\n IP Address: 66.49.213.213\n Registrar: NAME.COM, INC.\n Whois Server: whois.name.com\n Referral URL: http://www.name.com\n\n Server Name: GOOGLE.COM.IS.APPROVED.BY.NUMEA.COM\n IP Address: 213.228.0.43\n Registrar: GANDI SAS\n Whois Server: whois.gandi.net\n Referral URL: http://www.gandi.net\n\n Server Name: GOOGLE.COM.HK\n Registrar: CLOUD GROUP LIMITED\n Whois Server: whois.hostingservicesinc.net\n Referral URL: http://www.resell.biz\n\n Server Name: GOOGLE.COM.HICHINA.COM\n IP Address: 218.103.1.1\n Registrar: HICHINA ZHICHENG TECHNOLOGY LTD.\n Whois Server: grs-whois.hichina.com\n Referral URL: http://www.net.cn\n\n Server Name: GOOGLE.COM.HAS.LESS.FREE.PORN.IN.ITS.SEARCH.ENGINE.THAN.SECZY.COM\n IP Address: 209.187.114.130\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: GOOGLE.COM.DO\n Registrar: GODADDY.COM, LLC\n Whois Server: whois.godaddy.com\n Referral URL: http://registrar.godaddy.com\n\n Server Name: GOOGLE.COM.CO\n Registrar: NAMESECURE.COM\n Whois Server: whois.namesecure.com\n Referral URL: http://www.namesecure.com\n\n Server Name: GOOGLE.COM.CN\n Registrar: XIN NET TECHNOLOGY CORPORATION\n Whois Server: whois.paycenter.com.cn\n Referral URL: http://www.xinnet.com\n\n Server Name: GOOGLE.COM.BR\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: GOOGLE.COM.BEYONDWHOIS.COM\n IP Address: 203.36.226.2\n Registrar: INSTRA CORPORATION PTY, LTD.\n Whois Server: whois.instra.net\n Referral URL: http://www.instra.com\n\n Server Name: GOOGLE.COM.AU\n Registrar: PLANETDOMAIN PTY LTD.\n Whois Server: whois.planetdomain.com\n Referral URL: http://www.planetdomain.com\n\n Server Name: GOOGLE.COM.ARTVISUALRIO.COM\n IP Address: 200.222.44.35\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: GOOGLE.COM.AR\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: GOOGLE.COM.AFRICANBATS.ORG\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Domain Name: GOOGLE.COM\n Registrar: MARKMONITOR INC.\n Whois Server: whois.markmonitor.com\n Referral URL: http://www.markmonitor.com\n Name Server: NS1.GOOGLE.COM\n Name Server: NS2.GOOGLE.COM\n Name Server: NS3.GOOGLE.COM\n Name Server: NS4.GOOGLE.COM\n Status: clientDeleteProhibited\n Status: clientTransferProhibited\n Status: clientUpdateProhibited\n Status: serverDeleteProhibited\n Status: serverTransferProhibited\n Status: serverUpdateProhibited\n Updated Date: 20-jul-2011\n Creation Date: 15-sep-1997\n Expiration Date: 14-sep-2020\n\n>>> Last update of whois database: Sat, 23 Nov 2013 14:23:45 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.markmonitor.com"], "registrar": ["MarkMonitor, Inc."], "name_servers": ["ns4.google.com", "ns3.google.com", "ns2.google.com", "ns1.google.com"], "emails": ["compliance@markmonitor.com", "contact-admin@google.com"]}
\ No newline at end of file
+{"status": ["clientUpdateProhibited", "clientTransferProhibited", "clientDeleteProhibited"], "updated_date": ["2013-10-29T11:50:06"], "contacts": {"admin": {"city": "Mountain View", "fax": "+1.6506188571", "name": "DNS Admin", "state": "CA", "phone": "+1.6506234000", "street": "1600 Amphitheatre Parkway", "country": "US", "postalcode": "94043", "organization": "Google Inc.", "email": "dns-admin@google.com"}, "tech": {"city": "Mountain View", "fax": "+1.6506181499", "name": "DNS Admin", "state": "CA", "phone": "+1.6503300100", "street": "2400 E. Bayshore Pkwy", "country": "US", "postalcode": "94043", "organization": "Google Inc.", "email": "dns-admin@google.com"}, "registrant": {"city": "Mountain View", "fax": "+1.6506188571", "name": "Dns Admin", "state": "CA", "phone": "+1.6502530000", "street": "Please contact contact-admin@google.com, 1600 Amphitheatre Parkway", "country": "US", "postalcode": "94043", "organization": "Google Inc.", "email": "dns-admin@google.com"}, "billing": null}, "nameservers": ["ns4.google.com", "ns3.google.com", "ns2.google.com", "ns1.google.com"], "expiration_date": ["2020-09-13T21:00:00", "2020-09-13T21:00:00"], "creation_date": ["2002-10-02T00:00:00"], "raw": ["Domain Name: google.com\nRegistry Domain ID: \nRegistrar WHOIS Server: whois.markmonitor.com\nRegistrar URL: http://www.markmonitor.com\nUpdated Date: 2013-10-29T11:50:06-0700\nCreation Date: 2002-10-02T00:00:00-0700\nRegistrar Registration Expiration Date: 2020-09-13T21:00:00-0700\nRegistrar: MarkMonitor, Inc.\nRegistrar IANA ID: 292\nRegistrar Abuse Contact Email: compliance@markmonitor.com\nRegistrar Abuse Contact Phone: +1.2083895740\nDomain Status: clientUpdateProhibited\nDomain Status: clientTransferProhibited\nDomain Status: clientDeleteProhibited\nRegistry Registrant ID: \nRegistrant Name: Dns Admin\nRegistrant Organization: Google Inc.\nRegistrant Street: Please contact contact-admin@google.com, 1600 Amphitheatre Parkway\nRegistrant City: Mountain View\nRegistrant State/Province: CA\nRegistrant Postal Code: 94043\nRegistrant Country: US\nRegistrant Phone: +1.6502530000\nRegistrant Phone Ext: \nRegistrant Fax: +1.6506188571\nRegistrant Fax Ext: \nRegistrant Email: dns-admin@google.com\nRegistry Admin ID: \nAdmin Name: DNS Admin\nAdmin Organization: Google Inc.\nAdmin Street: 1600 Amphitheatre Parkway\nAdmin City: Mountain View\nAdmin State/Province: CA\nAdmin Postal Code: 94043\nAdmin Country: US\nAdmin Phone: +1.6506234000\nAdmin Phone Ext: \nAdmin Fax: +1.6506188571\nAdmin Fax Ext: \nAdmin Email: dns-admin@google.com\nRegistry Tech ID: \nTech Name: DNS Admin\nTech Organization: Google Inc.\nTech Street: 2400 E. Bayshore Pkwy\nTech City: Mountain View\nTech State/Province: CA\nTech Postal Code: 94043\nTech Country: US\nTech Phone: +1.6503300100\nTech Phone Ext: \nTech Fax: +1.6506181499\nTech Fax Ext: \nTech Email: dns-admin@google.com\nName Server: ns4.google.com\nName Server: ns3.google.com\nName Server: ns2.google.com\nName Server: ns1.google.com\nURL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/\n>>> Last update of WHOIS database: 2013-11-23T06:21:09-0800 <<<\n\nThe Data in MarkMonitor.com's WHOIS database is provided by MarkMonitor.com for\ninformation purposes, and to assist persons in obtaining information about or\nrelated to a domain name registration record. MarkMonitor.com does not guarantee\nits accuracy. By submitting a WHOIS query, you agree that you will use this Data\nonly for lawful purposes and that, under no circumstances will you use this Data to:\n (1) allow, enable, or otherwise support the transmission of mass unsolicited,\n commercial advertising or solicitations via e-mail (spam); or\n (2) enable high volume, automated, electronic processes that apply to\n MarkMonitor.com (or its systems).\nMarkMonitor.com reserves the right to modify these terms at any time.\nBy submitting this query, you agree to abide by this policy.\n\nMarkMonitor is the Global Leader in Online Brand Protection.\n\nMarkMonitor Domain Management(TM)\nMarkMonitor Brand Protection(TM)\nMarkMonitor AntiPiracy(TM)\nMarkMonitor AntiFraud(TM)\nProfessional and Managed Services\n\nVisit MarkMonitor at http://www.markmonitor.com\nContact us at +1.8007459229\nIn Europe, at +44.02032062220", "", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Server Name: GOOGLE.COM.ZZZZZZZZZZZZZZZZZZZZZZZZZZ.HAVENDATA.COM\n IP Address: 50.23.75.44\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.ZZZZZZZZZZZZZ.GET.ONE.MILLION.DOLLARS.AT.WWW.UNIMUNDI.COM\n IP Address: 209.126.190.70\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.ZZZZZ.GET.LAID.AT.WWW.SWINGINGCOMMUNITY.COM\n IP Address: 69.41.185.195\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: GOOGLE.COM.ZOMBIED.AND.HACKED.BY.WWW.WEB-HACK.COM\n IP Address: 217.107.217.167\n Registrar: DOMAINCONTEXT, INC.\n Whois Server: whois.domaincontext.com\n Referral URL: http://www.domaincontext.com\n\n Server Name: GOOGLE.COM.ZNAET.PRODOMEN.COM\n IP Address: 62.149.23.126\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.YUCEKIRBAC.COM\n IP Address: 88.246.115.134\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.YUCEHOCA.COM\n IP Address: 88.246.115.134\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.WORDT.DOOR.VEEL.WHTERS.GEBRUIKT.SERVERTJE.NET\n IP Address: 62.41.27.144\n Registrar: KEY-SYSTEMS GMBH\n Whois Server: whois.rrpproxy.net\n Referral URL: http://www.key-systems.net\n\n Server Name: GOOGLE.COM.VN\n Registrar: ONLINENIC, INC.\n Whois Server: whois.onlinenic.com\n Referral URL: http://www.OnlineNIC.com\n\n Server Name: GOOGLE.COM.VABDAYOFF.COM\n IP Address: 8.8.8.8\n Registrar: DOMAIN.COM, LLC\n Whois Server: whois.domain.com\n Referral URL: http://www.domain.com\n\n Server Name: GOOGLE.COM.UY\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.UA\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.TW\n Registrar: WEB COMMERCE COMMUNICATIONS LIMITED DBA WEBNIC.CC\n Whois Server: whois.webnic.cc\n Referral URL: http://www.webnic.cc\n\n Server Name: GOOGLE.COM.TR\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.SUCKS.FIND.CRACKZ.WITH.SEARCH.GULLI.COM\n IP Address: 80.190.192.24\n Registrar: CORE INTERNET COUNCIL OF REGISTRARS\n Whois Server: whois.corenic.net\n Referral URL: http://www.corenic.net\n\n Server Name: GOOGLE.COM.SPROSIUYANDEKSA.RU\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n\n Server Name: GOOGLE.COM.SPAMMING.IS.UNETHICAL.PLEASE.STOP.THEM.HUAXUEERBAN.COM\n IP Address: 211.64.175.66\n IP Address: 211.64.175.67\n Registrar: GODADDY.COM, LLC\n Whois Server: whois.godaddy.com\n Referral URL: http://registrar.godaddy.com\n\n Server Name: GOOGLE.COM.SOUTHBEACHNEEDLEARTISTRY.COM\n IP Address: 74.125.229.52\n Registrar: GODADDY.COM, LLC\n Whois Server: whois.godaddy.com\n Referral URL: http://registrar.godaddy.com\n\n Server Name: GOOGLE.COM.SHQIPERIA.COM\n IP Address: 70.84.145.107\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: GOOGLE.COM.SA\n Registrar: OMNIS NETWORK, LLC\n Whois Server: whois.omnis.com\n Referral URL: http://domains.omnis.com\n\n Server Name: GOOGLE.COM.PK\n Registrar: BIGROCK SOLUTIONS LIMITED\n Whois Server: Whois.bigrock.com\n Referral URL: http://www.bigrock.com\n\n Server Name: GOOGLE.COM.PE\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.NS2.CHALESHGAR.COM\n IP Address: 8.8.8.8\n Registrar: REALTIME REGISTER BV\n Whois Server: whois.yoursrs.com\n Referral URL: http://www.realtimeregister.com\n\n Server Name: GOOGLE.COM.NS1.CHALESHGAR.COM\n IP Address: 8.8.8.8\n Registrar: REALTIME REGISTER BV\n Whois Server: whois.yoursrs.com\n Referral URL: http://www.realtimeregister.com\n\n Server Name: GOOGLE.COM.MY\n Registrar: WILD WEST DOMAINS, LLC\n Whois Server: whois.wildwestdomains.com\n Referral URL: http://www.wildwestdomains.com\n\n Server Name: GOOGLE.COM.MX\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.LOLOLOLOLOL.SHTHEAD.COM\n IP Address: 123.123.123.123\n Registrar: CRAZY DOMAINS FZ-LLC\n Whois Server: whois.syra.com.au\n Referral URL: http://www.crazydomains.com \n\n Server Name: GOOGLE.COM.LASERPIPE.COM\n IP Address: 209.85.227.106\n Registrar: REALTIME REGISTER BV\n Whois Server: whois.yoursrs.com\n Referral URL: http://www.realtimeregister.com\n\n Server Name: GOOGLE.COM.IS.NOT.HOSTED.BY.ACTIVEDOMAINDNS.NET\n IP Address: 217.148.161.5\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: GOOGLE.COM.IS.HOSTED.ON.PROFITHOSTING.NET\n IP Address: 66.49.213.213\n Registrar: NAME.COM, INC.\n Whois Server: whois.name.com\n Referral URL: http://www.name.com\n\n Server Name: GOOGLE.COM.IS.APPROVED.BY.NUMEA.COM\n IP Address: 213.228.0.43\n Registrar: GANDI SAS\n Whois Server: whois.gandi.net\n Referral URL: http://www.gandi.net\n\n Server Name: GOOGLE.COM.HK\n Registrar: CLOUD GROUP LIMITED\n Whois Server: whois.hostingservicesinc.net\n Referral URL: http://www.resell.biz\n\n Server Name: GOOGLE.COM.HICHINA.COM\n IP Address: 218.103.1.1\n Registrar: HICHINA ZHICHENG TECHNOLOGY LTD.\n Whois Server: grs-whois.hichina.com\n Referral URL: http://www.net.cn\n\n Server Name: GOOGLE.COM.HAS.LESS.FREE.PORN.IN.ITS.SEARCH.ENGINE.THAN.SECZY.COM\n IP Address: 209.187.114.130\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: GOOGLE.COM.DO\n Registrar: GODADDY.COM, LLC\n Whois Server: whois.godaddy.com\n Referral URL: http://registrar.godaddy.com\n\n Server Name: GOOGLE.COM.CO\n Registrar: NAMESECURE.COM\n Whois Server: whois.namesecure.com\n Referral URL: http://www.namesecure.com\n\n Server Name: GOOGLE.COM.CN\n Registrar: XIN NET TECHNOLOGY CORPORATION\n Whois Server: whois.paycenter.com.cn\n Referral URL: http://www.xinnet.com\n\n Server Name: GOOGLE.COM.BR\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: GOOGLE.COM.BEYONDWHOIS.COM\n IP Address: 203.36.226.2\n Registrar: INSTRA CORPORATION PTY, LTD.\n Whois Server: whois.instra.net\n Referral URL: http://www.instra.com\n\n Server Name: GOOGLE.COM.AU\n Registrar: PLANETDOMAIN PTY LTD.\n Whois Server: whois.planetdomain.com\n Referral URL: http://www.planetdomain.com\n\n Server Name: GOOGLE.COM.ARTVISUALRIO.COM\n IP Address: 200.222.44.35\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: GOOGLE.COM.AR\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: GOOGLE.COM.AFRICANBATS.ORG\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Domain Name: GOOGLE.COM\n Registrar: MARKMONITOR INC.\n Whois Server: whois.markmonitor.com\n Referral URL: http://www.markmonitor.com\n Name Server: NS1.GOOGLE.COM\n Name Server: NS2.GOOGLE.COM\n Name Server: NS3.GOOGLE.COM\n Name Server: NS4.GOOGLE.COM\n Status: clientDeleteProhibited\n Status: clientTransferProhibited\n Status: clientUpdateProhibited\n Status: serverDeleteProhibited\n Status: serverTransferProhibited\n Status: serverUpdateProhibited\n Updated Date: 20-jul-2011\n Creation Date: 15-sep-1997\n Expiration Date: 14-sep-2020\n\n>>> Last update of whois database: Sat, 23 Nov 2013 14:23:45 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.markmonitor.com"], "registrar": ["MarkMonitor, Inc."], "emails": ["compliance@markmonitor.com", "contact-admin@google.com"]}
\ No newline at end of file
diff --git a/test/target_default/huskeh.net b/test/target_default/huskeh.net
index a4976bc..e8df841 100644
--- a/test/target_default/huskeh.net
+++ b/test/target_default/huskeh.net
@@ -1 +1 @@
-{"updated_date": ["2013-09-18T00:00:00"], "status": ["clientDeleteProhibited", "clientTransferProhibited"], "contacts": {"admin": {"city": "Roubaix Cedex 1", "name": "Poulton Sam", "phone": "+33.899498765", "street": "huskeh.net, office #5075960\nc/o OwO, BP80157", "country": "FR", "postalcode": "59053", "email": "mtv1ufny8x589jxnfcsx@c.o-w-o.info"}, "tech": {"city": "Roubaix Cedex 1", "name": "Poulton Sam", "phone": "+33.899498765", "street": "huskeh.net, office #5075960\nc/o OwO, BP80157", "country": "FR", "postalcode": "59053", "email": "mtv1ufny8x589jxnfcsx@c.o-w-o.info"}, "registrant": {"city": "Roubaix Cedex 1", "name": "Poulton Sam", "phone": "+33.899498765", "street": "huskeh.net, office #5075960\nc/o OwO, BP80157", "country": "FR", "postalcode": "59053", "email": "0vdudcszg7joly3irb2u@e.o-w-o.info"}, "billing": {"city": "Roubaix Cedex 1", "name": "Poulton Sam", "phone": "+33.899498765", "street": "huskeh.net, office #5075960\nc/o OwO, BP80157", "country": "FR", "postalcode": "59053", "email": "mtv1ufny8x589jxnfcsx@c.o-w-o.info"}}, "expiration_date": ["2014-09-29T00:00:00", "2014-09-29T00:00:00"], "id": null, "creation_date": ["2009-09-29T00:00:00", "2009-09-29T00:00:00"], "raw": ["###############################################################################\n#\n# Welcome to the OVH WHOIS Server.\n# \n# whois server : whois.ovh.com check server : check.ovh.com\n# \n# The data in this Whois is at your disposal with the aim of supplying you the\n# information only, that is helping you in the obtaining of the information\n# about or related to a domain name registration record. OVH Sas make this\n# information available \"as is\", and do not guarantee its accuracy. By using\n# Whois, you agree that you will use these data only for legal purposes and\n# that, under no circumstances will you use this data to: (1) Allow, enable,\n# or otherwise support the transmission of mass unsolicited, commercial\n# advertisement or roughly or requests via the individual mail (courier),\n# the E-mail (SPAM), by telephone or by fax. (2) Enable high volume, automated,\n# electronic processes that apply to OVH Sas (or its computer systems).\n# The copy, the compilation, the re-packaging, the dissemination or the\n# other use of the Whois base is expressly forbidden without the prior\n# written consent of OVH. Domain ownership disputes should be settled using\n# ICANN's Uniform Dispute Resolution Policy: http://www.icann.org/udrp/udrp.htm\n# We reserve the right to modify these terms at any time. By submitting\n# this query, you agree to abide by these terms. OVH Sas reserves the right\n# to terminate your access to the OVH Sas Whois database in its sole\n# discretion, including without limitation, for excessive querying of\n# the Whois database or for failure to otherwise abide by this policy.\n#\n# L'outil du Whois est \u00e0 votre disposition dans le but de vous fournir\n# l'information seulement, c'est-\u00e0-dire vous aider dans l'obtention de\n# l'information sur ou li\u00e9 \u00e0 un rapport d'enregistrement de nom de domaine.\n# OVH Sas rend cette information disponible \"comme est,\" et ne garanti pas\n# son exactitude. En utilisant notre outil Whois, vous reconnaissez que vous\n# emploierez ces donn\u00e9es seulement pour des buts l\u00e9gaux et ne pas utiliser cet\n# outil dans les buts suivant: (1) la transmission de publicit\u00e9 non sollicit\u00e9e,\n# commerciale massive ou en gros ou des sollicitations via courrier individuel,\n# le courrier \u00e9lectronique (c'est-\u00e0-dire SPAM), par t\u00e9l\u00e9phone ou par fax. (2)\n# l'utilisation d'un grand volume, automatis\u00e9 des processus \u00e9lectroniques qui\n# soulignent ou chargent ce syst\u00e8me de base de donn\u00e9es Whois vous fournissant\n# cette information. La copie de tout ou partie, la compilation, le\n# re-emballage, la diss\u00e9mination ou d'autre utilisation de la base Whois sont\n# express\u00e9ment interdits sans consentement \u00e9crit ant\u00e9rieur de OVH. Un d\u00e9saccord\n# sur la possession d'un nom de domaine peut \u00eatre r\u00e9solu en suivant la Uniform\n# Dispute Resolution Policy de l'ICANN: http://www.icann.org/udrp/udrp.htm\n# Nous nous r\u00e9servons le droit de modifier ces termes \u00e0 tout moment. En\n# soumettant une requ\u00eate au Whois vous consentez \u00e0 vous soumettre \u00e0 ces termes.\n\n# local time : Wednesday, 20-Nov-2013 09:27:14 CET\n# gmt time : Wednesday, 20-Nov-2013 08:27:14 GMT\n# last modify : Saturday, 12-Oct-2013 12:38:49 CEST\n# request from : 192.168.244.150:25929\n\nDomain name: huskeh.net\n\nRegistrant:\n Poulton Sam\n huskeh.net, office #5075960\n c/o OwO, BP80157\n 59053, Roubaix Cedex 1\n FR\n +33.899498765\n 0vdudcszg7joly3irb2u@e.o-w-o.info\n\nAdministrative Contact:\n Poulton Sam\n huskeh.net, office #5075960\n c/o OwO, BP80157\n 59053, Roubaix Cedex 1\n FR\n +33.899498765\n mtv1ufny8x589jxnfcsx@c.o-w-o.info\n\nTechnical Contact:\n Poulton Sam\n huskeh.net, office #5075960\n c/o OwO, BP80157\n 59053, Roubaix Cedex 1\n FR\n +33.899498765\n mtv1ufny8x589jxnfcsx@c.o-w-o.info\n\nBilling Contact:\n Poulton Sam\n huskeh.net, office #5075960\n c/o OwO, BP80157\n 59053, Roubaix Cedex 1\n FR\n +33.899498765\n mtv1ufny8x589jxnfcsx@c.o-w-o.info\n\nRegistrar of Record: OVH.\nRecord last updated on 2013-09-18.\nRecord expires on 2014-09-29.\nRecord created on 2009-09-29.\n\n###############################################################################\n# powered by GNU/Linux\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: HUSKEH.NET\n Registrar: OVH\n Whois Server: whois.ovh.com\n Referral URL: http://www.ovh.com\n Name Server: NS1.SLPHOSTS.CO.UK\n Name Server: NS2.SLPHOSTS.CO.UK\n Status: clientDeleteProhibited\n Status: clientTransferProhibited\n Updated Date: 18-sep-2013\n Creation Date: 29-sep-2009\n Expiration Date: 29-sep-2014\n\n>>> Last update of whois database: Wed, 20 Nov 2013 08:26:33 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.ovh.com"], "registrar": ["OVH."], "name_servers": ["NS1.SLPHOSTS.CO.UK", "NS2.SLPHOSTS.CO.UK"], "emails": []}
\ No newline at end of file
+{"updated_date": ["2013-09-18T00:00:00"], "status": ["clientDeleteProhibited", "clientTransferProhibited"], "contacts": {"admin": {"city": "Roubaix Cedex 1", "name": "Poulton Sam", "phone": "+33.899498765", "street": "huskeh.net, office #5075960\nc/o OwO, BP80157", "country": "FR", "postalcode": "59053", "email": "mtv1ufny8x589jxnfcsx@c.o-w-o.info"}, "tech": {"city": "Roubaix Cedex 1", "name": "Poulton Sam", "phone": "+33.899498765", "street": "huskeh.net, office #5075960\nc/o OwO, BP80157", "country": "FR", "postalcode": "59053", "email": "mtv1ufny8x589jxnfcsx@c.o-w-o.info"}, "registrant": {"city": "Roubaix Cedex 1", "name": "Poulton Sam", "phone": "+33.899498765", "street": "huskeh.net, office #5075960\nc/o OwO, BP80157", "country": "FR", "postalcode": "59053", "email": "0vdudcszg7joly3irb2u@e.o-w-o.info"}, "billing": {"city": "Roubaix Cedex 1", "name": "Poulton Sam", "phone": "+33.899498765", "street": "huskeh.net, office #5075960\nc/o OwO, BP80157", "country": "FR", "postalcode": "59053", "email": "mtv1ufny8x589jxnfcsx@c.o-w-o.info"}}, "nameservers": ["NS1.SLPHOSTS.CO.UK", "NS2.SLPHOSTS.CO.UK"], "expiration_date": ["2014-09-29T00:00:00", "2014-09-29T00:00:00"], "creation_date": ["2009-09-29T00:00:00", "2009-09-29T00:00:00"], "raw": ["###############################################################################\n#\n# Welcome to the OVH WHOIS Server.\n# \n# whois server : whois.ovh.com check server : check.ovh.com\n# \n# The data in this Whois is at your disposal with the aim of supplying you the\n# information only, that is helping you in the obtaining of the information\n# about or related to a domain name registration record. OVH Sas make this\n# information available \"as is\", and do not guarantee its accuracy. By using\n# Whois, you agree that you will use these data only for legal purposes and\n# that, under no circumstances will you use this data to: (1) Allow, enable,\n# or otherwise support the transmission of mass unsolicited, commercial\n# advertisement or roughly or requests via the individual mail (courier),\n# the E-mail (SPAM), by telephone or by fax. (2) Enable high volume, automated,\n# electronic processes that apply to OVH Sas (or its computer systems).\n# The copy, the compilation, the re-packaging, the dissemination or the\n# other use of the Whois base is expressly forbidden without the prior\n# written consent of OVH. Domain ownership disputes should be settled using\n# ICANN's Uniform Dispute Resolution Policy: http://www.icann.org/udrp/udrp.htm\n# We reserve the right to modify these terms at any time. By submitting\n# this query, you agree to abide by these terms. OVH Sas reserves the right\n# to terminate your access to the OVH Sas Whois database in its sole\n# discretion, including without limitation, for excessive querying of\n# the Whois database or for failure to otherwise abide by this policy.\n#\n# L'outil du Whois est \u00e0 votre disposition dans le but de vous fournir\n# l'information seulement, c'est-\u00e0-dire vous aider dans l'obtention de\n# l'information sur ou li\u00e9 \u00e0 un rapport d'enregistrement de nom de domaine.\n# OVH Sas rend cette information disponible \"comme est,\" et ne garanti pas\n# son exactitude. En utilisant notre outil Whois, vous reconnaissez que vous\n# emploierez ces donn\u00e9es seulement pour des buts l\u00e9gaux et ne pas utiliser cet\n# outil dans les buts suivant: (1) la transmission de publicit\u00e9 non sollicit\u00e9e,\n# commerciale massive ou en gros ou des sollicitations via courrier individuel,\n# le courrier \u00e9lectronique (c'est-\u00e0-dire SPAM), par t\u00e9l\u00e9phone ou par fax. (2)\n# l'utilisation d'un grand volume, automatis\u00e9 des processus \u00e9lectroniques qui\n# soulignent ou chargent ce syst\u00e8me de base de donn\u00e9es Whois vous fournissant\n# cette information. La copie de tout ou partie, la compilation, le\n# re-emballage, la diss\u00e9mination ou d'autre utilisation de la base Whois sont\n# express\u00e9ment interdits sans consentement \u00e9crit ant\u00e9rieur de OVH. Un d\u00e9saccord\n# sur la possession d'un nom de domaine peut \u00eatre r\u00e9solu en suivant la Uniform\n# Dispute Resolution Policy de l'ICANN: http://www.icann.org/udrp/udrp.htm\n# Nous nous r\u00e9servons le droit de modifier ces termes \u00e0 tout moment. En\n# soumettant une requ\u00eate au Whois vous consentez \u00e0 vous soumettre \u00e0 ces termes.\n\n# local time : Wednesday, 20-Nov-2013 09:27:14 CET\n# gmt time : Wednesday, 20-Nov-2013 08:27:14 GMT\n# last modify : Saturday, 12-Oct-2013 12:38:49 CEST\n# request from : 192.168.244.150:25929\n\nDomain name: huskeh.net\n\nRegistrant:\n Poulton Sam\n huskeh.net, office #5075960\n c/o OwO, BP80157\n 59053, Roubaix Cedex 1\n FR\n +33.899498765\n 0vdudcszg7joly3irb2u@e.o-w-o.info\n\nAdministrative Contact:\n Poulton Sam\n huskeh.net, office #5075960\n c/o OwO, BP80157\n 59053, Roubaix Cedex 1\n FR\n +33.899498765\n mtv1ufny8x589jxnfcsx@c.o-w-o.info\n\nTechnical Contact:\n Poulton Sam\n huskeh.net, office #5075960\n c/o OwO, BP80157\n 59053, Roubaix Cedex 1\n FR\n +33.899498765\n mtv1ufny8x589jxnfcsx@c.o-w-o.info\n\nBilling Contact:\n Poulton Sam\n huskeh.net, office #5075960\n c/o OwO, BP80157\n 59053, Roubaix Cedex 1\n FR\n +33.899498765\n mtv1ufny8x589jxnfcsx@c.o-w-o.info\n\nRegistrar of Record: OVH.\nRecord last updated on 2013-09-18.\nRecord expires on 2014-09-29.\nRecord created on 2009-09-29.\n\n###############################################################################\n# powered by GNU/Linux\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: HUSKEH.NET\n Registrar: OVH\n Whois Server: whois.ovh.com\n Referral URL: http://www.ovh.com\n Name Server: NS1.SLPHOSTS.CO.UK\n Name Server: NS2.SLPHOSTS.CO.UK\n Status: clientDeleteProhibited\n Status: clientTransferProhibited\n Updated Date: 18-sep-2013\n Creation Date: 29-sep-2009\n Expiration Date: 29-sep-2014\n\n>>> Last update of whois database: Wed, 20 Nov 2013 08:26:33 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.ovh.com"], "registrar": ["OVH."]}
\ No newline at end of file
diff --git a/test/target_default/keybase.io b/test/target_default/keybase.io
index 4dfa1a9..ddd060a 100644
--- a/test/target_default/keybase.io
+++ b/test/target_default/keybase.io
@@ -1 +1 @@
-{"status": ["Live"], "updated_date": null, "contacts": {"admin": null, "tech": null, "registrant": {"city": "New York", "name": "Krohn, Maxwell", "country": "United States", "state": "NY", "street": "902 Broadway, 4th Floor", "organization": "CrashMix.org"}, "billing": null}, "expiration_date": ["2014-09-06T00:00:00"], "emails": null, "raw": ["\nDomain : keybase.io\nStatus : Live\nExpiry : 2014-09-06\n\nNS 1 : ns-1016.awsdns-63.net\nNS 2 : ns-1722.awsdns-23.co.uk\nNS 3 : ns-1095.awsdns-08.org\nNS 4 : ns-337.awsdns-42.com\n\nOwner : Krohn, Maxwell\n : CrashMix.org\n : 902 Broadway, 4th Floor\n : New York\n : NY\n : United States\n\n\n"], "whois_server": null, "registrar": null, "name_servers": ["ns-1016.awsdns-63.net", "ns-1722.awsdns-23.co.uk", "ns-1095.awsdns-08.org", "ns-337.awsdns-42.com"], "creation_date": null, "id": null}
\ No newline at end of file
+{"status": ["Live"], "nameservers": ["ns-1016.awsdns-63.net", "ns-1722.awsdns-23.co.uk", "ns-1095.awsdns-08.org", "ns-337.awsdns-42.com"], "raw": ["\nDomain : keybase.io\nStatus : Live\nExpiry : 2014-09-06\n\nNS 1 : ns-1016.awsdns-63.net\nNS 2 : ns-1722.awsdns-23.co.uk\nNS 3 : ns-1095.awsdns-08.org\nNS 4 : ns-337.awsdns-42.com\n\nOwner : Krohn, Maxwell\n : CrashMix.org\n : 902 Broadway, 4th Floor\n : New York\n : NY\n : United States\n\n\n"], "contacts": {"admin": null, "tech": null, "registrant": {"city": "New York", "name": "Krohn, Maxwell", "country": "United States", "state": "NY", "street": "902 Broadway, 4th Floor", "organization": "CrashMix.org"}, "billing": null}, "expiration_date": ["2014-09-06T00:00:00"]}
\ No newline at end of file
diff --git a/test/target_default/linux.conf.au b/test/target_default/linux.conf.au
index a151047..9cf6fdc 100644
--- a/test/target_default/linux.conf.au
+++ b/test/target_default/linux.conf.au
@@ -1 +1 @@
-{"status": ["serverUpdateProhibited (Regulator Domain)", "serverTransferProhibited (Regulator Domain)", "serverDeleteProhibited (Regulator Domain)", "serverRenewProhibited (Regulator Domain)"], "updated_date": ["2011-04-29T09:22:00"], "contacts": {"admin": null, "tech": {"handle": "C28042011", "name": "Stephen Walsh"}, "registrant": {"organization": ".au Domain Administration Ltd", "handle": "C28042011", "name": "Stephen Walsh"}, "billing": null}, "expiration_date": null, "emails": null, "raw": ["Domain Name: linux.conf.au\nLast Modified: 29-Apr-2011 09:22:00 UTC\nRegistrar ID: auDA\nRegistrar Name: auDA\nStatus: serverUpdateProhibited (Regulator Domain)\nStatus: serverTransferProhibited (Regulator Domain)\nStatus: serverDeleteProhibited (Regulator Domain)\nStatus: serverRenewProhibited (Regulator Domain)\n\nRegistrant: .au Domain Administration Ltd\nRegistrant ID: OTHER 079 009 340\nEligibility Type: Other\n\nRegistrant Contact ID: C28042011\nRegistrant Contact Name: Stephen Walsh\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: C28042011\nTech Contact Name: Stephen Walsh\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: russell.linux.org.au\nName Server IP: 202.158.218.245\nName Server: daedalus.andrew.net.au\n\n"], "whois_server": null, "registrar": ["auDA"], "name_servers": ["russell.linux.org.au", "daedalus.andrew.net.au"], "creation_date": null, "id": null}
\ No newline at end of file
+{"status": ["serverUpdateProhibited (Regulator Domain)", "serverTransferProhibited (Regulator Domain)", "serverDeleteProhibited (Regulator Domain)", "serverRenewProhibited (Regulator Domain)"], "updated_date": ["2011-04-29T09:22:00"], "contacts": {"admin": null, "tech": {"handle": "C28042011", "name": "Stephen Walsh"}, "registrant": {"organization": ".au Domain Administration Ltd", "handle": "C28042011", "name": "Stephen Walsh"}, "billing": null}, "nameservers": ["russell.linux.org.au", "daedalus.andrew.net.au"], "raw": ["Domain Name: linux.conf.au\nLast Modified: 29-Apr-2011 09:22:00 UTC\nRegistrar ID: auDA\nRegistrar Name: auDA\nStatus: serverUpdateProhibited (Regulator Domain)\nStatus: serverTransferProhibited (Regulator Domain)\nStatus: serverDeleteProhibited (Regulator Domain)\nStatus: serverRenewProhibited (Regulator Domain)\n\nRegistrant: .au Domain Administration Ltd\nRegistrant ID: OTHER 079 009 340\nEligibility Type: Other\n\nRegistrant Contact ID: C28042011\nRegistrant Contact Name: Stephen Walsh\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: C28042011\nTech Contact Name: Stephen Walsh\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: russell.linux.org.au\nName Server IP: 202.158.218.245\nName Server: daedalus.andrew.net.au\n\n"], "registrar": ["auDA"]}
\ No newline at end of file
diff --git a/test/target_default/lowendbox.com b/test/target_default/lowendbox.com
index 864d501..584da47 100644
--- a/test/target_default/lowendbox.com
+++ b/test/target_default/lowendbox.com
@@ -1 +1 @@
-{"updated_date": ["2012-12-20T00:18:28"], "status": ["clientDeleteProhibited", "clientRenewProhibited", "clientTransferProhibited", "clientUpdateProhibited"], "contacts": {"admin": {"city": "Scottsdale", "fax": "(480) 624-2598", "name": "Registration Private", "state": "Arizona", "phone": "(480) 624-2599", "street": "DomainsByProxy.com\n14747 N Northsight Blvd Suite 111, PMB 309", "country": "United States", "postalcode": "85260", "organization": "Domains By Proxy, LLC", "email": "LOWENDBOX.COM@domainsbyproxy.com"}, "tech": {"city": "Scottsdale", "fax": "(480) 624-2598", "name": "Registration Private", "state": "Arizona", "phone": "(480) 624-2599", "street": "DomainsByProxy.com\n14747 N Northsight Blvd Suite 111, PMB 309", "country": "United States", "postalcode": "85260", "organization": "Domains By Proxy, LLC", "email": "LOWENDBOX.COM@domainsbyproxy.com"}, "registrant": {"city": "Scottsdale", "name": "Registration Private", "state": "Arizona", "street": "DomainsByProxy.com\n14747 N Northsight Blvd Suite 111, PMB 309", "country": "United States", "postalcode": "85260", "organization": "Domains By Proxy, LLC"}, "billing": null}, "expiration_date": ["2015-02-01T00:39:38"], "id": null, "creation_date": ["2008-02-01T00:39:38"], "raw": ["Domain Name: LOWENDBOX.COM\nRegistrar URL: http://www.godaddy.com\nUpdated Date: 2012-12-20 00:18:28\nCreation Date: 2008-02-01 00:39:38\nRegistrar Expiration Date: 2015-02-01 00:39:38\nRegistrar: GoDaddy.com, LLC\nRegistrant Name: Registration Private\nRegistrant Organization: Domains By Proxy, LLC\nRegistrant Street: DomainsByProxy.com\nRegistrant Street: 14747 N Northsight Blvd Suite 111, PMB 309\nRegistrant City: Scottsdale\nRegistrant State/Province: Arizona\nRegistrant Postal Code: 85260\nRegistrant Country: United States\nAdmin Name: Registration Private\nAdmin Organization: Domains By Proxy, LLC\nAdmin Street: DomainsByProxy.com\nAdmin Street: 14747 N Northsight Blvd Suite 111, PMB 309\nAdmin City: Scottsdale\nAdmin State/Province: Arizona\nAdmin Postal Code: 85260\nAdmin Country: United States\nAdmin Phone: (480) 624-2599\nAdmin Fax: (480) 624-2598\nAdmin Email: LOWENDBOX.COM@domainsbyproxy.com\nTech Name: Registration Private\nTech Organization: Domains By Proxy, LLC\nTech Street: DomainsByProxy.com\nTech Street: 14747 N Northsight Blvd Suite 111, PMB 309\nTech City: Scottsdale\nTech State/Province: Arizona\nTech Postal Code: 85260\nTech Country: United States\nTech Phone: (480) 624-2599\nTech Fax: (480) 624-2598\nTech Email: LOWENDBOX.COM@domainsbyproxy.com\nName Server: RUTH.NS.CLOUDFLARE.COM\nName Server: KEN.NS.CLOUDFLARE.COM\n\n****************************************************\nSee Business Registration Listing\n****************************************************\nCopy and paste the link below to view additional details:\nhttp://who.godaddy.com/whoischeck.aspx?domain=LOWENDBOX.COM\n\nThe data contained in GoDaddy.com, LLC's WhoIs database,\nwhile believed by the company to be reliable, is provided \"as is\"\nwith no guarantee or warranties regarding its accuracy. This\ninformation is provided for the sole purpose of assisting you\nin obtaining information about domain name registration records.\nAny use of this data for any other purpose is expressly forbidden without the prior written\npermission of GoDaddy.com, LLC. By submitting an inquiry,\nyou agree to these terms of usage and limitations of warranty. In particular,\nyou agree not to use this data to allow, enable, or otherwise make possible,\ndissemination or collection of this data, in part or in its entirety, for any\npurpose, such as the transmission of unsolicited advertising and\nand solicitations of any kind, including spam. You further agree\nnot to use this data to enable high volume, automated or robotic electronic\nprocesses designed to collect or compile this data for any purpose,\nincluding mining this data for your own personal or commercial purposes. \n\nPlease note: the registrant of the domain name is specified\nin the \"registrant\" section. In most cases, GoDaddy.com, LLC \nis not the registrant of domain names listed in this database.\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: LOWENDBOX.COM\n Registrar: GODADDY.COM, LLC\n Whois Server: whois.godaddy.com\n Referral URL: http://registrar.godaddy.com\n Name Server: KEN.NS.CLOUDFLARE.COM\n Name Server: RUTH.NS.CLOUDFLARE.COM\n Status: clientDeleteProhibited\n Status: clientRenewProhibited\n Status: clientTransferProhibited\n Status: clientUpdateProhibited\n Updated Date: 20-dec-2012\n Creation Date: 01-feb-2008\n Expiration Date: 01-feb-2015\n\n>>> Last update of whois database: Wed, 20 Nov 2013 10:14:17 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.godaddy.com"], "registrar": ["GoDaddy.com, LLC"], "name_servers": ["RUTH.NS.CLOUDFLARE.COM", "KEN.NS.CLOUDFLARE.COM"], "emails": []}
\ No newline at end of file
+{"updated_date": ["2012-12-20T00:18:28"], "status": ["clientDeleteProhibited", "clientRenewProhibited", "clientTransferProhibited", "clientUpdateProhibited"], "contacts": {"admin": {"city": "Scottsdale", "fax": "(480) 624-2598", "name": "Registration Private", "state": "Arizona", "phone": "(480) 624-2599", "street": "DomainsByProxy.com\n14747 N Northsight Blvd Suite 111, PMB 309", "country": "United States", "postalcode": "85260", "organization": "Domains By Proxy, LLC", "email": "LOWENDBOX.COM@domainsbyproxy.com"}, "tech": {"city": "Scottsdale", "fax": "(480) 624-2598", "name": "Registration Private", "state": "Arizona", "phone": "(480) 624-2599", "street": "DomainsByProxy.com\n14747 N Northsight Blvd Suite 111, PMB 309", "country": "United States", "postalcode": "85260", "organization": "Domains By Proxy, LLC", "email": "LOWENDBOX.COM@domainsbyproxy.com"}, "registrant": {"city": "Scottsdale", "name": "Registration Private", "state": "Arizona", "street": "DomainsByProxy.com\n14747 N Northsight Blvd Suite 111, PMB 309", "country": "United States", "postalcode": "85260", "organization": "Domains By Proxy, LLC"}, "billing": null}, "nameservers": ["RUTH.NS.CLOUDFLARE.COM", "KEN.NS.CLOUDFLARE.COM"], "expiration_date": ["2015-02-01T00:39:38"], "creation_date": ["2008-02-01T00:39:38"], "raw": ["Domain Name: LOWENDBOX.COM\nRegistrar URL: http://www.godaddy.com\nUpdated Date: 2012-12-20 00:18:28\nCreation Date: 2008-02-01 00:39:38\nRegistrar Expiration Date: 2015-02-01 00:39:38\nRegistrar: GoDaddy.com, LLC\nRegistrant Name: Registration Private\nRegistrant Organization: Domains By Proxy, LLC\nRegistrant Street: DomainsByProxy.com\nRegistrant Street: 14747 N Northsight Blvd Suite 111, PMB 309\nRegistrant City: Scottsdale\nRegistrant State/Province: Arizona\nRegistrant Postal Code: 85260\nRegistrant Country: United States\nAdmin Name: Registration Private\nAdmin Organization: Domains By Proxy, LLC\nAdmin Street: DomainsByProxy.com\nAdmin Street: 14747 N Northsight Blvd Suite 111, PMB 309\nAdmin City: Scottsdale\nAdmin State/Province: Arizona\nAdmin Postal Code: 85260\nAdmin Country: United States\nAdmin Phone: (480) 624-2599\nAdmin Fax: (480) 624-2598\nAdmin Email: LOWENDBOX.COM@domainsbyproxy.com\nTech Name: Registration Private\nTech Organization: Domains By Proxy, LLC\nTech Street: DomainsByProxy.com\nTech Street: 14747 N Northsight Blvd Suite 111, PMB 309\nTech City: Scottsdale\nTech State/Province: Arizona\nTech Postal Code: 85260\nTech Country: United States\nTech Phone: (480) 624-2599\nTech Fax: (480) 624-2598\nTech Email: LOWENDBOX.COM@domainsbyproxy.com\nName Server: RUTH.NS.CLOUDFLARE.COM\nName Server: KEN.NS.CLOUDFLARE.COM\n\n****************************************************\nSee Business Registration Listing\n****************************************************\nCopy and paste the link below to view additional details:\nhttp://who.godaddy.com/whoischeck.aspx?domain=LOWENDBOX.COM\n\nThe data contained in GoDaddy.com, LLC's WhoIs database,\nwhile believed by the company to be reliable, is provided \"as is\"\nwith no guarantee or warranties regarding its accuracy. This\ninformation is provided for the sole purpose of assisting you\nin obtaining information about domain name registration records.\nAny use of this data for any other purpose is expressly forbidden without the prior written\npermission of GoDaddy.com, LLC. By submitting an inquiry,\nyou agree to these terms of usage and limitations of warranty. In particular,\nyou agree not to use this data to allow, enable, or otherwise make possible,\ndissemination or collection of this data, in part or in its entirety, for any\npurpose, such as the transmission of unsolicited advertising and\nand solicitations of any kind, including spam. You further agree\nnot to use this data to enable high volume, automated or robotic electronic\nprocesses designed to collect or compile this data for any purpose,\nincluding mining this data for your own personal or commercial purposes. \n\nPlease note: the registrant of the domain name is specified\nin the \"registrant\" section. In most cases, GoDaddy.com, LLC \nis not the registrant of domain names listed in this database.\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: LOWENDBOX.COM\n Registrar: GODADDY.COM, LLC\n Whois Server: whois.godaddy.com\n Referral URL: http://registrar.godaddy.com\n Name Server: KEN.NS.CLOUDFLARE.COM\n Name Server: RUTH.NS.CLOUDFLARE.COM\n Status: clientDeleteProhibited\n Status: clientRenewProhibited\n Status: clientTransferProhibited\n Status: clientUpdateProhibited\n Updated Date: 20-dec-2012\n Creation Date: 01-feb-2008\n Expiration Date: 01-feb-2015\n\n>>> Last update of whois database: Wed, 20 Nov 2013 10:14:17 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.godaddy.com"], "registrar": ["GoDaddy.com, LLC"]}
\ No newline at end of file
diff --git a/test/target_default/lowendshare.com b/test/target_default/lowendshare.com
index 9ec12bd..8d53435 100644
--- a/test/target_default/lowendshare.com
+++ b/test/target_default/lowendshare.com
@@ -1 +1 @@
-{"status": ["clientTransferProhibited"], "updated_date": ["2013-08-30T00:00:00", "2013-11-23T13:55:04"], "contacts": {"admin": {"city": "Panama", "name": "Domain Administrator", "country": "Panama", "phone": "+507.65995877", "street": "Attn: lowendshare.com\nAptds. 0850-00056", "postalcode": "Zona 15", "organization": "Fundacion Private Whois", "email": "522ff121nsq4zosx@5225b4d0pi3627q9.privatewhois.net"}, "tech": {"city": "Panama", "name": "Domain Administrator", "country": "Panama", "phone": "+507.65995877", "street": "Attn: lowendshare.com\nAptds. 0850-00056", "postalcode": "Zona 15", "organization": "Fundacion Private Whois", "email": "522ff121vt0xukg2@5225b4d0pi3627q9.privatewhois.net"}, "registrant": {"city": "Panama", "name": "Domain Administrator", "country": "Panama", "phone": "+507.65995877", "street": "Attn: lowendshare.com\nAptds. 0850-00056", "postalcode": "Zona 15", "organization": "Fundacion Private Whois", "email": "522ff120qi9mqlng@5225b4d0pi3627q9.privatewhois.net"}, "billing": null}, "expiration_date": ["2014-07-13T00:00:00"], "id": null, "creation_date": ["2012-07-13T00:00:00"], "raw": ["Domain lowendshare.com\n\nDate Registered: 2012-7-13\nExpiry Date: 2014-7-13\n\nDNS1: ns10.dns4pro.at\nDNS2: ns20.dns4pro.at\nDNS3: ns30.dns4pro.at\n\nRegistrant\n Fundacion Private Whois\n Domain Administrator\n Email:522ff120qi9mqlng@5225b4d0pi3627q9.privatewhois.net\n Attn: lowendshare.com\n Aptds. 0850-00056\n Zona 15 Panama\n Panama\n Tel: +507.65995877\n\nAdministrative Contact\n Fundacion Private Whois\n Domain Administrator\n Email:522ff121nsq4zosx@5225b4d0pi3627q9.privatewhois.net\n Attn: lowendshare.com\n Aptds. 0850-00056\n Zona 15 Panama\n Panama\n Tel: +507.65995877\n\nTechnical Contact\n Fundacion Private Whois\n Domain Administrator\n Email:522ff121vt0xukg2@5225b4d0pi3627q9.privatewhois.net\n Attn: lowendshare.com\n Aptds. 0850-00056\n Zona 15 Panama\n Panama\n Tel: +507.65995877\n\nRegistrar: Internet.bs Corp.\nRegistrar's Website : http://www.internetbs.net/\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: LOWENDSHARE.COM\n Registrar: INTERNET.BS CORP.\n Whois Server: whois.internet.bs\n Referral URL: http://www.internet.bs\n Name Server: NS10.DNS4PRO.AT\n Name Server: NS20.DNS4PRO.AT\n Name Server: NS30.DNS4PRO.AT\n Status: clientTransferProhibited\n Updated Date: 30-aug-2013\n Creation Date: 13-jul-2012\n Expiration Date: 13-jul-2014\n\n>>> Last update of whois database: Sat, 23 Nov 2013 13:55:04 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.internet.bs"], "registrar": ["Internet.bs Corp."], "name_servers": ["ns10.dns4pro.at", "ns20.dns4pro.at", "ns30.dns4pro.at"], "emails": []}
\ No newline at end of file
+{"status": ["clientTransferProhibited"], "updated_date": ["2013-08-30T00:00:00", "2013-11-23T13:55:04"], "contacts": {"admin": {"city": "Panama", "name": "Domain Administrator", "country": "Panama", "phone": "+507.65995877", "street": "Attn: lowendshare.com\nAptds. 0850-00056", "postalcode": "Zona 15", "organization": "Fundacion Private Whois", "email": "522ff121nsq4zosx@5225b4d0pi3627q9.privatewhois.net"}, "tech": {"city": "Panama", "name": "Domain Administrator", "country": "Panama", "phone": "+507.65995877", "street": "Attn: lowendshare.com\nAptds. 0850-00056", "postalcode": "Zona 15", "organization": "Fundacion Private Whois", "email": "522ff121vt0xukg2@5225b4d0pi3627q9.privatewhois.net"}, "registrant": {"city": "Panama", "name": "Domain Administrator", "country": "Panama", "phone": "+507.65995877", "street": "Attn: lowendshare.com\nAptds. 0850-00056", "postalcode": "Zona 15", "organization": "Fundacion Private Whois", "email": "522ff120qi9mqlng@5225b4d0pi3627q9.privatewhois.net"}, "billing": null}, "nameservers": ["ns10.dns4pro.at", "ns20.dns4pro.at", "ns30.dns4pro.at"], "expiration_date": ["2014-07-13T00:00:00"], "creation_date": ["2012-07-13T00:00:00"], "raw": ["Domain lowendshare.com\n\nDate Registered: 2012-7-13\nExpiry Date: 2014-7-13\n\nDNS1: ns10.dns4pro.at\nDNS2: ns20.dns4pro.at\nDNS3: ns30.dns4pro.at\n\nRegistrant\n Fundacion Private Whois\n Domain Administrator\n Email:522ff120qi9mqlng@5225b4d0pi3627q9.privatewhois.net\n Attn: lowendshare.com\n Aptds. 0850-00056\n Zona 15 Panama\n Panama\n Tel: +507.65995877\n\nAdministrative Contact\n Fundacion Private Whois\n Domain Administrator\n Email:522ff121nsq4zosx@5225b4d0pi3627q9.privatewhois.net\n Attn: lowendshare.com\n Aptds. 0850-00056\n Zona 15 Panama\n Panama\n Tel: +507.65995877\n\nTechnical Contact\n Fundacion Private Whois\n Domain Administrator\n Email:522ff121vt0xukg2@5225b4d0pi3627q9.privatewhois.net\n Attn: lowendshare.com\n Aptds. 0850-00056\n Zona 15 Panama\n Panama\n Tel: +507.65995877\n\nRegistrar: Internet.bs Corp.\nRegistrar's Website : http://www.internetbs.net/\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: LOWENDSHARE.COM\n Registrar: INTERNET.BS CORP.\n Whois Server: whois.internet.bs\n Referral URL: http://www.internet.bs\n Name Server: NS10.DNS4PRO.AT\n Name Server: NS20.DNS4PRO.AT\n Name Server: NS30.DNS4PRO.AT\n Status: clientTransferProhibited\n Updated Date: 30-aug-2013\n Creation Date: 13-jul-2012\n Expiration Date: 13-jul-2014\n\n>>> Last update of whois database: Sat, 23 Nov 2013 13:55:04 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.internet.bs"], "registrar": ["Internet.bs Corp."]}
\ No newline at end of file
diff --git a/test/target_default/microsoft.com b/test/target_default/microsoft.com
index aab32dc..1223d33 100644
--- a/test/target_default/microsoft.com
+++ b/test/target_default/microsoft.com
@@ -1 +1 @@
-{"status": ["clientUpdateProhibited", "clientTransferProhibited", "clientDeleteProhibited"], "updated_date": ["2013-08-11T04:00:51"], "contacts": {"admin": {"city": "Redmond", "fax": "+1.4259367329", "name": "Domain Administrator", "state": "WA", "phone": "+1.4258828080", "street": "One Microsoft Way,", "country": "US", "postalcode": "98052", "organization": "Microsoft Corporation", "email": "domains@microsoft.com"}, "tech": {"city": "Redmond", "fax": "+1.4259367329", "name": "MSN Hostmaster", "state": "WA", "phone": "+1.4258828080", "street": "One Microsoft Way,", "country": "US", "postalcode": "98052", "organization": "Microsoft Corporation", "email": "msnhst@microsoft.com"}, "registrant": {"city": "Redmond", "fax": "+1.4259367329", "name": "Domain Administrator", "state": "WA", "phone": "+1.4258828080", "street": "One Microsoft Way,", "country": "US", "postalcode": "98052", "organization": "Microsoft Corporation", "email": "domains@microsoft.com"}, "billing": null}, "expiration_date": ["2021-05-02T21:00:00", "2021-05-02T21:00:00"], "emails": ["compliance@markmonitor.com"], "raw": ["Domain Name: microsoft.com\nRegistry Domain ID: 2724960_DOMAIN_COM-VRSN\nRegistrar WHOIS Server: whois.markmonitor.com\nRegistrar URL: http://www.markmonitor.com\nUpdated Date: 2013-08-11T04:00:51-0700\nCreation Date: 2011-08-09T13:02:58-0700\nRegistrar Registration Expiration Date: 2021-05-02T21:00:00-0700\nRegistrar: MarkMonitor, Inc.\nRegistrar IANA ID: 292\nRegistrar Abuse Contact Email: compliance@markmonitor.com\nRegistrar Abuse Contact Phone: +1.2083895740\nDomain Status: clientUpdateProhibited\nDomain Status: clientTransferProhibited\nDomain Status: clientDeleteProhibited\nRegistry Registrant ID: \nRegistrant Name: Domain Administrator\nRegistrant Organization: Microsoft Corporation\nRegistrant Street: One Microsoft Way, \nRegistrant City: Redmond\nRegistrant State/Province: WA\nRegistrant Postal Code: 98052\nRegistrant Country: US\nRegistrant Phone: +1.4258828080\nRegistrant Phone Ext: \nRegistrant Fax: +1.4259367329\nRegistrant Fax Ext: \nRegistrant Email: domains@microsoft.com\nRegistry Admin ID: \nAdmin Name: Domain Administrator\nAdmin Organization: Microsoft Corporation\nAdmin Street: One Microsoft Way, \nAdmin City: Redmond\nAdmin State/Province: WA\nAdmin Postal Code: 98052\nAdmin Country: US\nAdmin Phone: +1.4258828080\nAdmin Phone Ext: \nAdmin Fax: +1.4259367329\nAdmin Fax Ext: \nAdmin Email: domains@microsoft.com\nRegistry Tech ID: \nTech Name: MSN Hostmaster\nTech Organization: Microsoft Corporation\nTech Street: One Microsoft Way, \nTech City: Redmond\nTech State/Province: WA\nTech Postal Code: 98052\nTech Country: US\nTech Phone: +1.4258828080\nTech Phone Ext: \nTech Fax: +1.4259367329\nTech Fax Ext: \nTech Email: msnhst@microsoft.com\nName Server: ns3.msft.net\nName Server: ns5.msft.net\nName Server: ns2.msft.net\nName Server: ns1.msft.net\nName Server: ns4.msft.net\nURL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/\n>>> Last update of WHOIS database: 2013-11-23T06:24:49-0800 <<<\n\nThe Data in MarkMonitor.com's WHOIS database is provided by MarkMonitor.com for\ninformation purposes, and to assist persons in obtaining information about or\nrelated to a domain name registration record. MarkMonitor.com does not guarantee\nits accuracy. By submitting a WHOIS query, you agree that you will use this Data\nonly for lawful purposes and that, under no circumstances will you use this Data to:\n (1) allow, enable, or otherwise support the transmission of mass unsolicited,\n commercial advertising or solicitations via e-mail (spam); or\n (2) enable high volume, automated, electronic processes that apply to\n MarkMonitor.com (or its systems).\nMarkMonitor.com reserves the right to modify these terms at any time.\nBy submitting this query, you agree to abide by this policy.\n\nMarkMonitor is the Global Leader in Online Brand Protection.\n\nMarkMonitor Domain Management(TM)\nMarkMonitor Brand Protection(TM)\nMarkMonitor AntiPiracy(TM)\nMarkMonitor AntiFraud(TM)\nProfessional and Managed Services\n\nVisit MarkMonitor at http://www.markmonitor.com\nContact us at +1.8007459229\nIn Europe, at +44.02032062220", "", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Server Name: MICROSOFT.COM.ZZZZZZZZZZZZZZZZZZZZZZ.IS.A.GREAT.COMPANY.ITREBAL.COM\n IP Address: 97.107.132.202\n Registrar: GANDI SAS\n Whois Server: whois.gandi.net\n Referral URL: http://www.gandi.net\n\n Server Name: MICROSOFT.COM.ZZZZZZZZZZZZZZZZZZZ.GET.ONE.MILLION.DOLLARS.AT.WWW.UNIMUNDI.COM\n IP Address: 209.126.190.70\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: MICROSOFT.COM.ZZZZZZZZZZZZZZZZZZ.IM.ELITE.WANNABE.TOO.WWW.PLUS613.NET\n IP Address: 64.251.18.228\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.ZZZZZZ.MORE.DETAILS.AT.WWW.BEYONDWHOIS.COM\n IP Address: 203.36.226.2\n Registrar: INSTRA CORPORATION PTY, LTD.\n Whois Server: whois.instra.net\n Referral URL: http://www.instra.com\n\n Server Name: MICROSOFT.COM.ZZZZZ.GET.LAID.AT.WWW.SWINGINGCOMMUNITY.COM\n IP Address: 69.41.185.194\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.ZZZOMBIED.AND.HACKED.BY.WWW.WEB-HACK.COM\n IP Address: 217.107.217.167\n Registrar: DOMAINCONTEXT, INC.\n Whois Server: whois.domaincontext.com\n Referral URL: http://www.domaincontext.com\n\n Server Name: MICROSOFT.COM.ZZZ.IS.0WNED.AND.HAX0RED.BY.SUB7.NET\n IP Address: 207.44.240.96\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.WILL.BE.SLAPPED.IN.THE.FACE.BY.MY.BLUE.VEINED.SPANNER.NET\n IP Address: 216.127.80.46\n Registrar: ASCIO TECHNOLOGIES, INC.\n Whois Server: whois.ascio.com\n Referral URL: http://www.ascio.com\n\n Server Name: MICROSOFT.COM.WILL.BE.BEATEN.WITH.MY.SPANNER.NET\n IP Address: 216.127.80.46\n Registrar: ASCIO TECHNOLOGIES, INC.\n Whois Server: whois.ascio.com\n Referral URL: http://www.ascio.com\n\n Server Name: MICROSOFT.COM.WAREZ.AT.TOPLIST.GULLI.COM\n IP Address: 80.190.192.33\n Registrar: CORE INTERNET COUNCIL OF REGISTRARS\n Whois Server: whois.corenic.net\n Referral URL: http://www.corenic.net\n\n Server Name: MICROSOFT.COM.THIS.IS.A.TEST.INETLIBRARY.NET\n IP Address: 173.161.23.178\n Registrar: GANDI SAS\n Whois Server: whois.gandi.net\n Referral URL: http://www.gandi.net\n\n Server Name: MICROSOFT.COM.SOFTWARE.IS.NOT.USED.AT.REG.RU\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n\n Server Name: MICROSOFT.COM.SHOULD.GIVE.UP.BECAUSE.LINUXISGOD.COM\n IP Address: 65.160.248.13\n Registrar: GKG.NET, INC.\n Whois Server: whois.gkg.net\n Referral URL: http://www.gkg.net\n\n Server Name: MICROSOFT.COM.RAWKZ.MUH.WERLD.MENTALFLOSS.CA\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.MORE.INFO.AT.WWW.BEYONDWHOIS.COM\n IP Address: 203.36.226.2\n Registrar: INSTRA CORPORATION PTY, LTD.\n Whois Server: whois.instra.net\n Referral URL: http://www.instra.com\n\n Server Name: MICROSOFT.COM.MATCHES.THIS.STRING.AT.KEYSIGNERS.COM\n IP Address: 85.10.240.254\n Registrar: HETZNER ONLINE AG\n Whois Server: whois.your-server.de\n Referral URL: http://www.hetzner.de\n\n Server Name: MICROSOFT.COM.MAKES.RICKARD.DRINK.SAMBUCA.0800CARRENTAL.COM\n IP Address: 209.85.135.106\n Registrar: KEY-SYSTEMS GMBH\n Whois Server: whois.rrpproxy.net\n Referral URL: http://www.key-systems.net\n\n Server Name: MICROSOFT.COM.LOVES.ME.KOSMAL.NET\n IP Address: 65.75.198.123\n Registrar: GODADDY.COM, LLC\n Whois Server: whois.godaddy.com\n Referral URL: http://registrar.godaddy.com\n\n Server Name: MICROSOFT.COM.LIVES.AT.SHAUNEWING.COM\n IP Address: 216.40.250.172\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.KNOWS.THAT.THE.BEST.WEB.HOSTING.IS.NASHHOST.NET\n IP Address: 78.47.16.44\n Registrar: CENTER OF UKRAINIAN INTERNET NAMES\n Whois Server: whois.ukrnames.com\n Referral URL: http://www.ukrnames.com\n\n Server Name: MICROSOFT.COM.IS.POWERED.BY.MIKROTIKA.V.OBSHTEJITIETO.OT.IBEKYAROV.UNIX-BG.COM\n IP Address: 84.22.26.98\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.IS.NOT.YEPPA.ORG\n Registrar: OVH\n Whois Server: whois.ovh.com\n Referral URL: http://www.ovh.com\n\n Server Name: MICROSOFT.COM.IS.NOT.HOSTED.BY.ACTIVEDOMAINDNS.NET\n IP Address: 217.148.161.5\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: MICROSOFT.COM.IS.IN.BED.WITH.CURTYV.COM\n IP Address: 216.55.187.193\n Registrar: HOSTOPIA.COM INC. D/B/A APLUS.NET\n Whois Server: whois.names4ever.com\n Referral URL: http://www.aplus.net\n\n Server Name: MICROSOFT.COM.IS.HOSTED.ON.PROFITHOSTING.NET\n IP Address: 66.49.213.213\n Registrar: NAME.COM, INC.\n Whois Server: whois.name.com\n Referral URL: http://www.name.com\n\n Server Name: MICROSOFT.COM.IS.A.STEAMING.HEAP.OF.FUCKING-BULLSHIT.NET\n IP Address: 63.99.165.11\n Registrar: 1 & 1 INTERNET AG\n Whois Server: whois.schlund.info\n Referral URL: http://1and1.com\n\n Server Name: MICROSOFT.COM.IS.A.MESS.TIMPORTER.CO.UK\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n\n Server Name: MICROSOFT.COM.HAS.A.PRESENT.COMING.FROM.HUGHESMISSILES.COM\n IP Address: 66.154.11.27\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.FILLS.ME.WITH.BELLIGERENCE.NET\n IP Address: 130.58.82.232\n Registrar: CPS-DATENSYSTEME GMBH\n Whois Server: whois.cps-datensysteme.de\n Referral URL: http://www.cps-datensysteme.de\n\n Server Name: MICROSOFT.COM.EENGURRA.COM\n IP Address: 184.168.46.68\n Registrar: GODADDY.COM, LLC\n Whois Server: whois.godaddy.com\n Referral URL: http://registrar.godaddy.com\n\n Server Name: MICROSOFT.COM.CAN.GO.FUCK.ITSELF.AT.SECZY.COM\n IP Address: 209.187.114.147\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.ARE.GODDAMN.PIGFUCKERS.NET.NS-NOT-IN-SERVICE.COM\n IP Address: 216.127.80.46\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Domain Name: MICROSOFT.COM\n Registrar: MARKMONITOR INC.\n Whois Server: whois.markmonitor.com\n Referral URL: http://www.markmonitor.com\n Name Server: NS1.MSFT.NET\n Name Server: NS2.MSFT.NET\n Name Server: NS3.MSFT.NET\n Name Server: NS4.MSFT.NET\n Name Server: NS5.MSFT.NET\n Status: clientDeleteProhibited\n Status: clientTransferProhibited\n Status: clientUpdateProhibited\n Status: serverDeleteProhibited\n Status: serverTransferProhibited\n Status: serverUpdateProhibited\n Updated Date: 09-aug-2011\n Creation Date: 02-may-1991\n Expiration Date: 03-may-2021\n\n>>> Last update of whois database: Sat, 23 Nov 2013 14:25:01 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.markmonitor.com"], "registrar": ["MarkMonitor, Inc."], "name_servers": ["ns3.msft.net", "ns5.msft.net", "ns2.msft.net", "ns1.msft.net", "ns4.msft.net"], "creation_date": ["2011-08-09T13:02:58"], "id": ["2724960_DOMAIN_COM-VRSN"]}
\ No newline at end of file
+{"status": ["clientUpdateProhibited", "clientTransferProhibited", "clientDeleteProhibited"], "updated_date": ["2013-08-11T04:00:51"], "contacts": {"admin": {"city": "Redmond", "fax": "+1.4259367329", "name": "Domain Administrator", "state": "WA", "phone": "+1.4258828080", "street": "One Microsoft Way,", "country": "US", "postalcode": "98052", "organization": "Microsoft Corporation", "email": "domains@microsoft.com"}, "tech": {"city": "Redmond", "fax": "+1.4259367329", "name": "MSN Hostmaster", "state": "WA", "phone": "+1.4258828080", "street": "One Microsoft Way,", "country": "US", "postalcode": "98052", "organization": "Microsoft Corporation", "email": "msnhst@microsoft.com"}, "registrant": {"city": "Redmond", "fax": "+1.4259367329", "name": "Domain Administrator", "state": "WA", "phone": "+1.4258828080", "street": "One Microsoft Way,", "country": "US", "postalcode": "98052", "organization": "Microsoft Corporation", "email": "domains@microsoft.com"}, "billing": null}, "nameservers": ["ns3.msft.net", "ns5.msft.net", "ns2.msft.net", "ns1.msft.net", "ns4.msft.net"], "expiration_date": ["2021-05-02T21:00:00", "2021-05-02T21:00:00"], "emails": ["compliance@markmonitor.com"], "raw": ["Domain Name: microsoft.com\nRegistry Domain ID: 2724960_DOMAIN_COM-VRSN\nRegistrar WHOIS Server: whois.markmonitor.com\nRegistrar URL: http://www.markmonitor.com\nUpdated Date: 2013-08-11T04:00:51-0700\nCreation Date: 2011-08-09T13:02:58-0700\nRegistrar Registration Expiration Date: 2021-05-02T21:00:00-0700\nRegistrar: MarkMonitor, Inc.\nRegistrar IANA ID: 292\nRegistrar Abuse Contact Email: compliance@markmonitor.com\nRegistrar Abuse Contact Phone: +1.2083895740\nDomain Status: clientUpdateProhibited\nDomain Status: clientTransferProhibited\nDomain Status: clientDeleteProhibited\nRegistry Registrant ID: \nRegistrant Name: Domain Administrator\nRegistrant Organization: Microsoft Corporation\nRegistrant Street: One Microsoft Way, \nRegistrant City: Redmond\nRegistrant State/Province: WA\nRegistrant Postal Code: 98052\nRegistrant Country: US\nRegistrant Phone: +1.4258828080\nRegistrant Phone Ext: \nRegistrant Fax: +1.4259367329\nRegistrant Fax Ext: \nRegistrant Email: domains@microsoft.com\nRegistry Admin ID: \nAdmin Name: Domain Administrator\nAdmin Organization: Microsoft Corporation\nAdmin Street: One Microsoft Way, \nAdmin City: Redmond\nAdmin State/Province: WA\nAdmin Postal Code: 98052\nAdmin Country: US\nAdmin Phone: +1.4258828080\nAdmin Phone Ext: \nAdmin Fax: +1.4259367329\nAdmin Fax Ext: \nAdmin Email: domains@microsoft.com\nRegistry Tech ID: \nTech Name: MSN Hostmaster\nTech Organization: Microsoft Corporation\nTech Street: One Microsoft Way, \nTech City: Redmond\nTech State/Province: WA\nTech Postal Code: 98052\nTech Country: US\nTech Phone: +1.4258828080\nTech Phone Ext: \nTech Fax: +1.4259367329\nTech Fax Ext: \nTech Email: msnhst@microsoft.com\nName Server: ns3.msft.net\nName Server: ns5.msft.net\nName Server: ns2.msft.net\nName Server: ns1.msft.net\nName Server: ns4.msft.net\nURL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/\n>>> Last update of WHOIS database: 2013-11-23T06:24:49-0800 <<<\n\nThe Data in MarkMonitor.com's WHOIS database is provided by MarkMonitor.com for\ninformation purposes, and to assist persons in obtaining information about or\nrelated to a domain name registration record. MarkMonitor.com does not guarantee\nits accuracy. By submitting a WHOIS query, you agree that you will use this Data\nonly for lawful purposes and that, under no circumstances will you use this Data to:\n (1) allow, enable, or otherwise support the transmission of mass unsolicited,\n commercial advertising or solicitations via e-mail (spam); or\n (2) enable high volume, automated, electronic processes that apply to\n MarkMonitor.com (or its systems).\nMarkMonitor.com reserves the right to modify these terms at any time.\nBy submitting this query, you agree to abide by this policy.\n\nMarkMonitor is the Global Leader in Online Brand Protection.\n\nMarkMonitor Domain Management(TM)\nMarkMonitor Brand Protection(TM)\nMarkMonitor AntiPiracy(TM)\nMarkMonitor AntiFraud(TM)\nProfessional and Managed Services\n\nVisit MarkMonitor at http://www.markmonitor.com\nContact us at +1.8007459229\nIn Europe, at +44.02032062220", "", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Server Name: MICROSOFT.COM.ZZZZZZZZZZZZZZZZZZZZZZ.IS.A.GREAT.COMPANY.ITREBAL.COM\n IP Address: 97.107.132.202\n Registrar: GANDI SAS\n Whois Server: whois.gandi.net\n Referral URL: http://www.gandi.net\n\n Server Name: MICROSOFT.COM.ZZZZZZZZZZZZZZZZZZZ.GET.ONE.MILLION.DOLLARS.AT.WWW.UNIMUNDI.COM\n IP Address: 209.126.190.70\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: MICROSOFT.COM.ZZZZZZZZZZZZZZZZZZ.IM.ELITE.WANNABE.TOO.WWW.PLUS613.NET\n IP Address: 64.251.18.228\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.ZZZZZZ.MORE.DETAILS.AT.WWW.BEYONDWHOIS.COM\n IP Address: 203.36.226.2\n Registrar: INSTRA CORPORATION PTY, LTD.\n Whois Server: whois.instra.net\n Referral URL: http://www.instra.com\n\n Server Name: MICROSOFT.COM.ZZZZZ.GET.LAID.AT.WWW.SWINGINGCOMMUNITY.COM\n IP Address: 69.41.185.194\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.ZZZOMBIED.AND.HACKED.BY.WWW.WEB-HACK.COM\n IP Address: 217.107.217.167\n Registrar: DOMAINCONTEXT, INC.\n Whois Server: whois.domaincontext.com\n Referral URL: http://www.domaincontext.com\n\n Server Name: MICROSOFT.COM.ZZZ.IS.0WNED.AND.HAX0RED.BY.SUB7.NET\n IP Address: 207.44.240.96\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.WILL.BE.SLAPPED.IN.THE.FACE.BY.MY.BLUE.VEINED.SPANNER.NET\n IP Address: 216.127.80.46\n Registrar: ASCIO TECHNOLOGIES, INC.\n Whois Server: whois.ascio.com\n Referral URL: http://www.ascio.com\n\n Server Name: MICROSOFT.COM.WILL.BE.BEATEN.WITH.MY.SPANNER.NET\n IP Address: 216.127.80.46\n Registrar: ASCIO TECHNOLOGIES, INC.\n Whois Server: whois.ascio.com\n Referral URL: http://www.ascio.com\n\n Server Name: MICROSOFT.COM.WAREZ.AT.TOPLIST.GULLI.COM\n IP Address: 80.190.192.33\n Registrar: CORE INTERNET COUNCIL OF REGISTRARS\n Whois Server: whois.corenic.net\n Referral URL: http://www.corenic.net\n\n Server Name: MICROSOFT.COM.THIS.IS.A.TEST.INETLIBRARY.NET\n IP Address: 173.161.23.178\n Registrar: GANDI SAS\n Whois Server: whois.gandi.net\n Referral URL: http://www.gandi.net\n\n Server Name: MICROSOFT.COM.SOFTWARE.IS.NOT.USED.AT.REG.RU\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n\n Server Name: MICROSOFT.COM.SHOULD.GIVE.UP.BECAUSE.LINUXISGOD.COM\n IP Address: 65.160.248.13\n Registrar: GKG.NET, INC.\n Whois Server: whois.gkg.net\n Referral URL: http://www.gkg.net\n\n Server Name: MICROSOFT.COM.RAWKZ.MUH.WERLD.MENTALFLOSS.CA\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.MORE.INFO.AT.WWW.BEYONDWHOIS.COM\n IP Address: 203.36.226.2\n Registrar: INSTRA CORPORATION PTY, LTD.\n Whois Server: whois.instra.net\n Referral URL: http://www.instra.com\n\n Server Name: MICROSOFT.COM.MATCHES.THIS.STRING.AT.KEYSIGNERS.COM\n IP Address: 85.10.240.254\n Registrar: HETZNER ONLINE AG\n Whois Server: whois.your-server.de\n Referral URL: http://www.hetzner.de\n\n Server Name: MICROSOFT.COM.MAKES.RICKARD.DRINK.SAMBUCA.0800CARRENTAL.COM\n IP Address: 209.85.135.106\n Registrar: KEY-SYSTEMS GMBH\n Whois Server: whois.rrpproxy.net\n Referral URL: http://www.key-systems.net\n\n Server Name: MICROSOFT.COM.LOVES.ME.KOSMAL.NET\n IP Address: 65.75.198.123\n Registrar: GODADDY.COM, LLC\n Whois Server: whois.godaddy.com\n Referral URL: http://registrar.godaddy.com\n\n Server Name: MICROSOFT.COM.LIVES.AT.SHAUNEWING.COM\n IP Address: 216.40.250.172\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.KNOWS.THAT.THE.BEST.WEB.HOSTING.IS.NASHHOST.NET\n IP Address: 78.47.16.44\n Registrar: CENTER OF UKRAINIAN INTERNET NAMES\n Whois Server: whois.ukrnames.com\n Referral URL: http://www.ukrnames.com\n\n Server Name: MICROSOFT.COM.IS.POWERED.BY.MIKROTIKA.V.OBSHTEJITIETO.OT.IBEKYAROV.UNIX-BG.COM\n IP Address: 84.22.26.98\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.IS.NOT.YEPPA.ORG\n Registrar: OVH\n Whois Server: whois.ovh.com\n Referral URL: http://www.ovh.com\n\n Server Name: MICROSOFT.COM.IS.NOT.HOSTED.BY.ACTIVEDOMAINDNS.NET\n IP Address: 217.148.161.5\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: MICROSOFT.COM.IS.IN.BED.WITH.CURTYV.COM\n IP Address: 216.55.187.193\n Registrar: HOSTOPIA.COM INC. D/B/A APLUS.NET\n Whois Server: whois.names4ever.com\n Referral URL: http://www.aplus.net\n\n Server Name: MICROSOFT.COM.IS.HOSTED.ON.PROFITHOSTING.NET\n IP Address: 66.49.213.213\n Registrar: NAME.COM, INC.\n Whois Server: whois.name.com\n Referral URL: http://www.name.com\n\n Server Name: MICROSOFT.COM.IS.A.STEAMING.HEAP.OF.FUCKING-BULLSHIT.NET\n IP Address: 63.99.165.11\n Registrar: 1 & 1 INTERNET AG\n Whois Server: whois.schlund.info\n Referral URL: http://1and1.com\n\n Server Name: MICROSOFT.COM.IS.A.MESS.TIMPORTER.CO.UK\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n\n Server Name: MICROSOFT.COM.HAS.A.PRESENT.COMING.FROM.HUGHESMISSILES.COM\n IP Address: 66.154.11.27\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.FILLS.ME.WITH.BELLIGERENCE.NET\n IP Address: 130.58.82.232\n Registrar: CPS-DATENSYSTEME GMBH\n Whois Server: whois.cps-datensysteme.de\n Referral URL: http://www.cps-datensysteme.de\n\n Server Name: MICROSOFT.COM.EENGURRA.COM\n IP Address: 184.168.46.68\n Registrar: GODADDY.COM, LLC\n Whois Server: whois.godaddy.com\n Referral URL: http://registrar.godaddy.com\n\n Server Name: MICROSOFT.COM.CAN.GO.FUCK.ITSELF.AT.SECZY.COM\n IP Address: 209.187.114.147\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.ARE.GODDAMN.PIGFUCKERS.NET.NS-NOT-IN-SERVICE.COM\n IP Address: 216.127.80.46\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Domain Name: MICROSOFT.COM\n Registrar: MARKMONITOR INC.\n Whois Server: whois.markmonitor.com\n Referral URL: http://www.markmonitor.com\n Name Server: NS1.MSFT.NET\n Name Server: NS2.MSFT.NET\n Name Server: NS3.MSFT.NET\n Name Server: NS4.MSFT.NET\n Name Server: NS5.MSFT.NET\n Status: clientDeleteProhibited\n Status: clientTransferProhibited\n Status: clientUpdateProhibited\n Status: serverDeleteProhibited\n Status: serverTransferProhibited\n Status: serverUpdateProhibited\n Updated Date: 09-aug-2011\n Creation Date: 02-may-1991\n Expiration Date: 03-may-2021\n\n>>> Last update of whois database: Sat, 23 Nov 2013 14:25:01 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.markmonitor.com"], "registrar": ["MarkMonitor, Inc."], "creation_date": ["2011-08-09T13:02:58"], "id": ["2724960_DOMAIN_COM-VRSN"]}
\ No newline at end of file
diff --git a/test/target_default/mu.oz.au b/test/target_default/mu.oz.au
index 04cd2b3..b6cd8a7 100644
--- a/test/target_default/mu.oz.au
+++ b/test/target_default/mu.oz.au
@@ -1 +1 @@
-{"status": null, "updated_date": null, "contacts": {"admin": null, "tech": null, "registrant": null, "billing": null}, "expiration_date": null, "emails": null, "raw": ["No Data Found\n\n"], "whois_server": null, "registrar": null, "name_servers": null, "creation_date": null, "id": null}
\ No newline at end of file
+{"raw": ["No Data Found\n\n"], "contacts": {"admin": null, "tech": null, "registrant": null, "billing": null}}
\ No newline at end of file
diff --git a/test/target_default/nepasituation.com b/test/target_default/nepasituation.com
index 8bcd88a..3d5e516 100644
--- a/test/target_default/nepasituation.com
+++ b/test/target_default/nepasituation.com
@@ -1 +1 @@
-{"status": ["LOCKED"], "updated_date": ["2013-09-21T00:00:00", "2013-11-23T13:48:16"], "contacts": {"admin": {"city": "Nobby Beach", "name": "Domain Admin", "phone": "+45.36946676", "state": "Queensland", "street": "ID#10760, PO Box 16\nNote - Visit PrivacyProtect.org to contact the domain owner/operator", "country": "AU", "postalcode": "QLD 4218", "organization": "PrivacyProtect.org", "email": "contact@privacyprotect.org"}, "tech": {"city": "Nobby Beach", "name": "Domain Admin", "phone": "+45.36946676", "state": "Queensland", "street": "ID#10760, PO Box 16\nNote - Visit PrivacyProtect.org to contact the domain owner/operator", "country": "AU", "postalcode": "QLD 4218", "organization": "PrivacyProtect.org", "email": "contact@privacyprotect.org"}, "registrant": {"city": "Nobby Beach", "name": "Domain Admin", "phone": "+45.36946676", "state": "Queensland", "street": "ID#10760, PO Box 16\nNote - Visit PrivacyProtect.org to contact the domain owner/operator", "country": "AU", "postalcode": "QLD 4218", "organization": "PrivacyProtect.org", "email": "contact@privacyprotect.org"}, "billing": {"city": "Nobby Beach", "name": "Domain Admin", "phone": "+45.36946676", "state": "Queensland", "street": "ID#10760, PO Box 16\nNote - Visit PrivacyProtect.org to contact the domain owner/operator", "country": "AU", "postalcode": "QLD 4218", "organization": "PrivacyProtect.org", "email": "contact@privacyprotect.org"}}, "expiration_date": ["2014-10-25T00:00:00"], "id": null, "creation_date": ["2011-10-25T00:00:00"], "raw": ["Registration Service Provided By: WHOIS.COM\n\nDomain Name: NEPASITUATION.COM\n\n Registration Date: 25-Oct-2011 \n Expiration Date: 25-Oct-2014 \n\n Status:LOCKED\n\tNote: This Domain Name is currently Locked. \n\tThis feature is provided to protect against fraudulent acquisition of the domain name, \n\tas in this status the domain name cannot be transferred or modified. \n\n Name Servers: \n ns1.whois.com\n ns2.whois.com\n ns3.whois.com\n ns4.whois.com\n \n\n Registrant Contact Details:\n PrivacyProtect.org\n Domain Admin (contact@privacyprotect.org)\n ID#10760, PO Box 16\n Note - Visit PrivacyProtect.org to contact the domain owner/operator\n Nobby Beach\n Queensland,QLD 4218\n AU\n Tel. +45.36946676\n\n Administrative Contact Details: \n PrivacyProtect.org\n Domain Admin (contact@privacyprotect.org)\n ID#10760, PO Box 16\n Note - Visit PrivacyProtect.org to contact the domain owner/operator\n Nobby Beach\n Queensland,QLD 4218\n AU\n Tel. +45.36946676 \n\n Technical Contact Details: \n PrivacyProtect.org\n Domain Admin (contact@privacyprotect.org)\n ID#10760, PO Box 16\n Note - Visit PrivacyProtect.org to contact the domain owner/operator\n Nobby Beach\n Queensland,QLD 4218\n AU\n Tel. +45.36946676 \n\n Billing Contact Details: \n PrivacyProtect.org\n Domain Admin (contact@privacyprotect.org)\n ID#10760, PO Box 16\n Note - Visit PrivacyProtect.org to contact the domain owner/operator\n Nobby Beach\n Queensland,QLD 4218\n AU\n Tel. +45.36946676 \n \nPRIVACYPROTECT.ORG is providing privacy protection services to this domain name to \nprotect the owner from spam and phishing attacks. PrivacyProtect.org is not \nresponsible for any of the activities associated with this domain name. If you wish \nto report any abuse concerning the usage of this domain name, you may do so at \nhttp://privacyprotect.org/contact. We have a stringent abuse policy and any \ncomplaint will be actioned within a short period of time.\n\nThe data in this whois database is provided to you for information purposes \nonly, that is, to assist you in obtaining information about or related to a \ndomain name registration record. We make this information available \"as is\",\nand do not guarantee its accuracy. By submitting a whois query, you agree \nthat you will use this data only for lawful purposes and that, under no \ncircumstances will you use this data to: \n(1) enable high volume, automated, electronic processes that stress or load \nthis whois database system providing you this information; or \n(2) allow, enable, or otherwise support the transmission of mass unsolicited, \ncommercial advertising or solicitations via direct mail, electronic mail, or \nby telephone. \nThe compilation, repackaging, dissemination or other use of this data is \nexpressly prohibited without prior written consent from us. The Registrar of \nrecord is PDR Ltd. d/b/a PublicDomainRegistry.com. \nWe reserve the right to modify these terms at any time. \nBy submitting this query, you agree to abide by these terms.\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: NEPASITUATION.COM\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n Name Server: NS1.WHOIS.COM\n Name Server: NS2.WHOIS.COM\n Name Server: NS3.WHOIS.COM\n Name Server: NS4.WHOIS.COM\n Status: clientTransferProhibited\n Updated Date: 21-sep-2013\n Creation Date: 25-oct-2011\n Expiration Date: 25-oct-2014\n\n>>> Last update of whois database: Sat, 23 Nov 2013 13:48:16 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.PublicDomainRegistry.com"], "registrar": ["WHOIS.COM"], "name_servers": ["ns1.whois.com", "ns2.whois.com", "ns3.whois.com", "ns4.whois.com"], "emails": []}
\ No newline at end of file
+{"status": ["LOCKED"], "updated_date": ["2013-09-21T00:00:00", "2013-11-23T13:48:16"], "contacts": {"admin": {"city": "Nobby Beach", "name": "Domain Admin", "phone": "+45.36946676", "state": "Queensland", "street": "ID#10760, PO Box 16\nNote - Visit PrivacyProtect.org to contact the domain owner/operator", "country": "AU", "postalcode": "QLD 4218", "organization": "PrivacyProtect.org", "email": "contact@privacyprotect.org"}, "tech": {"city": "Nobby Beach", "name": "Domain Admin", "phone": "+45.36946676", "state": "Queensland", "street": "ID#10760, PO Box 16\nNote - Visit PrivacyProtect.org to contact the domain owner/operator", "country": "AU", "postalcode": "QLD 4218", "organization": "PrivacyProtect.org", "email": "contact@privacyprotect.org"}, "registrant": {"city": "Nobby Beach", "name": "Domain Admin", "phone": "+45.36946676", "state": "Queensland", "street": "ID#10760, PO Box 16\nNote - Visit PrivacyProtect.org to contact the domain owner/operator", "country": "AU", "postalcode": "QLD 4218", "organization": "PrivacyProtect.org", "email": "contact@privacyprotect.org"}, "billing": {"city": "Nobby Beach", "name": "Domain Admin", "phone": "+45.36946676", "state": "Queensland", "street": "ID#10760, PO Box 16\nNote - Visit PrivacyProtect.org to contact the domain owner/operator", "country": "AU", "postalcode": "QLD 4218", "organization": "PrivacyProtect.org", "email": "contact@privacyprotect.org"}}, "nameservers": ["ns1.whois.com", "ns2.whois.com", "ns3.whois.com", "ns4.whois.com"], "expiration_date": ["2014-10-25T00:00:00"], "creation_date": ["2011-10-25T00:00:00"], "raw": ["Registration Service Provided By: WHOIS.COM\n\nDomain Name: NEPASITUATION.COM\n\n Registration Date: 25-Oct-2011 \n Expiration Date: 25-Oct-2014 \n\n Status:LOCKED\n\tNote: This Domain Name is currently Locked. \n\tThis feature is provided to protect against fraudulent acquisition of the domain name, \n\tas in this status the domain name cannot be transferred or modified. \n\n Name Servers: \n ns1.whois.com\n ns2.whois.com\n ns3.whois.com\n ns4.whois.com\n \n\n Registrant Contact Details:\n PrivacyProtect.org\n Domain Admin (contact@privacyprotect.org)\n ID#10760, PO Box 16\n Note - Visit PrivacyProtect.org to contact the domain owner/operator\n Nobby Beach\n Queensland,QLD 4218\n AU\n Tel. +45.36946676\n\n Administrative Contact Details: \n PrivacyProtect.org\n Domain Admin (contact@privacyprotect.org)\n ID#10760, PO Box 16\n Note - Visit PrivacyProtect.org to contact the domain owner/operator\n Nobby Beach\n Queensland,QLD 4218\n AU\n Tel. +45.36946676 \n\n Technical Contact Details: \n PrivacyProtect.org\n Domain Admin (contact@privacyprotect.org)\n ID#10760, PO Box 16\n Note - Visit PrivacyProtect.org to contact the domain owner/operator\n Nobby Beach\n Queensland,QLD 4218\n AU\n Tel. +45.36946676 \n\n Billing Contact Details: \n PrivacyProtect.org\n Domain Admin (contact@privacyprotect.org)\n ID#10760, PO Box 16\n Note - Visit PrivacyProtect.org to contact the domain owner/operator\n Nobby Beach\n Queensland,QLD 4218\n AU\n Tel. +45.36946676 \n \nPRIVACYPROTECT.ORG is providing privacy protection services to this domain name to \nprotect the owner from spam and phishing attacks. PrivacyProtect.org is not \nresponsible for any of the activities associated with this domain name. If you wish \nto report any abuse concerning the usage of this domain name, you may do so at \nhttp://privacyprotect.org/contact. We have a stringent abuse policy and any \ncomplaint will be actioned within a short period of time.\n\nThe data in this whois database is provided to you for information purposes \nonly, that is, to assist you in obtaining information about or related to a \ndomain name registration record. We make this information available \"as is\",\nand do not guarantee its accuracy. By submitting a whois query, you agree \nthat you will use this data only for lawful purposes and that, under no \ncircumstances will you use this data to: \n(1) enable high volume, automated, electronic processes that stress or load \nthis whois database system providing you this information; or \n(2) allow, enable, or otherwise support the transmission of mass unsolicited, \ncommercial advertising or solicitations via direct mail, electronic mail, or \nby telephone. \nThe compilation, repackaging, dissemination or other use of this data is \nexpressly prohibited without prior written consent from us. The Registrar of \nrecord is PDR Ltd. d/b/a PublicDomainRegistry.com. \nWe reserve the right to modify these terms at any time. \nBy submitting this query, you agree to abide by these terms.\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: NEPASITUATION.COM\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n Name Server: NS1.WHOIS.COM\n Name Server: NS2.WHOIS.COM\n Name Server: NS3.WHOIS.COM\n Name Server: NS4.WHOIS.COM\n Status: clientTransferProhibited\n Updated Date: 21-sep-2013\n Creation Date: 25-oct-2011\n Expiration Date: 25-oct-2014\n\n>>> Last update of whois database: Sat, 23 Nov 2013 13:48:16 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.PublicDomainRegistry.com"], "registrar": ["WHOIS.COM"]}
\ No newline at end of file
diff --git a/test/target_default/nic.pw b/test/target_default/nic.pw
index 6d95ebf..0c30664 100644
--- a/test/target_default/nic.pw
+++ b/test/target_default/nic.pw
@@ -1 +1 @@
-{"status": ["OK"], "updated_date": ["2013-04-30T15:06:57"], "contacts": {"admin": {"city": "N/A", "handle": "H2661317", "name": "Registry Manager", "state": "N/A", "street": "N/A", "country": "PW", "postalcode": "N/A", "organization": ".PW Registry", "email": "contact@registry.pw"}, "tech": {"city": "N/A", "handle": "H2661317", "name": "Registry Manager", "state": "N/A", "street": "N/A", "country": "PW", "postalcode": "N/A", "organization": ".PW Registry", "email": "contact@registry.pw"}, "registrant": {"city": "N/A", "handle": "H2661317", "name": "Registry Manager", "state": "N/A", "street": "N/A", "country": "PW", "postalcode": "N/A", "organization": ".PW Registry", "email": "contact@registry.pw"}, "billing": {"city": "N/A", "handle": "H2661317", "name": "Registry Manager", "state": "N/A", "street": "N/A", "country": "PW", "postalcode": "N/A", "organization": ".PW Registry", "email": "contact@registry.pw"}}, "expiration_date": ["2020-01-01T23:59:59"], "emails": [], "raw": ["This whois service is provided by CentralNic Ltd and only contains\ninformation pertaining to Internet domain names we have registered for\nour customers. By using this service you are agreeing (1) not to use any\ninformation presented here for any purpose other than determining\nownership of domain names, (2) not to store or reproduce this data in \nany way, (3) not to use any high-volume, automated, electronic processes\nto obtain data from this service. Abuse of this service is monitored and\nactions in contravention of these terms will result in being permanently\nblacklisted. All data is (c) CentralNic Ltd https://www.centralnic.com/\n\nDomain ID:CNIC-DO949898\nDomain Name:NIC.PW\nCreated On:2012-10-12T10:19:46.0Z\nLast Updated On:2013-04-30T15:06:57.0Z\nExpiration Date:2020-01-01T23:59:59.0Z\nStatus:OK\nRegistrant ID:H2661317\nRegistrant Name:Registry Manager\nRegistrant Organization:.PW Registry\nRegistrant Street1:N/A\nRegistrant City:N/A\nRegistrant State/Province:N/A\nRegistrant Postal Code:N/A\nRegistrant Country:PW\nRegistrant Phone:\nRegistrant Email:contact@registry.pw\nAdmin ID:H2661317\nAdmin Name:Registry Manager\nAdmin Organization:.PW Registry\nAdmin Street1:N/A\nAdmin City:N/A\nAdmin State/Province:N/A\nAdmin Postal Code:N/A\nAdmin Country:PW\nAdmin Phone:\nAdmin Email:contact@registry.pw\nTech ID:H2661317\nTech Name:Registry Manager\nTech Organization:.PW Registry\nTech Street1:N/A\nTech City:N/A\nTech State/Province:N/A\nTech Postal Code:N/A\nTech Country:PW\nTech Phone:\nTech Email:contact@registry.pw\nBilling ID:H2661317\nBilling Name:Registry Manager\nBilling Organization:.PW Registry\nBilling Street1:N/A\nBilling City:N/A\nBilling State/Province:N/A\nBilling Postal Code:N/A\nBilling Country:PW\nBilling Phone:\nBilling Email:contact@registry.pw\nSponsoring Registrar ID:H2661317\nSponsoring Registrar Organization:.PW Registry\nSponsoring Registrar Street1:N/A\nSponsoring Registrar City:N/A\nSponsoring Registrar State/Province:N/A\nSponsoring Registrar Postal Code:N/A\nSponsoring Registrar Country:PW\nSponsoring Registrar Phone:N/A\nSponsoring Registrar Website:http://www.registry.pw\nName Server:NS0.CENTRALNIC-DNS.COM\nName Server:NS1.CENTRALNIC-DNS.COM\nName Server:NS2.CENTRALNIC-DNS.COM\nName Server:NS3.CENTRALNIC-DNS.COM\nName Server:NS4.CENTRALNIC-DNS.COM\nName Server:NS5.CENTRALNIC-DNS.COM\nDNSSEC:Unsigned\n\n\n\n"], "whois_server": null, "registrar": [".PW Registry"], "name_servers": ["NS0.CENTRALNIC-DNS.COM", "NS1.CENTRALNIC-DNS.COM", "NS2.CENTRALNIC-DNS.COM", "NS3.CENTRALNIC-DNS.COM", "NS4.CENTRALNIC-DNS.COM", "NS5.CENTRALNIC-DNS.COM"], "creation_date": ["2012-10-12T10:19:46", "2012-10-12T10:19:46", "2012-10-12T10:19:46"], "id": ["CNIC-DO949898"]}
\ No newline at end of file
+{"status": ["OK"], "updated_date": ["2013-04-30T15:06:57"], "contacts": {"admin": {"city": "N/A", "handle": "H2661317", "name": "Registry Manager", "state": "N/A", "street": "N/A", "country": "PW", "postalcode": "N/A", "organization": ".PW Registry", "email": "contact@registry.pw"}, "tech": {"city": "N/A", "handle": "H2661317", "name": "Registry Manager", "state": "N/A", "street": "N/A", "country": "PW", "postalcode": "N/A", "organization": ".PW Registry", "email": "contact@registry.pw"}, "registrant": {"city": "N/A", "handle": "H2661317", "name": "Registry Manager", "state": "N/A", "street": "N/A", "country": "PW", "postalcode": "N/A", "organization": ".PW Registry", "email": "contact@registry.pw"}, "billing": {"city": "N/A", "handle": "H2661317", "name": "Registry Manager", "state": "N/A", "street": "N/A", "country": "PW", "postalcode": "N/A", "organization": ".PW Registry", "email": "contact@registry.pw"}}, "nameservers": ["NS0.CENTRALNIC-DNS.COM", "NS1.CENTRALNIC-DNS.COM", "NS2.CENTRALNIC-DNS.COM", "NS3.CENTRALNIC-DNS.COM", "NS4.CENTRALNIC-DNS.COM", "NS5.CENTRALNIC-DNS.COM"], "expiration_date": ["2020-01-01T23:59:59"], "raw": ["This whois service is provided by CentralNic Ltd and only contains\ninformation pertaining to Internet domain names we have registered for\nour customers. By using this service you are agreeing (1) not to use any\ninformation presented here for any purpose other than determining\nownership of domain names, (2) not to store or reproduce this data in \nany way, (3) not to use any high-volume, automated, electronic processes\nto obtain data from this service. Abuse of this service is monitored and\nactions in contravention of these terms will result in being permanently\nblacklisted. All data is (c) CentralNic Ltd https://www.centralnic.com/\n\nDomain ID:CNIC-DO949898\nDomain Name:NIC.PW\nCreated On:2012-10-12T10:19:46.0Z\nLast Updated On:2013-04-30T15:06:57.0Z\nExpiration Date:2020-01-01T23:59:59.0Z\nStatus:OK\nRegistrant ID:H2661317\nRegistrant Name:Registry Manager\nRegistrant Organization:.PW Registry\nRegistrant Street1:N/A\nRegistrant City:N/A\nRegistrant State/Province:N/A\nRegistrant Postal Code:N/A\nRegistrant Country:PW\nRegistrant Phone:\nRegistrant Email:contact@registry.pw\nAdmin ID:H2661317\nAdmin Name:Registry Manager\nAdmin Organization:.PW Registry\nAdmin Street1:N/A\nAdmin City:N/A\nAdmin State/Province:N/A\nAdmin Postal Code:N/A\nAdmin Country:PW\nAdmin Phone:\nAdmin Email:contact@registry.pw\nTech ID:H2661317\nTech Name:Registry Manager\nTech Organization:.PW Registry\nTech Street1:N/A\nTech City:N/A\nTech State/Province:N/A\nTech Postal Code:N/A\nTech Country:PW\nTech Phone:\nTech Email:contact@registry.pw\nBilling ID:H2661317\nBilling Name:Registry Manager\nBilling Organization:.PW Registry\nBilling Street1:N/A\nBilling City:N/A\nBilling State/Province:N/A\nBilling Postal Code:N/A\nBilling Country:PW\nBilling Phone:\nBilling Email:contact@registry.pw\nSponsoring Registrar ID:H2661317\nSponsoring Registrar Organization:.PW Registry\nSponsoring Registrar Street1:N/A\nSponsoring Registrar City:N/A\nSponsoring Registrar State/Province:N/A\nSponsoring Registrar Postal Code:N/A\nSponsoring Registrar Country:PW\nSponsoring Registrar Phone:N/A\nSponsoring Registrar Website:http://www.registry.pw\nName Server:NS0.CENTRALNIC-DNS.COM\nName Server:NS1.CENTRALNIC-DNS.COM\nName Server:NS2.CENTRALNIC-DNS.COM\nName Server:NS3.CENTRALNIC-DNS.COM\nName Server:NS4.CENTRALNIC-DNS.COM\nName Server:NS5.CENTRALNIC-DNS.COM\nDNSSEC:Unsigned\n\n\n\n"], "registrar": [".PW Registry"], "creation_date": ["2012-10-12T10:19:46", "2012-10-12T10:19:46", "2012-10-12T10:19:46"], "id": ["CNIC-DO949898"]}
\ No newline at end of file
diff --git a/test/target_default/nic.ru b/test/target_default/nic.ru
index 2988c47..139f96d 100644
--- a/test/target_default/nic.ru
+++ b/test/target_default/nic.ru
@@ -1 +1 @@
-{"status": ["REGISTERED, DELEGATED, VERIFIED"], "updated_date": ["2013-11-20T08:41:39"], "contacts": {"admin": null, "tech": null, "registrant": {"organization": "JSC 'RU-CENTER'"}, "billing": null}, "expiration_date": ["2013-12-01T00:00:00"], "emails": null, "creation_date": ["1997-11-28T00:00:00"], "raw": ["% By submitting a query to RIPN's Whois Service\n% you agree to abide by the following terms of use:\n% http://www.ripn.net/about/servpol.html#3.2 (in Russian) \n% http://www.ripn.net/about/en/servpol.html#3.2 (in English).\n\ndomain: NIC.RU\nnserver: ns4-cloud.nic.ru. 195.253.65.2, 2a01:5b0:5::2\nnserver: ns5.nic.ru. 31.177.67.100, 2a02:2090:e800:9000:31:177:67:100\nnserver: ns6.nic.ru. 31.177.74.100, 2a02:2090:ec00:9040:31:177:74:100\nnserver: ns7.nic.ru. 31.177.71.100, 2a02:2090:ec00:9000:31:177:71:100\nnserver: ns8-cloud.nic.ru. 195.253.64.10, 2a01:5b0:4::a\nstate: REGISTERED, DELEGATED, VERIFIED\norg: JSC 'RU-CENTER'\nregistrar: RU-CENTER-REG-RIPN\nadmin-contact: https://www.nic.ru/whois\ncreated: 1997.11.28\npaid-till: 2013.12.01\nfree-date: 2014.01.01\nsource: TCI\n\nLast updated on 2013.11.20 08:41:39 MSK\n\n"], "whois_server": null, "registrar": ["RU-CENTER-REG-RIPN"], "name_servers": ["ns4-cloud.nic.ru", "ns5.nic.ru", "ns6.nic.ru", "ns7.nic.ru", "ns8-cloud.nic.ru"], "id": null}
\ No newline at end of file
+{"status": ["REGISTERED, DELEGATED, VERIFIED"], "updated_date": ["2013-11-20T08:41:39"], "contacts": {"admin": null, "tech": null, "registrant": {"organization": "JSC 'RU-CENTER'"}, "billing": null}, "nameservers": ["ns4-cloud.nic.ru", "ns5.nic.ru", "ns6.nic.ru", "ns7.nic.ru", "ns8-cloud.nic.ru"], "expiration_date": ["2013-12-01T00:00:00"], "creation_date": ["1997-11-28T00:00:00"], "raw": ["% By submitting a query to RIPN's Whois Service\n% you agree to abide by the following terms of use:\n% http://www.ripn.net/about/servpol.html#3.2 (in Russian) \n% http://www.ripn.net/about/en/servpol.html#3.2 (in English).\n\ndomain: NIC.RU\nnserver: ns4-cloud.nic.ru. 195.253.65.2, 2a01:5b0:5::2\nnserver: ns5.nic.ru. 31.177.67.100, 2a02:2090:e800:9000:31:177:67:100\nnserver: ns6.nic.ru. 31.177.74.100, 2a02:2090:ec00:9040:31:177:74:100\nnserver: ns7.nic.ru. 31.177.71.100, 2a02:2090:ec00:9000:31:177:71:100\nnserver: ns8-cloud.nic.ru. 195.253.64.10, 2a01:5b0:4::a\nstate: REGISTERED, DELEGATED, VERIFIED\norg: JSC 'RU-CENTER'\nregistrar: RU-CENTER-REG-RIPN\nadmin-contact: https://www.nic.ru/whois\ncreated: 1997.11.28\npaid-till: 2013.12.01\nfree-date: 2014.01.01\nsource: TCI\n\nLast updated on 2013.11.20 08:41:39 MSK\n\n"], "registrar": ["RU-CENTER-REG-RIPN"]}
\ No newline at end of file
diff --git a/test/target_default/nominet.org.uk b/test/target_default/nominet.org.uk
index 7b4474a..db5239e 100644
--- a/test/target_default/nominet.org.uk
+++ b/test/target_default/nominet.org.uk
@@ -1 +1 @@
-{"updated_date": ["2013-02-06T00:00:00"], "status": null, "contacts": {"admin": null, "tech": null, "registrant": {"city": "Oxford", "name": "Nominet UK", "state": "Oxon", "street": "Minerva House\nEdmund Halley Road\nOxford Science Park", "country": "United Kingdom", "postalcode": "OX4 4DQ"}, "billing": null}, "expiration_date": null, "emails": null, "creation_date": null, "raw": ["\n Domain name:\n nominet.org.uk\n\n Registrant:\n Nominet UK\n\n Registrant type:\n UK Limited Company, (Company number: 3203859)\n\n Registrant's address:\n Minerva House\n Edmund Halley Road\n Oxford Science Park\n Oxford\n Oxon\n OX4 4DQ\n United Kingdom\n\n Registrar:\n No registrar listed. This domain is registered directly with Nominet.\n\n Relevant dates:\n Registered on: before Aug-1996\n Last updated: 06-Feb-2013\n\n Registration status:\n No registration status listed.\n\n Name servers:\n nom-ns1.nominet.org.uk 213.248.199.16\n nom-ns2.nominet.org.uk 195.66.240.250 2a01:40:1001:37::2\n nom-ns3.nominet.org.uk 213.219.13.194\n\n DNSSEC:\n Signed\n\n WHOIS lookup made at 14:56:34 23-Nov-2013\n\n-- \nThis WHOIS information is provided for free by Nominet UK the central registry\nfor .uk domain names. This information and the .uk WHOIS are:\n\n Copyright Nominet UK 1996 - 2013.\n\nYou may not access the .uk WHOIS or use any data from it except as permitted\nby the terms of use available in full at http://www.nominet.org.uk/whoisterms, which\nincludes restrictions on: (A) use of the data for advertising, or its\nrepackaging, recompilation, redistribution or reuse (B) obscuring, removing\nor hiding any or all of this notice and (C) exceeding query rate or volume\nlimits. The data is provided on an 'as-is' basis and may lag behind the\nregister. Access may be withdrawn or restricted at any time. \n\n"], "whois_server": null, "registrar": ["No registrar listed. This domain is registered directly with Nominet."], "name_servers": ["nom-ns1.nominet.org.uk", "nom-ns2.nominet.org.uk", "nom-ns3.nominet.org.uk"], "id": null}
\ No newline at end of file
+{"updated_date": ["2013-02-06T00:00:00"], "contacts": {"admin": null, "tech": null, "registrant": {"city": "Oxford", "name": "Nominet UK", "state": "Oxon", "street": "Minerva House\nEdmund Halley Road\nOxford Science Park", "country": "United Kingdom", "postalcode": "OX4 4DQ"}, "billing": null}, "nameservers": ["nom-ns1.nominet.org.uk", "nom-ns2.nominet.org.uk", "nom-ns3.nominet.org.uk"], "creation_date": null, "raw": ["\n Domain name:\n nominet.org.uk\n\n Registrant:\n Nominet UK\n\n Registrant type:\n UK Limited Company, (Company number: 3203859)\n\n Registrant's address:\n Minerva House\n Edmund Halley Road\n Oxford Science Park\n Oxford\n Oxon\n OX4 4DQ\n United Kingdom\n\n Registrar:\n No registrar listed. This domain is registered directly with Nominet.\n\n Relevant dates:\n Registered on: before Aug-1996\n Last updated: 06-Feb-2013\n\n Registration status:\n No registration status listed.\n\n Name servers:\n nom-ns1.nominet.org.uk 213.248.199.16\n nom-ns2.nominet.org.uk 195.66.240.250 2a01:40:1001:37::2\n nom-ns3.nominet.org.uk 213.219.13.194\n\n DNSSEC:\n Signed\n\n WHOIS lookup made at 14:56:34 23-Nov-2013\n\n-- \nThis WHOIS information is provided for free by Nominet UK the central registry\nfor .uk domain names. This information and the .uk WHOIS are:\n\n Copyright Nominet UK 1996 - 2013.\n\nYou may not access the .uk WHOIS or use any data from it except as permitted\nby the terms of use available in full at http://www.nominet.org.uk/whoisterms, which\nincludes restrictions on: (A) use of the data for advertising, or its\nrepackaging, recompilation, redistribution or reuse (B) obscuring, removing\nor hiding any or all of this notice and (C) exceeding query rate or volume\nlimits. The data is provided on an 'as-is' basis and may lag behind the\nregister. Access may be withdrawn or restricted at any time. \n\n"], "registrar": ["No registrar listed. This domain is registered directly with Nominet."]}
\ No newline at end of file
diff --git a/test/target_default/nsa.gov b/test/target_default/nsa.gov
index 7108570..baf64e1 100644
--- a/test/target_default/nsa.gov
+++ b/test/target_default/nsa.gov
@@ -1 +1 @@
-{"status": ["ACTIVE"], "updated_date": null, "contacts": {"admin": null, "tech": null, "registrant": null, "billing": null}, "expiration_date": null, "emails": null, "raw": ["% DOTGOV WHOIS Server ready\n Domain Name: NSA.GOV\n Status: ACTIVE\n\n\n>>> Last update of whois database: 2013-11-20T04:13:55Z <<<\nPlease be advised that this whois server only contains information pertaining\nto the .GOV domain. For information for other domains please use the whois\nserver at RS.INTERNIC.NET. \n\n"], "whois_server": null, "registrar": null, "name_servers": null, "creation_date": null, "id": null}
\ No newline at end of file
+{"status": ["ACTIVE"], "raw": ["% DOTGOV WHOIS Server ready\n Domain Name: NSA.GOV\n Status: ACTIVE\n\n\n>>> Last update of whois database: 2013-11-20T04:13:55Z <<<\nPlease be advised that this whois server only contains information pertaining\nto the .GOV domain. For information for other domains please use the whois\nserver at RS.INTERNIC.NET. \n\n"], "contacts": {"admin": null, "tech": null, "registrant": null, "billing": null}}
\ No newline at end of file
diff --git a/test/target_default/nytimes.com b/test/target_default/nytimes.com
index 1198e70..82a73a1 100644
--- a/test/target_default/nytimes.com
+++ b/test/target_default/nytimes.com
@@ -1 +1 @@
-{"status": ["serverDeleteProhibited", "serverTransferProhibited", "serverUpdateProhibited"], "updated_date": ["2013-08-27T00:00:00", "2013-11-23T14:47:40"], "contacts": {"admin": {"city": "NEW YORK", "fax": "+1.2125561234", "name": "Ellen Herb", "phone": "+1.2125561234", "state": "NY", "street": "620 8th Avenue", "country": "UNITED STATES", "postalcode": "10018", "email": "hostmaster@nytimes.com"}, "tech": {"city": "New York", "fax": "+1.1231231234", "name": "NEW YORK TIMES DIGITAL", "phone": "+1.2125561234", "state": "NY", "street": "229 West 43d Street", "country": "UNITED STATES", "postalcode": "10036", "email": "hostmaster@nytimes.com"}, "registrant": {"city": "New York", "name": "New York Times Digital", "state": "NY", "street": "620 8th Avenue", "country": "UNITED STATES", "postalcode": "10018"}, "billing": null}, "expiration_date": ["2014-01-19T00:00:00"], "id": null, "creation_date": ["1994-01-18T00:00:00"], "raw": ["\nDomain Name.......... nytimes.com\n Creation Date........ 1994-01-18\n Registration Date.... 2011-08-31\n Expiry Date.......... 2014-01-20\n Organisation Name.... New York Times Digital\n Organisation Address. 620 8th Avenue\n Organisation Address. \n Organisation Address. \n Organisation Address. New York\n Organisation Address. 10018\n Organisation Address. NY\n Organisation Address. UNITED STATES\n\nAdmin Name........... Ellen Herb\n Admin Address........ 620 8th Avenue\n Admin Address........ \n Admin Address........ \n Admin Address. NEW YORK\n Admin Address........ 10018\n Admin Address........ NY\n Admin Address........ UNITED STATES\n Admin Email.......... hostmaster@nytimes.com\n Admin Phone.......... +1.2125561234\n Admin Fax............ +1.2125561234\n\nTech Name............ NEW YORK TIMES DIGITAL\n Tech Address......... 229 West 43d Street\n Tech Address......... \n Tech Address......... \n Tech Address......... New York\n Tech Address......... 10036\n Tech Address......... NY\n Tech Address......... UNITED STATES\n Tech Email........... hostmaster@nytimes.com\n Tech Phone........... +1.2125561234\n Tech Fax............. +1.1231231234\n Name Server.......... DNS.EWR1.NYTIMES.COM\n Name Server.......... DNS.SEA1.NYTIMES.COM\n\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Server Name: NYTIMES.COM\n IP Address: 141.105.64.37\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n\n Domain Name: NYTIMES.COM\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n Name Server: DNS.EWR1.NYTIMES.COM\n Name Server: DNS.SEA1.NYTIMES.COM\n Status: serverDeleteProhibited\n Status: serverTransferProhibited\n Status: serverUpdateProhibited\n Updated Date: 27-aug-2013\n Creation Date: 18-jan-1994\n Expiration Date: 19-jan-2014\n\n>>> Last update of whois database: Sat, 23 Nov 2013 14:47:40 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.melbourneit.com", "whois.melbourneit.com"], "registrar": ["MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE"], "name_servers": ["DNS.EWR1.NYTIMES.COM", "DNS.SEA1.NYTIMES.COM"], "emails": []}
\ No newline at end of file
+{"status": ["serverDeleteProhibited", "serverTransferProhibited", "serverUpdateProhibited"], "updated_date": ["2013-08-27T00:00:00", "2013-11-23T14:47:40"], "contacts": {"admin": {"city": "NEW YORK", "fax": "+1.2125561234", "name": "Ellen Herb", "phone": "+1.2125561234", "state": "NY", "street": "620 8th Avenue", "country": "UNITED STATES", "postalcode": "10018", "email": "hostmaster@nytimes.com"}, "tech": {"city": "New York", "fax": "+1.1231231234", "name": "NEW YORK TIMES DIGITAL", "phone": "+1.2125561234", "state": "NY", "street": "229 West 43d Street", "country": "UNITED STATES", "postalcode": "10036", "email": "hostmaster@nytimes.com"}, "registrant": {"city": "New York", "name": "New York Times Digital", "state": "NY", "street": "620 8th Avenue", "country": "UNITED STATES", "postalcode": "10018"}, "billing": null}, "nameservers": ["DNS.EWR1.NYTIMES.COM", "DNS.SEA1.NYTIMES.COM"], "expiration_date": ["2014-01-19T00:00:00"], "creation_date": ["1994-01-18T00:00:00"], "raw": ["\nDomain Name.......... nytimes.com\n Creation Date........ 1994-01-18\n Registration Date.... 2011-08-31\n Expiry Date.......... 2014-01-20\n Organisation Name.... New York Times Digital\n Organisation Address. 620 8th Avenue\n Organisation Address. \n Organisation Address. \n Organisation Address. New York\n Organisation Address. 10018\n Organisation Address. NY\n Organisation Address. UNITED STATES\n\nAdmin Name........... Ellen Herb\n Admin Address........ 620 8th Avenue\n Admin Address........ \n Admin Address........ \n Admin Address. NEW YORK\n Admin Address........ 10018\n Admin Address........ NY\n Admin Address........ UNITED STATES\n Admin Email.......... hostmaster@nytimes.com\n Admin Phone.......... +1.2125561234\n Admin Fax............ +1.2125561234\n\nTech Name............ NEW YORK TIMES DIGITAL\n Tech Address......... 229 West 43d Street\n Tech Address......... \n Tech Address......... \n Tech Address......... New York\n Tech Address......... 10036\n Tech Address......... NY\n Tech Address......... UNITED STATES\n Tech Email........... hostmaster@nytimes.com\n Tech Phone........... +1.2125561234\n Tech Fax............. +1.1231231234\n Name Server.......... DNS.EWR1.NYTIMES.COM\n Name Server.......... DNS.SEA1.NYTIMES.COM\n\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Server Name: NYTIMES.COM\n IP Address: 141.105.64.37\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n\n Domain Name: NYTIMES.COM\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n Name Server: DNS.EWR1.NYTIMES.COM\n Name Server: DNS.SEA1.NYTIMES.COM\n Status: serverDeleteProhibited\n Status: serverTransferProhibited\n Status: serverUpdateProhibited\n Updated Date: 27-aug-2013\n Creation Date: 18-jan-1994\n Expiration Date: 19-jan-2014\n\n>>> Last update of whois database: Sat, 23 Nov 2013 14:47:40 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.melbourneit.com", "whois.melbourneit.com"], "registrar": ["MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE"]}
\ No newline at end of file
diff --git a/test/target_default/oli.id.au b/test/target_default/oli.id.au
index c627446..8dbc037 100644
--- a/test/target_default/oli.id.au
+++ b/test/target_default/oli.id.au
@@ -1 +1 @@
-{"status": ["ok"], "updated_date": ["2013-11-03T02:04:00"], "contacts": {"admin": null, "tech": {"handle": "ID00182825-PR", "name": "Oliver Ransom"}, "registrant": {"handle": "ID00182825-PR", "name": "Oliver Ransom"}, "billing": null}, "expiration_date": null, "emails": null, "raw": ["Domain Name: oli.id.au\nLast Modified: 03-Nov-2013 02:04:00 UTC\nRegistrar ID: PlanetDomain\nRegistrar Name: PlanetDomain\nStatus: ok\n\nRegistrant: Oliver Ransom\nEligibility Type: Citizen/Resident\n\nRegistrant Contact ID: ID00182825-PR\nRegistrant Contact Name: Oliver Ransom\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: ID00182825-PR\nTech Contact Name: Oliver Ransom\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: ns1.r4ns.com\nName Server: ns2.r4ns.com\n\n"], "whois_server": null, "registrar": ["PlanetDomain"], "name_servers": ["ns1.r4ns.com", "ns2.r4ns.com"], "creation_date": null, "id": null}
\ No newline at end of file
+{"status": ["ok"], "updated_date": ["2013-11-03T02:04:00"], "contacts": {"admin": null, "tech": {"handle": "ID00182825-PR", "name": "Oliver Ransom"}, "registrant": {"handle": "ID00182825-PR", "name": "Oliver Ransom"}, "billing": null}, "nameservers": ["ns1.r4ns.com", "ns2.r4ns.com"], "raw": ["Domain Name: oli.id.au\nLast Modified: 03-Nov-2013 02:04:00 UTC\nRegistrar ID: PlanetDomain\nRegistrar Name: PlanetDomain\nStatus: ok\n\nRegistrant: Oliver Ransom\nEligibility Type: Citizen/Resident\n\nRegistrant Contact ID: ID00182825-PR\nRegistrant Contact Name: Oliver Ransom\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: ID00182825-PR\nTech Contact Name: Oliver Ransom\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: ns1.r4ns.com\nName Server: ns2.r4ns.com\n\n"], "registrar": ["PlanetDomain"]}
\ No newline at end of file
diff --git a/test/target_default/ovh.fr b/test/target_default/ovh.fr
index 6d5b466..ae61726 100644
--- a/test/target_default/ovh.fr
+++ b/test/target_default/ovh.fr
@@ -1 +1 @@
-{"status": ["ACTIVE", "ok"], "updated_date": ["2006-10-11T00:00:00", "2013-10-28T00:00:00", "2009-04-03T00:00:00"], "contacts": {"admin": {"fax": "+33 3 20 20 09 58", "handle": "OK62-FRNIC", "phone": "+33 3 20 20 09 57", "street": "Sarl Ovh\n140, quai du Sartel", "postalcode": "59100", "city": "Roubaix", "name": "Octave Klaba", "country": "FR", "type": "PERSON", "changedate": "2009-04-03T00:00:00"}, "tech": {"handle": "OVH5-FRNIC", "phone": "+33 8 99 70 17 61", "street": "OVH\n140, quai du Sartel", "postalcode": "59100", "city": "Roubaix", "name": "OVH NET", "country": "FR", "type": "ROLE", "email": "tech@ovh.net", "changedate": "2006-10-11T00:00:00"}, "registrant": {"fax": "+33 3 20 20 09 58", "handle": "SO255-FRNIC", "phone": "+33 8 99 70 17 61", "street": "140, quai du sartel", "postalcode": "59100", "city": "Roubaix", "name": "OVH SAS", "country": "FR", "type": "ORGANIZATION", "email": "oles@ovh.net", "changedate": "2013-10-28T00:00:00"}, "billing": null}, "expiration_date": null, "id": null, "creation_date": ["1999-11-12T00:00:00", "1999-10-21T00:00:00"], "raw": ["%%\n%% This is the AFNIC Whois server.\n%%\n%% complete date format : DD/MM/YYYY\n%% short date format : DD/MM\n%% version : FRNIC-2.5\n%%\n%% Rights restricted by copyright.\n%% See http://www.afnic.fr/afnic/web/mentions-legales-whois_en\n%%\n%% Use '-h' option to obtain more information about this service.\n%%\n%% [77.162.55.23 REQUEST] >> -V Md5.0 ovh.fr\n%%\n%% RL Net [##########] - RL IP [#########.]\n%%\n\ndomain: ovh.fr\nstatus: ACTIVE\nhold: NO\nholder-c: SO255-FRNIC\nadmin-c: OK62-FRNIC\ntech-c: OVH5-FRNIC\nzone-c: NFC1-FRNIC\nnsl-id: NSL16790-FRNIC\nregistrar: OVH\nanniversary: 12/11\ncreated: 12/11/1999\nlast-update: 03/04/2009\nsource: FRNIC\n\nns-list: NSL16790-FRNIC\nnserver: dns.ovh.net\nnserver: dns10.ovh.net\nnserver: ns.ovh.net\nnserver: ns10.ovh.net\nsource: FRNIC\n\nregistrar: OVH\ntype: Isp Option 1\naddress: 2 Rue Kellermann\naddress: ROUBAIX\ncountry: FR\nphone: +33 8 99 70 17 61\nfax-no: +33 3 20 20 09 58\ne-mail: support@ovh.net\nwebsite: http://www.ovh.com\nanonymous: NO\nregistered: 21/10/1999\nsource: FRNIC\n\nnic-hdl: OVH5-FRNIC\ntype: ROLE\ncontact: OVH NET\naddress: OVH\naddress: 140, quai du Sartel\naddress: 59100 Roubaix\ncountry: FR\nphone: +33 8 99 70 17 61\ne-mail: tech@ovh.net\ntrouble: Information: http://www.ovh.fr\ntrouble: Questions: mailto:tech@ovh.net\ntrouble: Spam: mailto:abuse@ovh.net\nadmin-c: OK217-FRNIC\ntech-c: OK217-FRNIC\nnotify: tech@ovh.net\nregistrar: OVH\nchanged: 11/10/2006 tech@ovh.net\nanonymous: NO\nobsoleted: NO\nsource: FRNIC\n\nnic-hdl: SO255-FRNIC\ntype: ORGANIZATION\ncontact: OVH SAS\naddress: 140, quai du sartel\naddress: 59100 Roubaix\ncountry: FR\nphone: +33 8 99 70 17 61\nfax-no: +33 3 20 20 09 58\ne-mail: oles@ovh.net\nregistrar: OVH\nchanged: 28/10/2013 nic@nic.fr\nanonymous: NO\nobsoleted: NO\neligstatus: ok\neligdate: 01/09/2011 12:03:35\nsource: FRNIC\n\nnic-hdl: OK62-FRNIC\ntype: PERSON\ncontact: Octave Klaba\naddress: Sarl Ovh\naddress: 140, quai du Sartel\naddress: 59100 Roubaix\ncountry: FR\nphone: +33 3 20 20 09 57\nfax-no: +33 3 20 20 09 58\nregistrar: OVH\nchanged: 03/04/2009 nic@nic.fr\nanonymous: NO\nobsoleted: NO\nsource: FRNIC\n"], "whois_server": null, "registrar": ["OVH"], "name_servers": ["dns.ovh.net", "dns10.ovh.net", "ns.ovh.net", "ns10.ovh.net"], "emails": ["support@ovh.net", "abuse@ovh.net", "nic@nic.fr"]}
\ No newline at end of file
+{"status": ["ACTIVE", "ok"], "updated_date": ["2006-10-11T00:00:00", "2013-10-28T00:00:00", "2009-04-03T00:00:00"], "contacts": {"admin": {"fax": "+33 3 20 20 09 58", "handle": "OK62-FRNIC", "phone": "+33 3 20 20 09 57", "street": "Sarl Ovh\n140, quai du Sartel", "postalcode": "59100", "city": "Roubaix", "name": "Octave Klaba", "country": "FR", "type": "PERSON", "changedate": "2009-04-03T00:00:00"}, "tech": {"handle": "OVH5-FRNIC", "phone": "+33 8 99 70 17 61", "street": "OVH\n140, quai du Sartel", "postalcode": "59100", "city": "Roubaix", "name": "OVH NET", "country": "FR", "type": "ROLE", "email": "tech@ovh.net", "changedate": "2006-10-11T00:00:00"}, "registrant": {"fax": "+33 3 20 20 09 58", "handle": "SO255-FRNIC", "phone": "+33 8 99 70 17 61", "street": "140, quai du sartel", "postalcode": "59100", "city": "Roubaix", "name": "OVH SAS", "country": "FR", "type": "ORGANIZATION", "email": "oles@ovh.net", "changedate": "2013-10-28T00:00:00"}, "billing": null}, "nameservers": ["dns.ovh.net", "dns10.ovh.net", "ns.ovh.net", "ns10.ovh.net"], "creation_date": ["1999-11-12T00:00:00", "1999-10-21T00:00:00"], "raw": ["%%\n%% This is the AFNIC Whois server.\n%%\n%% complete date format : DD/MM/YYYY\n%% short date format : DD/MM\n%% version : FRNIC-2.5\n%%\n%% Rights restricted by copyright.\n%% See http://www.afnic.fr/afnic/web/mentions-legales-whois_en\n%%\n%% Use '-h' option to obtain more information about this service.\n%%\n%% [77.162.55.23 REQUEST] >> -V Md5.0 ovh.fr\n%%\n%% RL Net [##########] - RL IP [#########.]\n%%\n\ndomain: ovh.fr\nstatus: ACTIVE\nhold: NO\nholder-c: SO255-FRNIC\nadmin-c: OK62-FRNIC\ntech-c: OVH5-FRNIC\nzone-c: NFC1-FRNIC\nnsl-id: NSL16790-FRNIC\nregistrar: OVH\nanniversary: 12/11\ncreated: 12/11/1999\nlast-update: 03/04/2009\nsource: FRNIC\n\nns-list: NSL16790-FRNIC\nnserver: dns.ovh.net\nnserver: dns10.ovh.net\nnserver: ns.ovh.net\nnserver: ns10.ovh.net\nsource: FRNIC\n\nregistrar: OVH\ntype: Isp Option 1\naddress: 2 Rue Kellermann\naddress: ROUBAIX\ncountry: FR\nphone: +33 8 99 70 17 61\nfax-no: +33 3 20 20 09 58\ne-mail: support@ovh.net\nwebsite: http://www.ovh.com\nanonymous: NO\nregistered: 21/10/1999\nsource: FRNIC\n\nnic-hdl: OVH5-FRNIC\ntype: ROLE\ncontact: OVH NET\naddress: OVH\naddress: 140, quai du Sartel\naddress: 59100 Roubaix\ncountry: FR\nphone: +33 8 99 70 17 61\ne-mail: tech@ovh.net\ntrouble: Information: http://www.ovh.fr\ntrouble: Questions: mailto:tech@ovh.net\ntrouble: Spam: mailto:abuse@ovh.net\nadmin-c: OK217-FRNIC\ntech-c: OK217-FRNIC\nnotify: tech@ovh.net\nregistrar: OVH\nchanged: 11/10/2006 tech@ovh.net\nanonymous: NO\nobsoleted: NO\nsource: FRNIC\n\nnic-hdl: SO255-FRNIC\ntype: ORGANIZATION\ncontact: OVH SAS\naddress: 140, quai du sartel\naddress: 59100 Roubaix\ncountry: FR\nphone: +33 8 99 70 17 61\nfax-no: +33 3 20 20 09 58\ne-mail: oles@ovh.net\nregistrar: OVH\nchanged: 28/10/2013 nic@nic.fr\nanonymous: NO\nobsoleted: NO\neligstatus: ok\neligdate: 01/09/2011 12:03:35\nsource: FRNIC\n\nnic-hdl: OK62-FRNIC\ntype: PERSON\ncontact: Octave Klaba\naddress: Sarl Ovh\naddress: 140, quai du Sartel\naddress: 59100 Roubaix\ncountry: FR\nphone: +33 3 20 20 09 57\nfax-no: +33 3 20 20 09 58\nregistrar: OVH\nchanged: 03/04/2009 nic@nic.fr\nanonymous: NO\nobsoleted: NO\nsource: FRNIC\n"], "registrar": ["OVH"], "emails": ["support@ovh.net", "abuse@ovh.net", "nic@nic.fr"]}
\ No newline at end of file
diff --git a/test/target_default/prq.se b/test/target_default/prq.se
index 63bcefa..fe7caf7 100644
--- a/test/target_default/prq.se
+++ b/test/target_default/prq.se
@@ -1 +1 @@
-{"status": ["active", "ok"], "updated_date": ["2012-11-03T00:00:00"], "contacts": {"admin": null, "tech": null, "registrant": {"handle": "perper9352-00001"}, "billing": null}, "expiration_date": ["2015-06-14T00:00:00"], "emails": null, "creation_date": ["2004-06-14T00:00:00"], "raw": ["# Copyright (c) 1997- .SE (The Internet Infrastructure Foundation).\n# All rights reserved.\n\n# The information obtained through searches, or otherwise, is protected\n# by the Swedish Copyright Act (1960:729) and international conventions.\n# It is also subject to database protection according to the Swedish\n# Copyright Act.\n\n# Any use of this material to target advertising or\n# similar activities is forbidden and will be prosecuted.\n# If any of the information below is transferred to a third\n# party, it must be done in its entirety. This server must\n# not be used as a backend for a search engine.\n\n# Result of search for registered domain names under\n# the .SE top level domain.\n\n# The data is in the UTF-8 character set and the result is\n# printed with eight bits.\n\nstate: active\ndomain: prq.se\nholder: perper9352-00001\nadmin-c: -\ntech-c: -\nbilling-c: -\ncreated: 2004-06-14\nmodified: 2012-11-03\nexpires: 2015-06-14\ntransferred: 2012-08-09\nnserver: ns.prq.se 193.104.214.194\nnserver: ns2.prq.se 88.80.30.194\ndnssec: unsigned delegation\nstatus: ok\nregistrar: AEB Komm\n\n"], "whois_server": null, "registrar": ["AEB Komm"], "name_servers": ["ns.prq.se", "ns2.prq.se"], "id": null}
\ No newline at end of file
+{"status": ["active", "ok"], "updated_date": ["2012-11-03T00:00:00"], "contacts": {"admin": null, "tech": null, "registrant": {"handle": "perper9352-00001"}, "billing": null}, "nameservers": ["ns.prq.se", "ns2.prq.se"], "expiration_date": ["2015-06-14T00:00:00"], "creation_date": ["2004-06-14T00:00:00"], "raw": ["# Copyright (c) 1997- .SE (The Internet Infrastructure Foundation).\n# All rights reserved.\n\n# The information obtained through searches, or otherwise, is protected\n# by the Swedish Copyright Act (1960:729) and international conventions.\n# It is also subject to database protection according to the Swedish\n# Copyright Act.\n\n# Any use of this material to target advertising or\n# similar activities is forbidden and will be prosecuted.\n# If any of the information below is transferred to a third\n# party, it must be done in its entirety. This server must\n# not be used as a backend for a search engine.\n\n# Result of search for registered domain names under\n# the .SE top level domain.\n\n# The data is in the UTF-8 character set and the result is\n# printed with eight bits.\n\nstate: active\ndomain: prq.se\nholder: perper9352-00001\nadmin-c: -\ntech-c: -\nbilling-c: -\ncreated: 2004-06-14\nmodified: 2012-11-03\nexpires: 2015-06-14\ntransferred: 2012-08-09\nnserver: ns.prq.se 193.104.214.194\nnserver: ns2.prq.se 88.80.30.194\ndnssec: unsigned delegation\nstatus: ok\nregistrar: AEB Komm\n\n"], "registrar": ["AEB Komm"]}
\ No newline at end of file
diff --git a/test/target_default/quadranet.com b/test/target_default/quadranet.com
index 6587de0..97bc817 100644
--- a/test/target_default/quadranet.com
+++ b/test/target_default/quadranet.com
@@ -1 +1 @@
-{"updated_date": ["2013-06-17T23:22:11"], "status": ["clientDeleteProhibited", "clientRenewProhibited", "clientTransferProhibited", "clientUpdateProhibited"], "contacts": {"admin": {"city": "Tarzana", "fax": "+1.2136149375", "name": "Quadra Net", "state": "California", "phone": "+1.2136149371", "street": "19528 Ventura Blvd\n#433", "country": "United States", "postalcode": "91356", "organization": "QuadraNet", "email": "noc@quadranet.com"}, "tech": {"city": "Tarzana", "fax": "+1.2136149375", "name": "Quadra Net", "state": "California", "phone": "+1.2136149371", "street": "19528 Ventura Blvd\n#433", "country": "United States", "postalcode": "91356", "organization": "QuadraNet", "email": "noc@quadranet.com"}, "registrant": {"city": "Tarzana", "name": "Quadra Net", "state": "California", "street": "19528 Ventura Blvd\n#433", "country": "United States", "postalcode": "91356", "organization": "QuadraNet"}, "billing": null}, "expiration_date": ["2015-09-29T18:08:54"], "id": null, "creation_date": ["1999-09-29T18:08:58"], "raw": ["Domain Name: QUADRANET.COM\nRegistrar URL: http://www.wildwestdomains.com\nUpdated Date: 2013-06-17 23:22:11\nCreation Date: 1999-09-29 18:08:58\nRegistrar Expiration Date: 2015-09-29 18:08:54\nRegistrar: Wild West Domains, LLC\nReseller: Registerbuzz.com\nRegistrant Name: Quadra Net\nRegistrant Organization: QuadraNet\nRegistrant Street: 19528 Ventura Blvd\nRegistrant Street: #433\nRegistrant City: Tarzana\nRegistrant State/Province: California\nRegistrant Postal Code: 91356\nRegistrant Country: United States\nAdmin Name: Quadra Net\nAdmin Organization: QuadraNet\nAdmin Street: 19528 Ventura Blvd\nAdmin Street: #433\nAdmin City: Tarzana\nAdmin State/Province: California\nAdmin Postal Code: 91356\nAdmin Country: United States\nAdmin Phone: +1.2136149371\nAdmin Fax: +1.2136149375\nAdmin Email: noc@quadranet.com\nTech Name: Quadra Net\nTech Organization: QuadraNet\nTech Street: 19528 Ventura Blvd\nTech Street: #433\nTech City: Tarzana\nTech State/Province: California\nTech Postal Code: 91356\nTech Country: United States\nTech Phone: +1.2136149371\nTech Fax: +1.2136149375\nTech Email: noc@quadranet.com\nName Server: NS2.QUADRANET.COM\nName Server: NS1.QUADRANET.COM\n\nThe data contained in this Registrar's Whois database, \nwhile believed by the registrar to be reliable, is provided \"as is\"\nwith no guarantee or warranties regarding its accuracy. This information \nis provided for the sole purpose of assisting you in obtaining \ninformation about domain name registration records. Any use of\nthis data for any other purpose is expressly forbidden without\nthe prior written permission of this registrar. By submitting an\ninquiry, you agree to these terms of usage and limitations of warranty.\nIn particular, you agree not to use this data to allow, enable, or\notherwise make possible, dissemination or collection of this data, in \npart or in its entirety, for any purpose, such as the transmission of \nunsolicited advertising and solicitations of any kind, including spam. \nYou further agree not to use this data to enable high volume, automated \nor robotic electronic processes designed to collect or compile this data \nfor any purpose, including mining this data for your own personal or \ncommercial purposes.\n\nPlease note: the owner of the domain name is specified in the \"registrant\" section. \nIn most cases, the Registrar is not the owner of domain names listed in this database.\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: QUADRANET.COM\n Registrar: WILD WEST DOMAINS, LLC\n Whois Server: whois.wildwestdomains.com\n Referral URL: http://www.wildwestdomains.com\n Name Server: NS1.QUADRANET.COM\n Name Server: NS2.QUADRANET.COM\n Status: clientDeleteProhibited\n Status: clientRenewProhibited\n Status: clientTransferProhibited\n Status: clientUpdateProhibited\n Updated Date: 18-jun-2013\n Creation Date: 29-sep-1999\n Expiration Date: 29-sep-2015\n\n>>> Last update of whois database: Wed, 20 Nov 2013 10:14:47 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.wildwestdomains.com"], "registrar": ["Wild West Domains, LLC"], "name_servers": ["NS2.QUADRANET.COM", "NS1.QUADRANET.COM"], "emails": []}
\ No newline at end of file
+{"updated_date": ["2013-06-17T23:22:11"], "status": ["clientDeleteProhibited", "clientRenewProhibited", "clientTransferProhibited", "clientUpdateProhibited"], "contacts": {"admin": {"city": "Tarzana", "fax": "+1.2136149375", "name": "Quadra Net", "state": "California", "phone": "+1.2136149371", "street": "19528 Ventura Blvd\n#433", "country": "United States", "postalcode": "91356", "organization": "QuadraNet", "email": "noc@quadranet.com"}, "tech": {"city": "Tarzana", "fax": "+1.2136149375", "name": "Quadra Net", "state": "California", "phone": "+1.2136149371", "street": "19528 Ventura Blvd\n#433", "country": "United States", "postalcode": "91356", "organization": "QuadraNet", "email": "noc@quadranet.com"}, "registrant": {"city": "Tarzana", "name": "Quadra Net", "state": "California", "street": "19528 Ventura Blvd\n#433", "country": "United States", "postalcode": "91356", "organization": "QuadraNet"}, "billing": null}, "nameservers": ["NS2.QUADRANET.COM", "NS1.QUADRANET.COM"], "expiration_date": ["2015-09-29T18:08:54"], "creation_date": ["1999-09-29T18:08:58"], "raw": ["Domain Name: QUADRANET.COM\nRegistrar URL: http://www.wildwestdomains.com\nUpdated Date: 2013-06-17 23:22:11\nCreation Date: 1999-09-29 18:08:58\nRegistrar Expiration Date: 2015-09-29 18:08:54\nRegistrar: Wild West Domains, LLC\nReseller: Registerbuzz.com\nRegistrant Name: Quadra Net\nRegistrant Organization: QuadraNet\nRegistrant Street: 19528 Ventura Blvd\nRegistrant Street: #433\nRegistrant City: Tarzana\nRegistrant State/Province: California\nRegistrant Postal Code: 91356\nRegistrant Country: United States\nAdmin Name: Quadra Net\nAdmin Organization: QuadraNet\nAdmin Street: 19528 Ventura Blvd\nAdmin Street: #433\nAdmin City: Tarzana\nAdmin State/Province: California\nAdmin Postal Code: 91356\nAdmin Country: United States\nAdmin Phone: +1.2136149371\nAdmin Fax: +1.2136149375\nAdmin Email: noc@quadranet.com\nTech Name: Quadra Net\nTech Organization: QuadraNet\nTech Street: 19528 Ventura Blvd\nTech Street: #433\nTech City: Tarzana\nTech State/Province: California\nTech Postal Code: 91356\nTech Country: United States\nTech Phone: +1.2136149371\nTech Fax: +1.2136149375\nTech Email: noc@quadranet.com\nName Server: NS2.QUADRANET.COM\nName Server: NS1.QUADRANET.COM\n\nThe data contained in this Registrar's Whois database, \nwhile believed by the registrar to be reliable, is provided \"as is\"\nwith no guarantee or warranties regarding its accuracy. This information \nis provided for the sole purpose of assisting you in obtaining \ninformation about domain name registration records. Any use of\nthis data for any other purpose is expressly forbidden without\nthe prior written permission of this registrar. By submitting an\ninquiry, you agree to these terms of usage and limitations of warranty.\nIn particular, you agree not to use this data to allow, enable, or\notherwise make possible, dissemination or collection of this data, in \npart or in its entirety, for any purpose, such as the transmission of \nunsolicited advertising and solicitations of any kind, including spam. \nYou further agree not to use this data to enable high volume, automated \nor robotic electronic processes designed to collect or compile this data \nfor any purpose, including mining this data for your own personal or \ncommercial purposes.\n\nPlease note: the owner of the domain name is specified in the \"registrant\" section. \nIn most cases, the Registrar is not the owner of domain names listed in this database.\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: QUADRANET.COM\n Registrar: WILD WEST DOMAINS, LLC\n Whois Server: whois.wildwestdomains.com\n Referral URL: http://www.wildwestdomains.com\n Name Server: NS1.QUADRANET.COM\n Name Server: NS2.QUADRANET.COM\n Status: clientDeleteProhibited\n Status: clientRenewProhibited\n Status: clientTransferProhibited\n Status: clientUpdateProhibited\n Updated Date: 18-jun-2013\n Creation Date: 29-sep-1999\n Expiration Date: 29-sep-2015\n\n>>> Last update of whois database: Wed, 20 Nov 2013 10:14:47 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.wildwestdomains.com"], "registrar": ["Wild West Domains, LLC"]}
\ No newline at end of file
diff --git a/test/target_default/singularity.fr b/test/target_default/singularity.fr
index 385df8c..aafc507 100644
--- a/test/target_default/singularity.fr
+++ b/test/target_default/singularity.fr
@@ -1 +1 @@
-{"status": ["ACTIVE", "ok"], "updated_date": ["2009-08-31T00:00:00", "2006-03-03T00:00:00"], "contacts": {"admin": {"handle": "ANO00-FRNIC", "name": "Ano Nymous", "type": "PERSON", "changedate": "2009-08-31T00:00:00"}, "tech": {"handle": "GR283-FRNIC", "street": "Gandi\n15, place de la Nation", "postalcode": "75011", "city": "Paris", "name": "GANDI ROLE", "country": "FR", "type": "ROLE", "email": "noc@gandi.net", "changedate": "2006-03-03T00:00:00"}, "registrant": {"handle": "ANO00-FRNIC", "name": "Ano Nymous", "type": "PERSON", "changedate": "2009-08-31T00:00:00"}, "billing": null}, "expiration_date": null, "id": null, "creation_date": ["2009-04-04T00:00:00", "2004-03-09T00:00:00"], "raw": ["%%\n%% This is the AFNIC Whois server.\n%%\n%% complete date format : DD/MM/YYYY\n%% short date format : DD/MM\n%% version : FRNIC-2.5\n%%\n%% Rights restricted by copyright.\n%% See http://www.afnic.fr/afnic/web/mentions-legales-whois_en\n%%\n%% Use '-h' option to obtain more information about this service.\n%%\n%% [77.162.55.23 REQUEST] >> singularity.fr\n%%\n%% RL Net [##########] - RL IP [#########.]\n%%\n\ndomain: singularity.fr\nstatus: ACTIVE\nhold: NO\nholder-c: ANO00-FRNIC\nadmin-c: ANO00-FRNIC\ntech-c: GR283-FRNIC\nzone-c: NFC1-FRNIC\nnsl-id: NSL29702-FRNIC\nregistrar: GANDI\nanniversary: 01/09\ncreated: 04/04/2009\nlast-update: 01/09/2009\nsource: FRNIC\n\nns-list: NSL29702-FRNIC\nnserver: ns-sec.toile-libre.org\nnserver: ns-pri.toile-libre.org\nsource: FRNIC\n\nregistrar: GANDI\ntype: Isp Option 1\naddress: 63-65 boulevard Massena\naddress: PARIS\ncountry: FR\nphone: +33 1 70 37 76 61\nfax-no: +33 1 43 73 18 51\ne-mail: support-fr@support.gandi.net\nwebsite: http://www.gandi.net\nanonymous: NO\nregistered: 09/03/2004\nsource: FRNIC\n\nnic-hdl: ANO00-FRNIC\ntype: PERSON\ncontact: Ano Nymous\nremarks: -------------- WARNING --------------\nremarks: While the registrar knows him/her,\nremarks: this person chose to restrict access\nremarks: to his/her personal data. So PLEASE,\nremarks: don't send emails to Ano Nymous. This\nremarks: address is bogus and there is no hope\nremarks: of a reply.\nremarks: -------------- WARNING --------------\nregistrar: GANDI\nchanged: 31/08/2009 anonymous@nowhere.xx.fr\nanonymous: YES\nobsoleted: NO\neligstatus: ok\nsource: FRNIC\n\nnic-hdl: GR283-FRNIC\ntype: ROLE\ncontact: GANDI ROLE\naddress: Gandi\naddress: 15, place de la Nation\naddress: 75011 Paris\ncountry: FR\ne-mail: noc@gandi.net\ntrouble: -------------------------------------------------\ntrouble: GANDI is an ICANN accredited registrar\ntrouble: for more information:\ntrouble: Web: http://www.gandi.net\ntrouble: -------------------------------------------------\ntrouble: - network troubles: noc@gandi.net\ntrouble: - SPAM: abuse@gandi.net\ntrouble: -------------------------------------------------\nadmin-c: NL346-FRNIC\ntech-c: NL346-FRNIC\ntech-c: TUF1-FRNIC\nnotify: noc@gandi.net\nregistrar: GANDI\nchanged: 03/03/2006 noc@gandi.net\nanonymous: NO\nobsoleted: NO\nsource: FRNIC\n\n\n"], "whois_server": null, "registrar": ["GANDI"], "name_servers": ["ns-sec.toile-libre.org", "ns-pri.toile-libre.org"], "emails": ["support-fr@support.gandi.net", "anonymous@nowhere.xx.fr", "abuse@gandi.net"]}
\ No newline at end of file
+{"status": ["ACTIVE", "ok"], "updated_date": ["2009-08-31T00:00:00", "2006-03-03T00:00:00"], "contacts": {"admin": {"handle": "ANO00-FRNIC", "name": "Ano Nymous", "type": "PERSON", "changedate": "2009-08-31T00:00:00"}, "tech": {"handle": "GR283-FRNIC", "street": "Gandi\n15, place de la Nation", "postalcode": "75011", "city": "Paris", "name": "GANDI ROLE", "country": "FR", "type": "ROLE", "email": "noc@gandi.net", "changedate": "2006-03-03T00:00:00"}, "registrant": {"handle": "ANO00-FRNIC", "name": "Ano Nymous", "type": "PERSON", "changedate": "2009-08-31T00:00:00"}, "billing": null}, "nameservers": ["ns-sec.toile-libre.org", "ns-pri.toile-libre.org"], "creation_date": ["2009-04-04T00:00:00", "2004-03-09T00:00:00"], "raw": ["%%\n%% This is the AFNIC Whois server.\n%%\n%% complete date format : DD/MM/YYYY\n%% short date format : DD/MM\n%% version : FRNIC-2.5\n%%\n%% Rights restricted by copyright.\n%% See http://www.afnic.fr/afnic/web/mentions-legales-whois_en\n%%\n%% Use '-h' option to obtain more information about this service.\n%%\n%% [77.162.55.23 REQUEST] >> singularity.fr\n%%\n%% RL Net [##########] - RL IP [#########.]\n%%\n\ndomain: singularity.fr\nstatus: ACTIVE\nhold: NO\nholder-c: ANO00-FRNIC\nadmin-c: ANO00-FRNIC\ntech-c: GR283-FRNIC\nzone-c: NFC1-FRNIC\nnsl-id: NSL29702-FRNIC\nregistrar: GANDI\nanniversary: 01/09\ncreated: 04/04/2009\nlast-update: 01/09/2009\nsource: FRNIC\n\nns-list: NSL29702-FRNIC\nnserver: ns-sec.toile-libre.org\nnserver: ns-pri.toile-libre.org\nsource: FRNIC\n\nregistrar: GANDI\ntype: Isp Option 1\naddress: 63-65 boulevard Massena\naddress: PARIS\ncountry: FR\nphone: +33 1 70 37 76 61\nfax-no: +33 1 43 73 18 51\ne-mail: support-fr@support.gandi.net\nwebsite: http://www.gandi.net\nanonymous: NO\nregistered: 09/03/2004\nsource: FRNIC\n\nnic-hdl: ANO00-FRNIC\ntype: PERSON\ncontact: Ano Nymous\nremarks: -------------- WARNING --------------\nremarks: While the registrar knows him/her,\nremarks: this person chose to restrict access\nremarks: to his/her personal data. So PLEASE,\nremarks: don't send emails to Ano Nymous. This\nremarks: address is bogus and there is no hope\nremarks: of a reply.\nremarks: -------------- WARNING --------------\nregistrar: GANDI\nchanged: 31/08/2009 anonymous@nowhere.xx.fr\nanonymous: YES\nobsoleted: NO\neligstatus: ok\nsource: FRNIC\n\nnic-hdl: GR283-FRNIC\ntype: ROLE\ncontact: GANDI ROLE\naddress: Gandi\naddress: 15, place de la Nation\naddress: 75011 Paris\ncountry: FR\ne-mail: noc@gandi.net\ntrouble: -------------------------------------------------\ntrouble: GANDI is an ICANN accredited registrar\ntrouble: for more information:\ntrouble: Web: http://www.gandi.net\ntrouble: -------------------------------------------------\ntrouble: - network troubles: noc@gandi.net\ntrouble: - SPAM: abuse@gandi.net\ntrouble: -------------------------------------------------\nadmin-c: NL346-FRNIC\ntech-c: NL346-FRNIC\ntech-c: TUF1-FRNIC\nnotify: noc@gandi.net\nregistrar: GANDI\nchanged: 03/03/2006 noc@gandi.net\nanonymous: NO\nobsoleted: NO\nsource: FRNIC\n\n\n"], "registrar": ["GANDI"], "emails": ["support-fr@support.gandi.net", "anonymous@nowhere.xx.fr", "abuse@gandi.net"]}
\ No newline at end of file
diff --git a/test/target_default/swisscom.ch b/test/target_default/swisscom.ch
index 4881b0e..e108bd0 100644
--- a/test/target_default/swisscom.ch
+++ b/test/target_default/swisscom.ch
@@ -1 +1 @@
-{"status": null, "updated_date": null, "contacts": {"admin": null, "tech": {"postalcode": "CH-3050", "city": "Bern", "street": "Ostermundigenstrasse 99 6", "name": "Swisscom IT Services AG\nAndreas Disteli", "country": "Switzerland"}, "registrant": {"postalcode": "CH-3050", "city": "Bern", "street": "alte Tiefenaustrasse 6", "name": "Swisscom AG\nKarin Hug\nDomain Registration", "country": "Switzerland"}, "billing": null}, "expiration_date": null, "emails": null, "raw": ["whois: This information is subject to an Acceptable Use Policy.\nSee http://www.nic.ch/terms/aup.html\n\n\nDomain name:\nswisscom.ch\n\nHolder of domain name:\nSwisscom AG\nKarin Hug\nDomain Registration\nalte Tiefenaustrasse 6\nCH-3050 Bern\nSwitzerland\nContractual Language: English\n\nTechnical contact:\nSwisscom IT Services AG\nAndreas Disteli\nOstermundigenstrasse 99 6\nCH-3050 Bern\nSwitzerland\n\nDNSSEC:N\n\nName servers:\ndns1.swisscom.com\ndns2.swisscom.com\ndns3.swisscom.com\ndns6.swisscom.ch\t[193.222.76.52]\ndns6.swisscom.ch\t[2a02:a90:ffff:ffff::c:1]\ndns7.swisscom.ch\t[193.222.76.53]\ndns7.swisscom.ch\t[2a02:a90:ffff:ffff::c:3]\n\n"], "whois_server": null, "registrar": null, "name_servers": ["dns1.swisscom.com", "dns2.swisscom.com", "dns3.swisscom.com", "dns6.swisscom.ch", "dns7.swisscom.ch"], "creation_date": null, "id": null}
\ No newline at end of file
+{"nameservers": ["dns1.swisscom.com", "dns2.swisscom.com", "dns3.swisscom.com", "dns6.swisscom.ch", "dns7.swisscom.ch"], "raw": ["whois: This information is subject to an Acceptable Use Policy.\nSee http://www.nic.ch/terms/aup.html\n\n\nDomain name:\nswisscom.ch\n\nHolder of domain name:\nSwisscom AG\nKarin Hug\nDomain Registration\nalte Tiefenaustrasse 6\nCH-3050 Bern\nSwitzerland\nContractual Language: English\n\nTechnical contact:\nSwisscom IT Services AG\nAndreas Disteli\nOstermundigenstrasse 99 6\nCH-3050 Bern\nSwitzerland\n\nDNSSEC:N\n\nName servers:\ndns1.swisscom.com\ndns2.swisscom.com\ndns3.swisscom.com\ndns6.swisscom.ch\t[193.222.76.52]\ndns6.swisscom.ch\t[2a02:a90:ffff:ffff::c:1]\ndns7.swisscom.ch\t[193.222.76.53]\ndns7.swisscom.ch\t[2a02:a90:ffff:ffff::c:3]\n\n"], "contacts": {"admin": null, "tech": {"postalcode": "CH-3050", "city": "Bern", "street": "Ostermundigenstrasse 99 6", "name": "Swisscom IT Services AG\nAndreas Disteli", "country": "Switzerland"}, "registrant": {"postalcode": "CH-3050", "city": "Bern", "street": "alte Tiefenaustrasse 6", "name": "Swisscom AG\nKarin Hug\nDomain Registration", "country": "Switzerland"}, "billing": null}}
\ No newline at end of file
diff --git a/test/target_default/sydney.edu.au b/test/target_default/sydney.edu.au
index 48f47ac..7e50872 100644
--- a/test/target_default/sydney.edu.au
+++ b/test/target_default/sydney.edu.au
@@ -1 +1 @@
-{"status": ["ok"], "updated_date": ["2012-08-29T01:33:23"], "contacts": {"admin": null, "tech": {"handle": "EDU46834-C", "name": "Network Services"}, "registrant": {"organization": "The University of Sydney", "handle": "EDU2782-R", "name": "Network Services"}, "billing": null}, "expiration_date": null, "emails": null, "raw": ["Domain Name: sydney.edu.au\nLast Modified: 29-Aug-2012 01:33:23 UTC\nRegistrar ID: EducationAU\nRegistrar Name: Education Service Australia Ltd\nStatus: ok\n\nRegistrant: The University of Sydney\nRegistrant ID: ABN 15211513464\nEligibility Type: Higher Education Institution\n\nRegistrant Contact ID: EDU2782-R\nRegistrant Contact Name: Network Services\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: EDU46834-C\nTech Contact Name: Network Services\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: extro.ucc.usyd.edu.au\nName Server IP: 129.78.64.1\nName Server: metro.ucc.usyd.edu.au\nName Server IP: 129.78.64.2\n\n"], "whois_server": null, "registrar": ["Education Service Australia Ltd"], "name_servers": ["extro.ucc.usyd.edu.au", "metro.ucc.usyd.edu.au"], "creation_date": null, "id": null}
\ No newline at end of file
+{"status": ["ok"], "updated_date": ["2012-08-29T01:33:23"], "contacts": {"admin": null, "tech": {"handle": "EDU46834-C", "name": "Network Services"}, "registrant": {"organization": "The University of Sydney", "handle": "EDU2782-R", "name": "Network Services"}, "billing": null}, "nameservers": ["extro.ucc.usyd.edu.au", "metro.ucc.usyd.edu.au"], "raw": ["Domain Name: sydney.edu.au\nLast Modified: 29-Aug-2012 01:33:23 UTC\nRegistrar ID: EducationAU\nRegistrar Name: Education Service Australia Ltd\nStatus: ok\n\nRegistrant: The University of Sydney\nRegistrant ID: ABN 15211513464\nEligibility Type: Higher Education Institution\n\nRegistrant Contact ID: EDU2782-R\nRegistrant Contact Name: Network Services\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: EDU46834-C\nTech Contact Name: Network Services\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: extro.ucc.usyd.edu.au\nName Server IP: 129.78.64.1\nName Server: metro.ucc.usyd.edu.au\nName Server IP: 129.78.64.2\n\n"], "registrar": ["Education Service Australia Ltd"]}
\ No newline at end of file
diff --git a/test/target_default/theregister.com b/test/target_default/theregister.com
index f28b1b1..3506eb1 100644
--- a/test/target_default/theregister.com
+++ b/test/target_default/theregister.com
@@ -1 +1 @@
-{"status": ["ACTIVE"], "updated_date": ["2013-07-02T00:24:06"], "contacts": {"admin": {"city": "Southport", "fax": "+44.7980898072", "name": "Philip Mitchell", "state": "Merseyside", "phone": "+44.7980898072", "street": "19 Saxon Road", "country": "GB", "postalcode": "PR8 2AX", "organization": "Situation Publishing Ltd", "email": "philip.mitchell@theregister.co.uk"}, "tech": {"city": "null", "fax": "+44.2070159375", "name": "NetNames Hostmaster", "state": "London", "phone": "+44.2070159370", "street": "3rd Floor Prospero House\n241 Borough High St.", "country": "GB", "postalcode": "SE1 1GA", "organization": "Netnames Ltd", "email": "corporate-services@netnames.com"}, "registrant": {"city": "Southport", "name": "Situation Publishing", "state": "Mersyside", "street": "19 Saxon Road", "country": "GB", "postalcode": "PR8 2AX", "organization": "Situation Publishing Ltd"}, "billing": null}, "expiration_date": ["2014-06-30T00:00:00"], "id": null, "creation_date": ["2012-03-15T08:07:41"], "raw": ["The data in Ascio Technologies' WHOIS database is provided \nby Ascio Technologies for information purposes only. By submitting \na WHOIS query, you agree that you will use this data only for lawful \npurpose. In addition, you agree not to:\n(a) use the data to allow, enable, or otherwise support any marketing\nactivities, regardless of the medium used. Such media include but are \nnot limited to e-mail, telephone, facsimile, postal mail, SMS, and\nwireless alerts; or\n(b) use the data to enable high volume, automated, electronic processes\nthat sendqueries or data to the systems of any Registry Operator or \nICANN-Accredited registrar, except as reasonably necessary to register \ndomain names or modify existing registrations.\n(c) sell or redistribute the data except insofar as it has been \nincorporated into a value-added product or service that does not permit\nthe extraction of a substantial portion of the bulk data from the value-added\nproduct or service for use by other parties.\nAscio Technologies reserves the right to modify these terms at any time.\nAscio Technologies cannot guarantee the accuracy of the data provided.\nBy accessing and using Ascio Technologies WHOIS service, you agree to these terms.\n\nNOTE: FAILURE TO LOCATE A RECORD IN THE WHOIS DATABASE IS NOT\nINDICATIVE OF THE AVAILABILITY OF A DOMAIN NAME.\n\nDomain Name: theregister.com\nRegistry Domain ID:\nRegistrar WHOIS Server: whois.ascio.com\nRegistrar URL: http://www.ascio.com \nUpdated Date: 2013-07-02T00:24:06Z\nCreation Date: 2012-03-15T08:07:41Z\nRegistrar Registration Expiration Date: 2014-06-30T00:00:00Z\nRegistrar: Ascio Technologies, Inc\nRegistrar IANA ID: 106\nRegistrar Abuse Contact Email: abuse@ascio.com\nRegistrar Abuse Contact Phone: +44.2070159370\nReseller:\nDomain Status: ACTIVE\nRegistry Registrant ID:\nRegistrant Name: Situation Publishing\nRegistrant Organization: Situation Publishing Ltd\nRegistrant Street: 19 Saxon Road\nRegistrant City: Southport \nRegistrant State/Province: Mersyside\nRegistrant Postal Code: PR8 2AX\nRegistrant Country: GB\nRegistrant Phone:\nRegistrant Phone Ext:\nRegistrant Fax:\nRegistrant Fax Ext:\nRegistrant Email:\nRegistry Admin ID:\nAdmin Name: Philip Mitchell\nAdmin Organization: Situation Publishing Ltd\nAdmin Street: 19 Saxon Road\nAdmin City: Southport\nAdmin State/Province: Merseyside\nAdmin Postal Code: PR8 2AX\nAdmin Country: GB\nAdmin Phone: +44.7980898072\nAdmin Phone Ext:\nAdmin Fax: +44.7980898072\nAdmin Fax Ext:\nAdmin Email: philip.mitchell@theregister.co.uk\nRegistry Tech ID:\nTech Name: NetNames Hostmaster\nTech Organization: Netnames Ltd\nTech Street: 3rd Floor Prospero House\nTech Street: 241 Borough High St. \nTech City: null \nTech State/Province: London\nTech Postal Code: SE1 1GA\nTech Country: GB\nTech Phone: +44.2070159370\nTech Phone Ext:\nTech Fax: +44.2070159375 \nTech Fax Ext: \nTech Email: corporate-services@netnames.com\nName Server: NS1.THEREGISTER.COM\nName Server: NS2.THEREGISTER.COM\nName Server: NS3.THEREGISTER.COM\nName Server: NS4.THEREGISTER.COM\nName Server: ns1.theregister.co.uk\nName Server: ns2.theregister.co.uk\nName Server: ns3.theregister.co.uk\nName Server: ns6.theregister.co.uk\nDNSSEC:\nURL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/\n>>> Last update of WHOIS database: 2013-11-21T05:58:08 UTC <<<\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: THEREGISTER.COM\n Registrar: ASCIO TECHNOLOGIES, INC.\n Whois Server: whois.ascio.com\n Referral URL: http://www.ascio.com\n Name Server: NS1.THEREGISTER.CO.UK\n Name Server: NS2.THEREGISTER.CO.UK\n Name Server: NS3.THEREGISTER.CO.UK\n Name Server: NS4.THEREGISTER.CO.UK\n Name Server: NS5.THEREGISTER.CO.UK\n Name Server: NS6.THEREGISTER.CO.UK\n Status: clientDeleteProhibited\n Status: clientTransferProhibited\n Updated Date: 01-jul-2013\n Creation Date: 01-jul-1996\n Expiration Date: 30-jun-2014\n\n>>> Last update of whois database: Thu, 21 Nov 2013 05:57:38 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.ascio.com"], "registrar": ["Ascio Technologies, Inc"], "name_servers": ["NS1.THEREGISTER.COM", "NS2.THEREGISTER.COM", "NS3.THEREGISTER.COM", "NS4.THEREGISTER.COM", "ns1.theregister.co.uk", "ns2.theregister.co.uk", "ns3.theregister.co.uk", "ns6.theregister.co.uk"], "emails": ["abuse@ascio.com"]}
\ No newline at end of file
+{"status": ["ACTIVE"], "updated_date": ["2013-07-02T00:24:06"], "contacts": {"admin": {"city": "Southport", "fax": "+44.7980898072", "name": "Philip Mitchell", "state": "Merseyside", "phone": "+44.7980898072", "street": "19 Saxon Road", "country": "GB", "postalcode": "PR8 2AX", "organization": "Situation Publishing Ltd", "email": "philip.mitchell@theregister.co.uk"}, "tech": {"city": "null", "fax": "+44.2070159375", "name": "NetNames Hostmaster", "state": "London", "phone": "+44.2070159370", "street": "3rd Floor Prospero House\n241 Borough High St.", "country": "GB", "postalcode": "SE1 1GA", "organization": "Netnames Ltd", "email": "corporate-services@netnames.com"}, "registrant": {"city": "Southport", "name": "Situation Publishing", "state": "Mersyside", "street": "19 Saxon Road", "country": "GB", "postalcode": "PR8 2AX", "organization": "Situation Publishing Ltd"}, "billing": null}, "nameservers": ["NS1.THEREGISTER.COM", "NS2.THEREGISTER.COM", "NS3.THEREGISTER.COM", "NS4.THEREGISTER.COM", "ns1.theregister.co.uk", "ns2.theregister.co.uk", "ns3.theregister.co.uk", "ns6.theregister.co.uk"], "expiration_date": ["2014-06-30T00:00:00"], "creation_date": ["2012-03-15T08:07:41"], "raw": ["The data in Ascio Technologies' WHOIS database is provided \nby Ascio Technologies for information purposes only. By submitting \na WHOIS query, you agree that you will use this data only for lawful \npurpose. In addition, you agree not to:\n(a) use the data to allow, enable, or otherwise support any marketing\nactivities, regardless of the medium used. Such media include but are \nnot limited to e-mail, telephone, facsimile, postal mail, SMS, and\nwireless alerts; or\n(b) use the data to enable high volume, automated, electronic processes\nthat sendqueries or data to the systems of any Registry Operator or \nICANN-Accredited registrar, except as reasonably necessary to register \ndomain names or modify existing registrations.\n(c) sell or redistribute the data except insofar as it has been \nincorporated into a value-added product or service that does not permit\nthe extraction of a substantial portion of the bulk data from the value-added\nproduct or service for use by other parties.\nAscio Technologies reserves the right to modify these terms at any time.\nAscio Technologies cannot guarantee the accuracy of the data provided.\nBy accessing and using Ascio Technologies WHOIS service, you agree to these terms.\n\nNOTE: FAILURE TO LOCATE A RECORD IN THE WHOIS DATABASE IS NOT\nINDICATIVE OF THE AVAILABILITY OF A DOMAIN NAME.\n\nDomain Name: theregister.com\nRegistry Domain ID:\nRegistrar WHOIS Server: whois.ascio.com\nRegistrar URL: http://www.ascio.com \nUpdated Date: 2013-07-02T00:24:06Z\nCreation Date: 2012-03-15T08:07:41Z\nRegistrar Registration Expiration Date: 2014-06-30T00:00:00Z\nRegistrar: Ascio Technologies, Inc\nRegistrar IANA ID: 106\nRegistrar Abuse Contact Email: abuse@ascio.com\nRegistrar Abuse Contact Phone: +44.2070159370\nReseller:\nDomain Status: ACTIVE\nRegistry Registrant ID:\nRegistrant Name: Situation Publishing\nRegistrant Organization: Situation Publishing Ltd\nRegistrant Street: 19 Saxon Road\nRegistrant City: Southport \nRegistrant State/Province: Mersyside\nRegistrant Postal Code: PR8 2AX\nRegistrant Country: GB\nRegistrant Phone:\nRegistrant Phone Ext:\nRegistrant Fax:\nRegistrant Fax Ext:\nRegistrant Email:\nRegistry Admin ID:\nAdmin Name: Philip Mitchell\nAdmin Organization: Situation Publishing Ltd\nAdmin Street: 19 Saxon Road\nAdmin City: Southport\nAdmin State/Province: Merseyside\nAdmin Postal Code: PR8 2AX\nAdmin Country: GB\nAdmin Phone: +44.7980898072\nAdmin Phone Ext:\nAdmin Fax: +44.7980898072\nAdmin Fax Ext:\nAdmin Email: philip.mitchell@theregister.co.uk\nRegistry Tech ID:\nTech Name: NetNames Hostmaster\nTech Organization: Netnames Ltd\nTech Street: 3rd Floor Prospero House\nTech Street: 241 Borough High St. \nTech City: null \nTech State/Province: London\nTech Postal Code: SE1 1GA\nTech Country: GB\nTech Phone: +44.2070159370\nTech Phone Ext:\nTech Fax: +44.2070159375 \nTech Fax Ext: \nTech Email: corporate-services@netnames.com\nName Server: NS1.THEREGISTER.COM\nName Server: NS2.THEREGISTER.COM\nName Server: NS3.THEREGISTER.COM\nName Server: NS4.THEREGISTER.COM\nName Server: ns1.theregister.co.uk\nName Server: ns2.theregister.co.uk\nName Server: ns3.theregister.co.uk\nName Server: ns6.theregister.co.uk\nDNSSEC:\nURL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/\n>>> Last update of WHOIS database: 2013-11-21T05:58:08 UTC <<<\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: THEREGISTER.COM\n Registrar: ASCIO TECHNOLOGIES, INC.\n Whois Server: whois.ascio.com\n Referral URL: http://www.ascio.com\n Name Server: NS1.THEREGISTER.CO.UK\n Name Server: NS2.THEREGISTER.CO.UK\n Name Server: NS3.THEREGISTER.CO.UK\n Name Server: NS4.THEREGISTER.CO.UK\n Name Server: NS5.THEREGISTER.CO.UK\n Name Server: NS6.THEREGISTER.CO.UK\n Status: clientDeleteProhibited\n Status: clientTransferProhibited\n Updated Date: 01-jul-2013\n Creation Date: 01-jul-1996\n Expiration Date: 30-jun-2014\n\n>>> Last update of whois database: Thu, 21 Nov 2013 05:57:38 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.ascio.com"], "registrar": ["Ascio Technologies, Inc"], "emails": ["abuse@ascio.com"]}
\ No newline at end of file
diff --git a/test/target_default/twitter.com b/test/target_default/twitter.com
index cc0ffcb..2581ca1 100644
--- a/test/target_default/twitter.com
+++ b/test/target_default/twitter.com
@@ -1 +1 @@
-{"updated_date": ["2013-10-07T00:00:00", "2013-10-07T00:00:00"], "status": ["clientTransferProhibited", "serverDeleteProhibited", "serverTransferProhibited", "serverUpdateProhibited"], "contacts": {"admin": {"city": "San Francisco", "name": "Domain Admin", "country": "US", "phone": "+1.4152229670", "state": "CA", "street": "1355 Market Street Suite 900", "postalcode": "94103", "organization": "Twitter, Inc.", "email": "domains@twitter.com"}, "tech": {"city": "San Francisco", "name": "Tech Admin", "country": "US", "phone": "+1.4152229670", "state": "CA", "street": "1355 Market Street Suite 900", "postalcode": "94103", "organization": "Twitter, Inc.", "email": "domains-tech@twitter.com"}, "registrant": {"city": "San Francisco", "name": "Twitter, Inc.", "country": "US", "state": "CA", "street": "1355 Market Street Suite 900", "postalcode": "94103", "organization": "Twitter, Inc.", "email": "domains@twitter.com"}, "billing": null}, "expiration_date": ["2020-01-21T00:00:00", "2020-01-21T00:00:00"], "id": null, "creation_date": ["2000-01-21T00:00:00", "2000-01-21T00:00:00"], "raw": ["\nCorporation Service Company(c) (CSC) The Trusted Partner of More than 50% of the 100 Best Global Brands.\n\nContact us to learn more about our enterprise solutions for Global Domain Name Registration and Management, Trademark Research and Watching, Brand, Logo and Auction Monitoring, as well SSL Certificate Services and DNS Hosting.\n\nNOTICE: You are not authorized to access or query our WHOIS database through the use of high-volume, automated, electronic processes or for the purpose or purposes of using the data in any manner that violates these terms of use. The Data in the CSC WHOIS database is provided by CSC for information purposes only, and to assist persons in obtaining information about or related to a domain name registration record. CSC does not guarantee its accuracy. By submitting a WHOIS query, you agree to abide by the following terms of use: you agree that you may use this Data only for lawful purposes and that under no circumstances will you use this Data to: (1) allow, enable, or otherwise support the transmission of mass unsolicited, commercial advertising or solicitations via direct mail, e-mail, telephone, or facsimile; or (2) enable high volume, automated, electronic processes that apply to CSC (or its computer systems). CSC reserves the right to terminate your access to the WHOIS database in its sole discretion for any violations by you of these terms of use. CSC reserves the right to modify these terms at any time.\n\n Registrant: \n Twitter, Inc.\n Twitter, Inc.\n 1355 Market Street Suite 900\n San Francisco, CA 94103\n US\n Email: domains@twitter.com\n\n Registrar Name....: CORPORATE DOMAINS, INC.\n Registrar Whois...: whois.corporatedomains.com\n Registrar Homepage: www.cscprotectsbrands.com \n\n Domain Name: twitter.com\n\n Created on..............: Fri, Jan 21, 2000\n Expires on..............: Tue, Jan 21, 2020\n Record last updated on..: Mon, Oct 07, 2013\n\n Administrative Contact:\n Twitter, Inc.\n Domain Admin\n 1355 Market Street Suite 900\n San Francisco, CA 94103\n US\n Phone: +1.4152229670\n Email: domains@twitter.com\n\n Technical Contact:\n Twitter, Inc.\n Tech Admin\n 1355 Market Street Suite 900\n San Francisco, CA 94103\n US\n Phone: +1.4152229670\n Email: domains-tech@twitter.com\n\n DNS Servers:\n\n NS3.P34.DYNECT.NET\n NS4.P34.DYNECT.NET\n NS2.P34.DYNECT.NET\n NS1.P34.DYNECT.NET\n \n\nRegister your domain name at http://www.cscglobal.com\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Server Name: TWITTER.COM.GET.ONE.MILLION.DOLLARS.AT.WWW.UNIMUNDI.COM\n IP Address: 209.126.190.71\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Domain Name: TWITTER.COM\n Registrar: CSC CORPORATE DOMAINS, INC.\n Whois Server: whois.corporatedomains.com\n Referral URL: http://www.cscglobal.com\n Name Server: NS1.P34.DYNECT.NET\n Name Server: NS2.P34.DYNECT.NET\n Name Server: NS3.P34.DYNECT.NET\n Name Server: NS4.P34.DYNECT.NET\n Status: clientTransferProhibited\n Status: serverDeleteProhibited\n Status: serverTransferProhibited\n Status: serverUpdateProhibited\n Updated Date: 07-oct-2013\n Creation Date: 21-jan-2000\n Expiration Date: 21-jan-2020\n\n>>> Last update of whois database: Sat, 23 Nov 2013 14:23:45 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.PublicDomainRegistry.com", "whois.corporatedomains.com"], "registrar": ["CORPORATE DOMAINS, INC."], "name_servers": ["NS3.P34.DYNECT.NET", "NS4.P34.DYNECT.NET", "NS2.P34.DYNECT.NET", "NS1.P34.DYNECT.NET"], "emails": []}
\ No newline at end of file
+{"updated_date": ["2013-10-07T00:00:00", "2013-10-07T00:00:00"], "status": ["clientTransferProhibited", "serverDeleteProhibited", "serverTransferProhibited", "serverUpdateProhibited"], "contacts": {"admin": {"city": "San Francisco", "name": "Domain Admin", "country": "US", "phone": "+1.4152229670", "state": "CA", "street": "1355 Market Street Suite 900", "postalcode": "94103", "organization": "Twitter, Inc.", "email": "domains@twitter.com"}, "tech": {"city": "San Francisco", "name": "Tech Admin", "country": "US", "phone": "+1.4152229670", "state": "CA", "street": "1355 Market Street Suite 900", "postalcode": "94103", "organization": "Twitter, Inc.", "email": "domains-tech@twitter.com"}, "registrant": {"city": "San Francisco", "name": "Twitter, Inc.", "country": "US", "state": "CA", "street": "1355 Market Street Suite 900", "postalcode": "94103", "organization": "Twitter, Inc.", "email": "domains@twitter.com"}, "billing": null}, "nameservers": ["NS3.P34.DYNECT.NET", "NS4.P34.DYNECT.NET", "NS2.P34.DYNECT.NET", "NS1.P34.DYNECT.NET"], "expiration_date": ["2020-01-21T00:00:00", "2020-01-21T00:00:00"], "creation_date": ["2000-01-21T00:00:00", "2000-01-21T00:00:00"], "raw": ["\nCorporation Service Company(c) (CSC) The Trusted Partner of More than 50% of the 100 Best Global Brands.\n\nContact us to learn more about our enterprise solutions for Global Domain Name Registration and Management, Trademark Research and Watching, Brand, Logo and Auction Monitoring, as well SSL Certificate Services and DNS Hosting.\n\nNOTICE: You are not authorized to access or query our WHOIS database through the use of high-volume, automated, electronic processes or for the purpose or purposes of using the data in any manner that violates these terms of use. The Data in the CSC WHOIS database is provided by CSC for information purposes only, and to assist persons in obtaining information about or related to a domain name registration record. CSC does not guarantee its accuracy. By submitting a WHOIS query, you agree to abide by the following terms of use: you agree that you may use this Data only for lawful purposes and that under no circumstances will you use this Data to: (1) allow, enable, or otherwise support the transmission of mass unsolicited, commercial advertising or solicitations via direct mail, e-mail, telephone, or facsimile; or (2) enable high volume, automated, electronic processes that apply to CSC (or its computer systems). CSC reserves the right to terminate your access to the WHOIS database in its sole discretion for any violations by you of these terms of use. CSC reserves the right to modify these terms at any time.\n\n Registrant: \n Twitter, Inc.\n Twitter, Inc.\n 1355 Market Street Suite 900\n San Francisco, CA 94103\n US\n Email: domains@twitter.com\n\n Registrar Name....: CORPORATE DOMAINS, INC.\n Registrar Whois...: whois.corporatedomains.com\n Registrar Homepage: www.cscprotectsbrands.com \n\n Domain Name: twitter.com\n\n Created on..............: Fri, Jan 21, 2000\n Expires on..............: Tue, Jan 21, 2020\n Record last updated on..: Mon, Oct 07, 2013\n\n Administrative Contact:\n Twitter, Inc.\n Domain Admin\n 1355 Market Street Suite 900\n San Francisco, CA 94103\n US\n Phone: +1.4152229670\n Email: domains@twitter.com\n\n Technical Contact:\n Twitter, Inc.\n Tech Admin\n 1355 Market Street Suite 900\n San Francisco, CA 94103\n US\n Phone: +1.4152229670\n Email: domains-tech@twitter.com\n\n DNS Servers:\n\n NS3.P34.DYNECT.NET\n NS4.P34.DYNECT.NET\n NS2.P34.DYNECT.NET\n NS1.P34.DYNECT.NET\n \n\nRegister your domain name at http://www.cscglobal.com\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Server Name: TWITTER.COM.GET.ONE.MILLION.DOLLARS.AT.WWW.UNIMUNDI.COM\n IP Address: 209.126.190.71\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Domain Name: TWITTER.COM\n Registrar: CSC CORPORATE DOMAINS, INC.\n Whois Server: whois.corporatedomains.com\n Referral URL: http://www.cscglobal.com\n Name Server: NS1.P34.DYNECT.NET\n Name Server: NS2.P34.DYNECT.NET\n Name Server: NS3.P34.DYNECT.NET\n Name Server: NS4.P34.DYNECT.NET\n Status: clientTransferProhibited\n Status: serverDeleteProhibited\n Status: serverTransferProhibited\n Status: serverUpdateProhibited\n Updated Date: 07-oct-2013\n Creation Date: 21-jan-2000\n Expiration Date: 21-jan-2020\n\n>>> Last update of whois database: Sat, 23 Nov 2013 14:23:45 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.PublicDomainRegistry.com", "whois.corporatedomains.com"], "registrar": ["CORPORATE DOMAINS, INC."]}
\ No newline at end of file
diff --git a/test/target_default/whirlpool.net.au b/test/target_default/whirlpool.net.au
index d973522..7d6f2a4 100644
--- a/test/target_default/whirlpool.net.au
+++ b/test/target_default/whirlpool.net.au
@@ -1 +1 @@
-{"status": ["ok"], "updated_date": ["2012-02-06T09:28:40"], "contacts": {"admin": null, "tech": {"handle": "WRSI1010", "name": "Simon Wright"}, "registrant": {"organization": "Whirlpool Broadband Multimedia", "handle": "WRSI1010", "name": "Simon Wright"}, "billing": null}, "expiration_date": null, "emails": null, "creation_date": null, "raw": ["Domain Name: whirlpool.net.au\nLast Modified: 06-Feb-2012 09:28:40 UTC\nRegistrar ID: NetRegistry\nRegistrar Name: NetRegistry\nStatus: ok\n\nRegistrant: Simon Wright\nEligibility Type: Registered Business\nEligibility Name: Whirlpool Broadband Multimedia\nEligibility ID: NSW BN BN98319722\n\nRegistrant Contact ID: WRSI1010\nRegistrant Contact Name: Simon Wright\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: WRSI1010\nTech Contact Name: Simon Wright\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: ns0.bulletproof.net.au\nName Server IP: 202.44.98.24\nName Server: ns1.bulletproof.net.au\nName Server IP: 64.71.152.56\nName Server: ns1.bulletproofnetworks.net\nName Server: ns0.bulletproofnetworks.net\n\n"], "whois_server": null, "registrar": ["NetRegistry"], "name_servers": ["ns0.bulletproof.net.au", "ns1.bulletproof.net.au", "ns1.bulletproofnetworks.net", "ns0.bulletproofnetworks.net"], "id": null}
\ No newline at end of file
+{"status": ["ok"], "updated_date": ["2012-02-06T09:28:40"], "contacts": {"admin": null, "tech": {"handle": "WRSI1010", "name": "Simon Wright"}, "registrant": {"organization": "Whirlpool Broadband Multimedia", "handle": "WRSI1010", "name": "Simon Wright"}, "billing": null}, "nameservers": ["ns0.bulletproof.net.au", "ns1.bulletproof.net.au", "ns1.bulletproofnetworks.net", "ns0.bulletproofnetworks.net"], "creation_date": null, "raw": ["Domain Name: whirlpool.net.au\nLast Modified: 06-Feb-2012 09:28:40 UTC\nRegistrar ID: NetRegistry\nRegistrar Name: NetRegistry\nStatus: ok\n\nRegistrant: Simon Wright\nEligibility Type: Registered Business\nEligibility Name: Whirlpool Broadband Multimedia\nEligibility ID: NSW BN BN98319722\n\nRegistrant Contact ID: WRSI1010\nRegistrant Contact Name: Simon Wright\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: WRSI1010\nTech Contact Name: Simon Wright\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: ns0.bulletproof.net.au\nName Server IP: 202.44.98.24\nName Server: ns1.bulletproof.net.au\nName Server IP: 64.71.152.56\nName Server: ns1.bulletproofnetworks.net\nName Server: ns0.bulletproofnetworks.net\n\n"], "registrar": ["NetRegistry"]}
\ No newline at end of file
diff --git a/test/target_default/whois.com b/test/target_default/whois.com
index 5069fbf..eabfa5f 100644
--- a/test/target_default/whois.com
+++ b/test/target_default/whois.com
@@ -1 +1 @@
-{"status": ["LOCKED"], "updated_date": ["2011-10-24T00:00:00", "2013-11-23T11:09:14"], "contacts": {"admin": {"city": "Singapore", "name": "DNS Admin", "phone": "+65.67553177", "state": "Singapore", "street": "c/o 9A Jasmine Road", "country": "SG", "postalcode": "576582", "organization": "Whois Inc", "email": "dnsadmin@whois.com"}, "tech": {"city": "Singapore", "name": "DNS Admin", "phone": "+65.67553177", "state": "Singapore", "street": "c/o 9A Jasmine Road", "country": "SG", "postalcode": "576582", "organization": "Whois Inc", "email": "dnsadmin@whois.com"}, "registrant": {"city": "Singapore", "name": "DNS Admin", "phone": "+65.67553177", "state": "Singapore", "street": "c/o 9A Jasmine Road", "country": "SG", "postalcode": "576582", "organization": "Whois Inc", "email": "dnsadmin@whois.com"}, "billing": {"city": "Singapore", "name": "DNS Admin", "phone": "+65.67553177", "state": "Singapore", "street": "c/o 9A Jasmine Road", "country": "SG", "postalcode": "576582", "organization": "Whois Inc", "email": "dnsadmin@whois.com"}}, "expiration_date": ["2021-04-12T00:00:00"], "id": null, "creation_date": ["1995-04-11T00:00:00"], "raw": ["Registration Service Provided By: WHOIS.COM\n\nDomain Name: WHOIS.COM\n\n Registration Date: 11-Apr-1995 \n Expiration Date: 12-Apr-2021 \n\n Status:LOCKED\n\tNote: This Domain Name is currently Locked. \n\tThis feature is provided to protect against fraudulent acquisition of the domain name, \n\tas in this status the domain name cannot be transferred or modified. \n\n Name Servers: \n ns1.whois.com\n ns2.whois.com\n ns3.whois.com\n ns4.whois.com\n \n\n Registrant Contact Details:\n Whois Inc\n DNS Admin (dnsadmin@whois.com)\n c/o 9A Jasmine Road\n Singapore\n Singapore,576582\n SG\n Tel. +65.67553177\n\n Administrative Contact Details: \n Whois Inc\n DNS Admin (dnsadmin@whois.com)\n c/o 9A Jasmine Road\n Singapore\n Singapore,576582\n SG\n Tel. +65.67553177 \n\n Technical Contact Details: \n Whois Inc\n DNS Admin (dnsadmin@whois.com)\n c/o 9A Jasmine Road\n Singapore\n Singapore,576582\n SG\n Tel. +65.67553177 \n\n Billing Contact Details: \n Whois Inc\n DNS Admin (dnsadmin@whois.com)\n c/o 9A Jasmine Road\n Singapore\n Singapore,576582\n SG\n Tel. +65.67553177 \n \nThe data in this whois database is provided to you for information purposes \nonly, that is, to assist you in obtaining information about or related to a \ndomain name registration record. We make this information available \"as is\",\nand do not guarantee its accuracy. By submitting a whois query, you agree \nthat you will use this data only for lawful purposes and that, under no \ncircumstances will you use this data to: \n(1) enable high volume, automated, electronic processes that stress or load \nthis whois database system providing you this information; or \n(2) allow, enable, or otherwise support the transmission of mass unsolicited, \ncommercial advertising or solicitations via direct mail, electronic mail, or \nby telephone. \nThe compilation, repackaging, dissemination or other use of this data is \nexpressly prohibited without prior written consent from us. The Registrar of \nrecord is PDR Ltd. d/b/a PublicDomainRegistry.com. \nWe reserve the right to modify these terms at any time. \nBy submitting this query, you agree to abide by these terms.\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Server Name: WHOIS.COM.AU\n Registrar: TPP WHOLESALE PTY LTD.\n Whois Server: whois.distributeit.com.au\n Referral URL: http://www.tppwholesale.com.au\n\n Domain Name: WHOIS.COM\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n Name Server: NS1.WHOIS.COM\n Name Server: NS2.WHOIS.COM\n Name Server: NS3.WHOIS.COM\n Name Server: NS4.WHOIS.COM\n Status: clientTransferProhibited\n Updated Date: 24-oct-2011\n Creation Date: 11-apr-1995\n Expiration Date: 12-apr-2021\n\n>>> Last update of whois database: Sat, 23 Nov 2013 11:09:14 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.distributeit.com.au", "whois.PublicDomainRegistry.com"], "registrar": ["WHOIS.COM"], "name_servers": ["ns1.whois.com", "ns2.whois.com", "ns3.whois.com", "ns4.whois.com"], "emails": []}
\ No newline at end of file
+{"status": ["LOCKED"], "updated_date": ["2011-10-24T00:00:00", "2013-11-23T11:09:14"], "contacts": {"admin": {"city": "Singapore", "name": "DNS Admin", "phone": "+65.67553177", "state": "Singapore", "street": "c/o 9A Jasmine Road", "country": "SG", "postalcode": "576582", "organization": "Whois Inc", "email": "dnsadmin@whois.com"}, "tech": {"city": "Singapore", "name": "DNS Admin", "phone": "+65.67553177", "state": "Singapore", "street": "c/o 9A Jasmine Road", "country": "SG", "postalcode": "576582", "organization": "Whois Inc", "email": "dnsadmin@whois.com"}, "registrant": {"city": "Singapore", "name": "DNS Admin", "phone": "+65.67553177", "state": "Singapore", "street": "c/o 9A Jasmine Road", "country": "SG", "postalcode": "576582", "organization": "Whois Inc", "email": "dnsadmin@whois.com"}, "billing": {"city": "Singapore", "name": "DNS Admin", "phone": "+65.67553177", "state": "Singapore", "street": "c/o 9A Jasmine Road", "country": "SG", "postalcode": "576582", "organization": "Whois Inc", "email": "dnsadmin@whois.com"}}, "nameservers": ["ns1.whois.com", "ns2.whois.com", "ns3.whois.com", "ns4.whois.com"], "expiration_date": ["2021-04-12T00:00:00"], "creation_date": ["1995-04-11T00:00:00"], "raw": ["Registration Service Provided By: WHOIS.COM\n\nDomain Name: WHOIS.COM\n\n Registration Date: 11-Apr-1995 \n Expiration Date: 12-Apr-2021 \n\n Status:LOCKED\n\tNote: This Domain Name is currently Locked. \n\tThis feature is provided to protect against fraudulent acquisition of the domain name, \n\tas in this status the domain name cannot be transferred or modified. \n\n Name Servers: \n ns1.whois.com\n ns2.whois.com\n ns3.whois.com\n ns4.whois.com\n \n\n Registrant Contact Details:\n Whois Inc\n DNS Admin (dnsadmin@whois.com)\n c/o 9A Jasmine Road\n Singapore\n Singapore,576582\n SG\n Tel. +65.67553177\n\n Administrative Contact Details: \n Whois Inc\n DNS Admin (dnsadmin@whois.com)\n c/o 9A Jasmine Road\n Singapore\n Singapore,576582\n SG\n Tel. +65.67553177 \n\n Technical Contact Details: \n Whois Inc\n DNS Admin (dnsadmin@whois.com)\n c/o 9A Jasmine Road\n Singapore\n Singapore,576582\n SG\n Tel. +65.67553177 \n\n Billing Contact Details: \n Whois Inc\n DNS Admin (dnsadmin@whois.com)\n c/o 9A Jasmine Road\n Singapore\n Singapore,576582\n SG\n Tel. +65.67553177 \n \nThe data in this whois database is provided to you for information purposes \nonly, that is, to assist you in obtaining information about or related to a \ndomain name registration record. We make this information available \"as is\",\nand do not guarantee its accuracy. By submitting a whois query, you agree \nthat you will use this data only for lawful purposes and that, under no \ncircumstances will you use this data to: \n(1) enable high volume, automated, electronic processes that stress or load \nthis whois database system providing you this information; or \n(2) allow, enable, or otherwise support the transmission of mass unsolicited, \ncommercial advertising or solicitations via direct mail, electronic mail, or \nby telephone. \nThe compilation, repackaging, dissemination or other use of this data is \nexpressly prohibited without prior written consent from us. The Registrar of \nrecord is PDR Ltd. d/b/a PublicDomainRegistry.com. \nWe reserve the right to modify these terms at any time. \nBy submitting this query, you agree to abide by these terms.\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Server Name: WHOIS.COM.AU\n Registrar: TPP WHOLESALE PTY LTD.\n Whois Server: whois.distributeit.com.au\n Referral URL: http://www.tppwholesale.com.au\n\n Domain Name: WHOIS.COM\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n Name Server: NS1.WHOIS.COM\n Name Server: NS2.WHOIS.COM\n Name Server: NS3.WHOIS.COM\n Name Server: NS4.WHOIS.COM\n Status: clientTransferProhibited\n Updated Date: 24-oct-2011\n Creation Date: 11-apr-1995\n Expiration Date: 12-apr-2021\n\n>>> Last update of whois database: Sat, 23 Nov 2013 11:09:14 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.distributeit.com.au", "whois.PublicDomainRegistry.com"], "registrar": ["WHOIS.COM"]}
\ No newline at end of file
diff --git a/test/target_default/whois.us b/test/target_default/whois.us
index 6bbec55..7420253 100644
--- a/test/target_default/whois.us
+++ b/test/target_default/whois.us
@@ -1 +1 @@
-{"status": ["clientDeleteProhibited", "clientTransferProhibited", "serverDeleteProhibited", "serverTransferProhibited", "serverUpdateProhibited"], "updated_date": ["2013-06-02T01:33:47", "2013-11-20T04:08:15"], "contacts": {"admin": {"city": "Sterling", "handle": "NEUSTAR7", "name": ".US Registration Policy", "phone": "+1.5714345728", "state": "VA", "street": "46000 Center Oak Plaza", "country": "United States", "postalcode": "20166", "email": "support.us@neustar.us"}, "tech": {"city": "Sterling", "handle": "NEUSTAR7", "name": ".US Registration Policy", "phone": "+1.5714345728", "state": "VA", "street": "46000 Center Oak Plaza", "country": "United States", "postalcode": "20166", "email": "support.us@neustar.us"}, "registrant": {"city": "Sterling", "handle": "NEUSTAR7", "name": ".US Registration Policy", "phone": "+1.5714345728", "state": "VA", "street": "46000 Center Oak Plaza", "country": "United States", "postalcode": "20166", "email": "support.us@neustar.us"}, "billing": {"city": "Sterling", "handle": "NEUSTAR7", "name": ".US Registration Policy", "phone": "+1.5714345728", "state": "VA", "street": "46000 Center Oak Plaza", "country": "United States", "postalcode": "20166", "email": "support.us@neustar.us"}}, "expiration_date": ["2014-04-17T23:59:59"], "emails": [], "raw": ["Domain Name: WHOIS.US\nDomain ID: D675910-US\nSponsoring Registrar: REGISTRY REGISTRAR\nRegistrar URL (registration services): WWW.NEUSTAR.US\nDomain Status: clientDeleteProhibited\nDomain Status: clientTransferProhibited\nDomain Status: serverDeleteProhibited\nDomain Status: serverTransferProhibited\nDomain Status: serverUpdateProhibited\nRegistrant ID: NEUSTAR7\nRegistrant Name: .US Registration Policy\nRegistrant Address1: 46000 Center Oak Plaza\nRegistrant City: Sterling\nRegistrant State/Province: VA\nRegistrant Postal Code: 20166\nRegistrant Country: United States\nRegistrant Country Code: US\nRegistrant Phone Number: +1.5714345728\nRegistrant Email: support.us@neustar.us\nRegistrant Application Purpose: P5\nRegistrant Nexus Category: C21\nAdministrative Contact ID: NEUSTAR7\nAdministrative Contact Name: .US Registration Policy\nAdministrative Contact Address1: 46000 Center Oak Plaza\nAdministrative Contact City: Sterling\nAdministrative Contact State/Province: VA\nAdministrative Contact Postal Code: 20166\nAdministrative Contact Country: United States\nAdministrative Contact Country Code: US\nAdministrative Contact Phone Number: +1.5714345728\nAdministrative Contact Email: support.us@neustar.us\nAdministrative Application Purpose: P5\nAdministrative Nexus Category: C21\nBilling Contact ID: NEUSTAR7\nBilling Contact Name: .US Registration Policy\nBilling Contact Address1: 46000 Center Oak Plaza\nBilling Contact City: Sterling\nBilling Contact State/Province: VA\nBilling Contact Postal Code: 20166\nBilling Contact Country: United States\nBilling Contact Country Code: US\nBilling Contact Phone Number: +1.5714345728\nBilling Contact Email: support.us@neustar.us\nBilling Application Purpose: P5\nBilling Nexus Category: C21\nTechnical Contact ID: NEUSTAR7\nTechnical Contact Name: .US Registration Policy\nTechnical Contact Address1: 46000 Center Oak Plaza\nTechnical Contact City: Sterling\nTechnical Contact State/Province: VA\nTechnical Contact Postal Code: 20166\nTechnical Contact Country: United States\nTechnical Contact Country Code: US\nTechnical Contact Phone Number: +1.5714345728\nTechnical Contact Email: support.us@neustar.us\nTechnical Application Purpose: P5\nTechnical Nexus Category: C21\nName Server: PDNS1.ULTRADNS.NET\nName Server: PDNS2.ULTRADNS.NET\nName Server: PDNS3.ULTRADNS.ORG\nName Server: PDNS4.ULTRADNS.ORG\nName Server: PDNS5.ULTRADNS.INFO\nName Server: PDNS6.ULTRADNS.CO.UK\nCreated by Registrar: REGISTRY REGISTRAR\nLast Updated by Registrar: BATCHCSR\nDomain Registration Date: Thu Apr 18 20:44:15 GMT 2002\nDomain Expiration Date: Thu Apr 17 23:59:59 GMT 2014\nDomain Last Updated Date: Sun Jun 02 01:33:47 GMT 2013\n\n>>>> Whois database was last updated on: Wed Nov 20 04:08:15 GMT 2013 <<<<\n\nNeuStar, Inc., the Registry Administrator for .US, has collected this\ninformation for the WHOIS database through a .US-Accredited Registrar.\nThis information is provided to you for informational purposes only and is\ndesigned to assist persons in determining contents of a domain name\nregistration record in the NeuStar registry database. NeuStar makes this\ninformation available to you \"as is\" and does not guarantee its accuracy.\nBy submitting a WHOIS query, you agree that you will use this data only for\nlawful purposes and that, under no circumstances will you use this data:\n(1) to allow, enable, or otherwise support the transmission of mass\nunsolicited, commercial advertising or solicitations via direct mail,\nelectronic mail, or by telephone; (2) in contravention of any applicable\ndata and privacy protection laws; or (3) to enable high volume, automated,\nelectronic processes that apply to the registry (or its systems). Compilation,\nrepackaging, dissemination, or other use of the WHOIS database in its\nentirety, or of a substantial portion thereof, is not allowed without\nNeuStar's prior written permission. NeuStar reserves the right to modify or\nchange these conditions at any time without prior or subsequent notification\nof any kind. By executing this query, in any manner whatsoever, you agree to\nabide by these terms.\n\nNOTE: FAILURE TO LOCATE A RECORD IN THE WHOIS DATABASE IS NOT INDICATIVE\nOF THE AVAILABILITY OF A DOMAIN NAME.\n\nAll domain names are subject to certain additional domain name registration\nrules. For details, please visit our site at www.whois.us.\n\n"], "whois_server": null, "registrar": ["REGISTRY REGISTRAR", "BATCHCSR"], "name_servers": ["PDNS1.ULTRADNS.NET", "PDNS2.ULTRADNS.NET", "PDNS3.ULTRADNS.ORG", "PDNS4.ULTRADNS.ORG", "PDNS5.ULTRADNS.INFO", "PDNS6.ULTRADNS.CO.UK"], "creation_date": ["2002-04-18T20:44:15"], "id": ["D675910-US"]}
\ No newline at end of file
+{"status": ["clientDeleteProhibited", "clientTransferProhibited", "serverDeleteProhibited", "serverTransferProhibited", "serverUpdateProhibited"], "updated_date": ["2013-06-02T01:33:47", "2013-11-20T04:08:15"], "contacts": {"admin": {"city": "Sterling", "handle": "NEUSTAR7", "name": ".US Registration Policy", "phone": "+1.5714345728", "state": "VA", "street": "46000 Center Oak Plaza", "country": "United States", "postalcode": "20166", "email": "support.us@neustar.us"}, "tech": {"city": "Sterling", "handle": "NEUSTAR7", "name": ".US Registration Policy", "phone": "+1.5714345728", "state": "VA", "street": "46000 Center Oak Plaza", "country": "United States", "postalcode": "20166", "email": "support.us@neustar.us"}, "registrant": {"city": "Sterling", "handle": "NEUSTAR7", "name": ".US Registration Policy", "phone": "+1.5714345728", "state": "VA", "street": "46000 Center Oak Plaza", "country": "United States", "postalcode": "20166", "email": "support.us@neustar.us"}, "billing": {"city": "Sterling", "handle": "NEUSTAR7", "name": ".US Registration Policy", "phone": "+1.5714345728", "state": "VA", "street": "46000 Center Oak Plaza", "country": "United States", "postalcode": "20166", "email": "support.us@neustar.us"}}, "nameservers": ["PDNS1.ULTRADNS.NET", "PDNS2.ULTRADNS.NET", "PDNS3.ULTRADNS.ORG", "PDNS4.ULTRADNS.ORG", "PDNS5.ULTRADNS.INFO", "PDNS6.ULTRADNS.CO.UK"], "expiration_date": ["2014-04-17T23:59:59"], "raw": ["Domain Name: WHOIS.US\nDomain ID: D675910-US\nSponsoring Registrar: REGISTRY REGISTRAR\nRegistrar URL (registration services): WWW.NEUSTAR.US\nDomain Status: clientDeleteProhibited\nDomain Status: clientTransferProhibited\nDomain Status: serverDeleteProhibited\nDomain Status: serverTransferProhibited\nDomain Status: serverUpdateProhibited\nRegistrant ID: NEUSTAR7\nRegistrant Name: .US Registration Policy\nRegistrant Address1: 46000 Center Oak Plaza\nRegistrant City: Sterling\nRegistrant State/Province: VA\nRegistrant Postal Code: 20166\nRegistrant Country: United States\nRegistrant Country Code: US\nRegistrant Phone Number: +1.5714345728\nRegistrant Email: support.us@neustar.us\nRegistrant Application Purpose: P5\nRegistrant Nexus Category: C21\nAdministrative Contact ID: NEUSTAR7\nAdministrative Contact Name: .US Registration Policy\nAdministrative Contact Address1: 46000 Center Oak Plaza\nAdministrative Contact City: Sterling\nAdministrative Contact State/Province: VA\nAdministrative Contact Postal Code: 20166\nAdministrative Contact Country: United States\nAdministrative Contact Country Code: US\nAdministrative Contact Phone Number: +1.5714345728\nAdministrative Contact Email: support.us@neustar.us\nAdministrative Application Purpose: P5\nAdministrative Nexus Category: C21\nBilling Contact ID: NEUSTAR7\nBilling Contact Name: .US Registration Policy\nBilling Contact Address1: 46000 Center Oak Plaza\nBilling Contact City: Sterling\nBilling Contact State/Province: VA\nBilling Contact Postal Code: 20166\nBilling Contact Country: United States\nBilling Contact Country Code: US\nBilling Contact Phone Number: +1.5714345728\nBilling Contact Email: support.us@neustar.us\nBilling Application Purpose: P5\nBilling Nexus Category: C21\nTechnical Contact ID: NEUSTAR7\nTechnical Contact Name: .US Registration Policy\nTechnical Contact Address1: 46000 Center Oak Plaza\nTechnical Contact City: Sterling\nTechnical Contact State/Province: VA\nTechnical Contact Postal Code: 20166\nTechnical Contact Country: United States\nTechnical Contact Country Code: US\nTechnical Contact Phone Number: +1.5714345728\nTechnical Contact Email: support.us@neustar.us\nTechnical Application Purpose: P5\nTechnical Nexus Category: C21\nName Server: PDNS1.ULTRADNS.NET\nName Server: PDNS2.ULTRADNS.NET\nName Server: PDNS3.ULTRADNS.ORG\nName Server: PDNS4.ULTRADNS.ORG\nName Server: PDNS5.ULTRADNS.INFO\nName Server: PDNS6.ULTRADNS.CO.UK\nCreated by Registrar: REGISTRY REGISTRAR\nLast Updated by Registrar: BATCHCSR\nDomain Registration Date: Thu Apr 18 20:44:15 GMT 2002\nDomain Expiration Date: Thu Apr 17 23:59:59 GMT 2014\nDomain Last Updated Date: Sun Jun 02 01:33:47 GMT 2013\n\n>>>> Whois database was last updated on: Wed Nov 20 04:08:15 GMT 2013 <<<<\n\nNeuStar, Inc., the Registry Administrator for .US, has collected this\ninformation for the WHOIS database through a .US-Accredited Registrar.\nThis information is provided to you for informational purposes only and is\ndesigned to assist persons in determining contents of a domain name\nregistration record in the NeuStar registry database. NeuStar makes this\ninformation available to you \"as is\" and does not guarantee its accuracy.\nBy submitting a WHOIS query, you agree that you will use this data only for\nlawful purposes and that, under no circumstances will you use this data:\n(1) to allow, enable, or otherwise support the transmission of mass\nunsolicited, commercial advertising or solicitations via direct mail,\nelectronic mail, or by telephone; (2) in contravention of any applicable\ndata and privacy protection laws; or (3) to enable high volume, automated,\nelectronic processes that apply to the registry (or its systems). Compilation,\nrepackaging, dissemination, or other use of the WHOIS database in its\nentirety, or of a substantial portion thereof, is not allowed without\nNeuStar's prior written permission. NeuStar reserves the right to modify or\nchange these conditions at any time without prior or subsequent notification\nof any kind. By executing this query, in any manner whatsoever, you agree to\nabide by these terms.\n\nNOTE: FAILURE TO LOCATE A RECORD IN THE WHOIS DATABASE IS NOT INDICATIVE\nOF THE AVAILABILITY OF A DOMAIN NAME.\n\nAll domain names are subject to certain additional domain name registration\nrules. For details, please visit our site at www.whois.us.\n\n"], "registrar": ["REGISTRY REGISTRAR", "BATCHCSR"], "creation_date": ["2002-04-18T20:44:15"], "id": ["D675910-US"]}
\ No newline at end of file
diff --git a/test/target_default/winamp.com b/test/target_default/winamp.com
index 0eb8756..ee809ad 100644
--- a/test/target_default/winamp.com
+++ b/test/target_default/winamp.com
@@ -1 +1 @@
-{"status": ["clientTransferProhibited", "serverDeleteProhibited", "serverTransferProhibited", "serverUpdateProhibited"], "updated_date": ["2013-10-03T00:00:00", "2013-11-22T05:13:08"], "contacts": {"admin": {"city": "Dulles", "name": "Domain Admin", "phone": "+1.7032654670", "state": "VA", "street": "AOL Inc.\n22000 AOL Way", "country": "UNITED STATES", "postalcode": "20166", "email": "domain-adm@corp.aol.com"}, "tech": {"city": "Dulles", "name": "Domain Admin", "phone": "+1.7032654670", "state": "VA", "street": "AOL Inc.\n22000 AOL Way", "country": "UNITED STATES", "postalcode": "20166", "email": "domain-adm@corp.aol.com"}, "registrant": {"city": "Dulles", "name": "AOL Inc.", "state": "VA", "street": "22000 AOL Way", "country": "UNITED STATES", "postalcode": "20166"}, "billing": null}, "expiration_date": ["2014-12-23T00:00:00"], "id": null, "creation_date": ["1997-12-30T00:00:00"], "raw": ["\nDomain Name.......... winamp.com\n Creation Date........ 1997-12-30\n Registration Date.... 2009-10-03\n Expiry Date.......... 2014-12-24\n Organisation Name.... AOL Inc.\n Organisation Address. 22000 AOL Way\n Organisation Address. \n Organisation Address. \n Organisation Address. Dulles\n Organisation Address. 20166\n Organisation Address. VA\n Organisation Address. UNITED STATES\n\nAdmin Name........... Domain Admin\n Admin Address........ AOL Inc.\n Admin Address........ 22000 AOL Way\n Admin Address........ \n Admin Address. Dulles\n Admin Address........ 20166\n Admin Address........ VA\n Admin Address........ UNITED STATES\n Admin Email.......... domain-adm@corp.aol.com\n Admin Phone.......... +1.7032654670\n Admin Fax............ \n\nTech Name............ Domain Admin\n Tech Address......... AOL Inc.\n Tech Address......... 22000 AOL Way\n Tech Address......... \n Tech Address......... Dulles\n Tech Address......... 20166\n Tech Address......... VA\n Tech Address......... UNITED STATES\n Tech Email........... domain-adm@corp.aol.com\n Tech Phone........... +1.7032654670\n Tech Fax............. \n Name Server.......... dns-02.ns.aol.com\n Name Server.......... dns-06.ns.aol.com\n Name Server.......... dns-07.ns.aol.com\n Name Server.......... dns-01.ns.aol.com\n\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: WINAMP.COM\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n Name Server: DNS-01.NS.AOL.COM\n Name Server: DNS-02.NS.AOL.COM\n Name Server: DNS-06.NS.AOL.COM\n Name Server: DNS-07.NS.AOL.COM\n Status: clientTransferProhibited\n Status: serverDeleteProhibited\n Status: serverTransferProhibited\n Status: serverUpdateProhibited\n Updated Date: 03-oct-2013\n Creation Date: 30-dec-1997\n Expiration Date: 23-dec-2014\n\n>>> Last update of whois database: Fri, 22 Nov 2013 05:13:08 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.melbourneit.com"], "registrar": ["MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE"], "name_servers": ["dns-02.ns.aol.com", "dns-06.ns.aol.com", "dns-07.ns.aol.com", "dns-01.ns.aol.com"], "emails": []}
\ No newline at end of file
+{"status": ["clientTransferProhibited", "serverDeleteProhibited", "serverTransferProhibited", "serverUpdateProhibited"], "updated_date": ["2013-10-03T00:00:00", "2013-11-22T05:13:08"], "contacts": {"admin": {"city": "Dulles", "name": "Domain Admin", "phone": "+1.7032654670", "state": "VA", "street": "AOL Inc.\n22000 AOL Way", "country": "UNITED STATES", "postalcode": "20166", "email": "domain-adm@corp.aol.com"}, "tech": {"city": "Dulles", "name": "Domain Admin", "phone": "+1.7032654670", "state": "VA", "street": "AOL Inc.\n22000 AOL Way", "country": "UNITED STATES", "postalcode": "20166", "email": "domain-adm@corp.aol.com"}, "registrant": {"city": "Dulles", "name": "AOL Inc.", "state": "VA", "street": "22000 AOL Way", "country": "UNITED STATES", "postalcode": "20166"}, "billing": null}, "nameservers": ["dns-02.ns.aol.com", "dns-06.ns.aol.com", "dns-07.ns.aol.com", "dns-01.ns.aol.com"], "expiration_date": ["2014-12-23T00:00:00"], "creation_date": ["1997-12-30T00:00:00"], "raw": ["\nDomain Name.......... winamp.com\n Creation Date........ 1997-12-30\n Registration Date.... 2009-10-03\n Expiry Date.......... 2014-12-24\n Organisation Name.... AOL Inc.\n Organisation Address. 22000 AOL Way\n Organisation Address. \n Organisation Address. \n Organisation Address. Dulles\n Organisation Address. 20166\n Organisation Address. VA\n Organisation Address. UNITED STATES\n\nAdmin Name........... Domain Admin\n Admin Address........ AOL Inc.\n Admin Address........ 22000 AOL Way\n Admin Address........ \n Admin Address. Dulles\n Admin Address........ 20166\n Admin Address........ VA\n Admin Address........ UNITED STATES\n Admin Email.......... domain-adm@corp.aol.com\n Admin Phone.......... +1.7032654670\n Admin Fax............ \n\nTech Name............ Domain Admin\n Tech Address......... AOL Inc.\n Tech Address......... 22000 AOL Way\n Tech Address......... \n Tech Address......... Dulles\n Tech Address......... 20166\n Tech Address......... VA\n Tech Address......... UNITED STATES\n Tech Email........... domain-adm@corp.aol.com\n Tech Phone........... +1.7032654670\n Tech Fax............. \n Name Server.......... dns-02.ns.aol.com\n Name Server.......... dns-06.ns.aol.com\n Name Server.......... dns-07.ns.aol.com\n Name Server.......... dns-01.ns.aol.com\n\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: WINAMP.COM\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n Name Server: DNS-01.NS.AOL.COM\n Name Server: DNS-02.NS.AOL.COM\n Name Server: DNS-06.NS.AOL.COM\n Name Server: DNS-07.NS.AOL.COM\n Status: clientTransferProhibited\n Status: serverDeleteProhibited\n Status: serverTransferProhibited\n Status: serverUpdateProhibited\n Updated Date: 03-oct-2013\n Creation Date: 30-dec-1997\n Expiration Date: 23-dec-2014\n\n>>> Last update of whois database: Fri, 22 Nov 2013 05:13:08 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.melbourneit.com"], "registrar": ["MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE"]}
\ No newline at end of file
diff --git a/test/target_default/x.it b/test/target_default/x.it
index 6396b93..5623c81 100644
--- a/test/target_default/x.it
+++ b/test/target_default/x.it
@@ -1 +1 @@
-{"status": ["UNASSIGNABLE"], "updated_date": null, "contacts": {"admin": null, "tech": null, "registrant": null, "billing": null}, "expiration_date": null, "emails": null, "raw": ["Domain: x.it\nStatus: UNASSIGNABLE\n\n"], "whois_server": null, "registrar": null, "name_servers": null, "creation_date": null, "id": null}
\ No newline at end of file
+{"status": ["UNASSIGNABLE"], "raw": ["Domain: x.it\nStatus: UNASSIGNABLE\n\n"], "contacts": {"admin": null, "tech": null, "registrant": null, "billing": null}}
\ No newline at end of file
diff --git a/test/target_default/zem.org.uk b/test/target_default/zem.org.uk
index a0a9ced..dda7198 100644
--- a/test/target_default/zem.org.uk
+++ b/test/target_default/zem.org.uk
@@ -1 +1 @@
-{"updated_date": ["2013-02-01T00:00:00"], "status": null, "contacts": {"admin": null, "tech": null, "registrant": {"name": "Dan Foster"}, "billing": null}, "expiration_date": ["2015-04-15T00:00:00"], "emails": null, "creation_date": ["2009-04-15T00:00:00", "2009-04-15T00:00:00", "2009-04-15T00:00:00"], "raw": ["\n Domain name:\n zem.org.uk\n\n Registrant:\n Dan Foster\n\n Registrant type:\n UK Individual\n\n Registrant's address:\n The registrant is a non-trading individual who has opted to have their\n address omitted from the WHOIS service.\n\n Registrar:\n Webfusion Ltd t/a 123-reg [Tag = 123-REG]\n URL: http://www.123-reg.co.uk\n\n Relevant dates:\n Registered on: 15-Apr-2009\n Expiry date: 15-Apr-2015\n Last updated: 01-Feb-2013\n\n Registration status:\n Registered until expiry date.\n\n Name servers:\n dns-eu1.powerdns.net\n dns-eu2.powerdns.net\n dns-us1.powerdns.net\n dns-us2.powerdns.net\n\n WHOIS lookup made at 04:14:40 20-Nov-2013\n\n-- \nThis WHOIS information is provided for free by Nominet UK the central registry\nfor .uk domain names. This information and the .uk WHOIS are:\n\n Copyright Nominet UK 1996 - 2013.\n\nYou may not access the .uk WHOIS or use any data from it except as permitted\nby the terms of use available in full at http://www.nominet.org.uk/whoisterms, which\nincludes restrictions on: (A) use of the data for advertising, or its\nrepackaging, recompilation, redistribution or reuse (B) obscuring, removing\nor hiding any or all of this notice and (C) exceeding query rate or volume\nlimits. The data is provided on an 'as-is' basis and may lag behind the\nregister. Access may be withdrawn or restricted at any time. \n\n"], "whois_server": null, "registrar": ["Webfusion Ltd t/a 123-reg [Tag = 123-REG]"], "name_servers": ["dns-eu1.powerdns.net", "dns-eu2.powerdns.net", "dns-us1.powerdns.net", "dns-us2.powerdns.net"], "id": null}
\ No newline at end of file
+{"updated_date": ["2013-02-01T00:00:00"], "contacts": {"admin": null, "tech": null, "registrant": {"name": "Dan Foster"}, "billing": null}, "nameservers": ["dns-eu1.powerdns.net", "dns-eu2.powerdns.net", "dns-us1.powerdns.net", "dns-us2.powerdns.net"], "expiration_date": ["2015-04-15T00:00:00"], "creation_date": ["2009-04-15T00:00:00", "2009-04-15T00:00:00", "2009-04-15T00:00:00"], "raw": ["\n Domain name:\n zem.org.uk\n\n Registrant:\n Dan Foster\n\n Registrant type:\n UK Individual\n\n Registrant's address:\n The registrant is a non-trading individual who has opted to have their\n address omitted from the WHOIS service.\n\n Registrar:\n Webfusion Ltd t/a 123-reg [Tag = 123-REG]\n URL: http://www.123-reg.co.uk\n\n Relevant dates:\n Registered on: 15-Apr-2009\n Expiry date: 15-Apr-2015\n Last updated: 01-Feb-2013\n\n Registration status:\n Registered until expiry date.\n\n Name servers:\n dns-eu1.powerdns.net\n dns-eu2.powerdns.net\n dns-us1.powerdns.net\n dns-us2.powerdns.net\n\n WHOIS lookup made at 04:14:40 20-Nov-2013\n\n-- \nThis WHOIS information is provided for free by Nominet UK the central registry\nfor .uk domain names. This information and the .uk WHOIS are:\n\n Copyright Nominet UK 1996 - 2013.\n\nYou may not access the .uk WHOIS or use any data from it except as permitted\nby the terms of use available in full at http://www.nominet.org.uk/whoisterms, which\nincludes restrictions on: (A) use of the data for advertising, or its\nrepackaging, recompilation, redistribution or reuse (B) obscuring, removing\nor hiding any or all of this notice and (C) exceeding query rate or volume\nlimits. The data is provided on an 'as-is' basis and may lag behind the\nregister. Access may be withdrawn or restricted at any time. \n\n"], "registrar": ["Webfusion Ltd t/a 123-reg [Tag = 123-REG]"]}
\ No newline at end of file
diff --git a/test/target_normalized/2x4.ru b/test/target_normalized/2x4.ru
index 0b2cb6a..c5dc8b4 100644
--- a/test/target_normalized/2x4.ru
+++ b/test/target_normalized/2x4.ru
@@ -1 +1 @@
-{"status": ["Registered, Delegated, Verified"], "updated_date": ["2013-11-20T08:16:36"], "contacts": {"admin": null, "tech": null, "registrant": {"name": "Private Person"}, "billing": null}, "expiration_date": ["2014-06-24T00:00:00"], "emails": null, "creation_date": ["2004-06-24T00:00:00"], "raw": ["% By submitting a query to RIPN's Whois Service\n% you agree to abide by the following terms of use:\n% http://www.ripn.net/about/servpol.html#3.2 (in Russian) \n% http://www.ripn.net/about/en/servpol.html#3.2 (in English).\n\ndomain: 2X4.RU\nnserver: dns1.yandex.net.\nnserver: dns2.yandex.net.\nstate: REGISTERED, DELEGATED, VERIFIED\nperson: Private Person\nregistrar: RU-CENTER-REG-RIPN\nadmin-contact: https://www.nic.ru/whois\ncreated: 2004.06.24\npaid-till: 2014.06.24\nfree-date: 2014.07.25\nsource: TCI\n\nLast updated on 2013.11.20 08:16:36 MSK\n\n\n"], "whois_server": null, "registrar": ["Ru-center-reg-ripn"], "name_servers": ["dns1.yandex.net", "dns2.yandex.net"], "id": null}
\ No newline at end of file
+{"status": ["Registered, Delegated, Verified"], "updated_date": ["2013-11-20T08:16:36"], "contacts": {"admin": null, "tech": null, "registrant": {"name": "Private Person"}, "billing": null}, "nameservers": ["dns1.yandex.net", "dns2.yandex.net"], "expiration_date": ["2014-06-24T00:00:00"], "creation_date": ["2004-06-24T00:00:00"], "raw": ["% By submitting a query to RIPN's Whois Service\n% you agree to abide by the following terms of use:\n% http://www.ripn.net/about/servpol.html#3.2 (in Russian) \n% http://www.ripn.net/about/en/servpol.html#3.2 (in English).\n\ndomain: 2X4.RU\nnserver: dns1.yandex.net.\nnserver: dns2.yandex.net.\nstate: REGISTERED, DELEGATED, VERIFIED\nperson: Private Person\nregistrar: RU-CENTER-REG-RIPN\nadmin-contact: https://www.nic.ru/whois\ncreated: 2004.06.24\npaid-till: 2014.06.24\nfree-date: 2014.07.25\nsource: TCI\n\nLast updated on 2013.11.20 08:16:36 MSK\n\n\n"], "registrar": ["Ru-center-reg-ripn"]}
\ No newline at end of file
diff --git a/test/target_normalized/about.museum b/test/target_normalized/about.museum
index cec3071..342cdec 100644
--- a/test/target_normalized/about.museum
+++ b/test/target_normalized/about.museum
@@ -1 +1 @@
-{"status": ["ok"], "updated_date": null, "contacts": {"admin": {"city": "Stockholm", "handle": "C728-MUSEUM", "name": "Cary Karp", "street": "Frescativaegen 40", "country": "SE", "postalcode": "104 05", "organization": "Museum Domain Management Association", "email": "ck@nic.museum"}, "tech": {"city": "Stockholm", "handle": "C728-MUSEUM", "name": "Cary Karp", "street": "Frescativaegen 40", "country": "SE", "postalcode": "104 05", "organization": "Museum Domain Management Association", "email": "ck@nic.museum"}, "registrant": {"city": "Stockholm", "handle": "C728-MUSEUM", "name": "Cary Karp", "street": "Frescativaegen 40", "country": "SE", "postalcode": "104 05", "organization": "Museum Domain Management Association", "email": "ck@nic.museum"}, "billing": {"city": "Stockholm", "handle": "C728-MUSEUM", "name": "Cary Karp", "street": "Frescativaegen 40", "country": "SE", "postalcode": "104 05", "organization": "Museum Domain Management Association", "email": "ck@nic.museum"}}, "expiration_date": ["2015-02-04T19:32:48"], "emails": [], "creation_date": ["2005-02-04T19:32:48", "2005-02-04T19:32:48"], "raw": ["% Musedoma Whois Server Copyright (C) 2007 Museum Domain Management Association\n%\n% NOTICE: Access to Musedoma Whois information is provided to assist in\n% determining the contents of an object name registration record in the\n% Musedoma database. The data in this record is provided by Musedoma for\n% informational purposes only, and Musedoma does not guarantee its\n% accuracy. This service is intended only for query-based access. You\n% agree that you will use this data only for lawful purposes and that,\n% under no circumstances will you use this data to: (a) allow, enable,\n% or otherwise support the transmission by e-mail, telephone or\n% facsimile of unsolicited, commercial advertising or solicitations; or\n% (b) enable automated, electronic processes that send queries or data\n% to the systems of Musedoma or registry operators, except as reasonably\n% necessary to register object names or modify existing registrations.\n% All rights reserved. Musedoma reserves the right to modify these terms at\n% any time. By submitting this query, you agree to abide by this policy.\n%\n% WARNING: THIS RESPONSE IS NOT AUTHENTIC\n%\n% The selected character encoding \"US-ASCII\" is not able to represent all\n% characters in this output. Those characters that could not be represented\n% have been replaced with the unaccented ASCII equivalents. Please\n% resubmit your query with a suitable character encoding in order to receive\n% an authentic response.\n%\nDomain ID: D6137686-MUSEUM\nDomain Name: about.museum\nDomain Name ACE: about.museum\nDomain Language: \nRegistrar ID: CORE-904 (Musedoma)\nCreated On: 2005-02-04 19:32:48 GMT\nExpiration Date: 2015-02-04 19:32:48 GMT\nMaintainer: http://musedoma.museum\nStatus: ok\nRegistrant ID: C728-MUSEUM\nRegistrant Name: Cary Karp\nRegistrant Organization: Museum Domain Management Association\nRegistrant Street: Frescativaegen 40\nRegistrant City: Stockholm\nRegistrant State/Province: \nRegistrant Postal Code: 104 05\nRegistrant Country: SE\nRegistrant Phone: \nRegistrant Phone Ext: \nRegistrant Fax: \nRegistrant Fax Ext: \nRegistrant Email: ck@nic.museum\nAdmin ID: C728-MUSEUM\nAdmin Name: Cary Karp\nAdmin Organization: Museum Domain Management Association\nAdmin Street: Frescativaegen 40\nAdmin City: Stockholm\nAdmin State/Province: \nAdmin Postal Code: 104 05\nAdmin Country: SE\nAdmin Phone: \nAdmin Phone Ext: \nAdmin Fax: \nAdmin Fax Ext: \nAdmin Email: ck@nic.museum\nTech ID: C728-MUSEUM\nTech Name: Cary Karp\nTech Organization: Museum Domain Management Association\nTech Street: Frescativaegen 40\nTech City: Stockholm\nTech State/Province: \nTech Postal Code: 104 05\nTech Country: SE\nTech Phone: \nTech Phone Ext: \nTech Fax: \nTech Fax Ext: \nTech Email: ck@nic.museum\nBilling ID: C728-MUSEUM\nBilling Name: Cary Karp\nBilling Organization: Museum Domain Management Association\nBilling Street: Frescativaegen 40\nBilling City: Stockholm\nBilling State/Province: \nBilling Postal Code: 104 05\nBilling Country: SE\nBilling Phone: \nBilling Phone Ext: \nBilling Fax: \nBilling Fax Ext: \nBilling Email: ck@nic.museum\nName Server: nic.frd.se \nName Server ACE: nic.frd.se \nName Server: nic.museum 130.242.24.5\nName Server ACE: nic.museum 130.242.24.5\n\n\n"], "whois_server": null, "registrar": null, "name_servers": ["nic.frd.se", "nic.museum"], "id": ["D6137686-MUSEUM"]}
\ No newline at end of file
+{"status": ["ok"], "contacts": {"admin": {"city": "Stockholm", "handle": "C728-MUSEUM", "name": "Cary Karp", "street": "Frescativaegen 40", "country": "SE", "postalcode": "104 05", "organization": "Museum Domain Management Association", "email": "ck@nic.museum"}, "tech": {"city": "Stockholm", "handle": "C728-MUSEUM", "name": "Cary Karp", "street": "Frescativaegen 40", "country": "SE", "postalcode": "104 05", "organization": "Museum Domain Management Association", "email": "ck@nic.museum"}, "registrant": {"city": "Stockholm", "handle": "C728-MUSEUM", "name": "Cary Karp", "street": "Frescativaegen 40", "country": "SE", "postalcode": "104 05", "organization": "Museum Domain Management Association", "email": "ck@nic.museum"}, "billing": {"city": "Stockholm", "handle": "C728-MUSEUM", "name": "Cary Karp", "street": "Frescativaegen 40", "country": "SE", "postalcode": "104 05", "organization": "Museum Domain Management Association", "email": "ck@nic.museum"}}, "nameservers": ["nic.frd.se", "nic.museum"], "expiration_date": ["2015-02-04T19:32:48"], "creation_date": ["2005-02-04T19:32:48", "2005-02-04T19:32:48"], "raw": ["% Musedoma Whois Server Copyright (C) 2007 Museum Domain Management Association\n%\n% NOTICE: Access to Musedoma Whois information is provided to assist in\n% determining the contents of an object name registration record in the\n% Musedoma database. The data in this record is provided by Musedoma for\n% informational purposes only, and Musedoma does not guarantee its\n% accuracy. This service is intended only for query-based access. You\n% agree that you will use this data only for lawful purposes and that,\n% under no circumstances will you use this data to: (a) allow, enable,\n% or otherwise support the transmission by e-mail, telephone or\n% facsimile of unsolicited, commercial advertising or solicitations; or\n% (b) enable automated, electronic processes that send queries or data\n% to the systems of Musedoma or registry operators, except as reasonably\n% necessary to register object names or modify existing registrations.\n% All rights reserved. Musedoma reserves the right to modify these terms at\n% any time. By submitting this query, you agree to abide by this policy.\n%\n% WARNING: THIS RESPONSE IS NOT AUTHENTIC\n%\n% The selected character encoding \"US-ASCII\" is not able to represent all\n% characters in this output. Those characters that could not be represented\n% have been replaced with the unaccented ASCII equivalents. Please\n% resubmit your query with a suitable character encoding in order to receive\n% an authentic response.\n%\nDomain ID: D6137686-MUSEUM\nDomain Name: about.museum\nDomain Name ACE: about.museum\nDomain Language: \nRegistrar ID: CORE-904 (Musedoma)\nCreated On: 2005-02-04 19:32:48 GMT\nExpiration Date: 2015-02-04 19:32:48 GMT\nMaintainer: http://musedoma.museum\nStatus: ok\nRegistrant ID: C728-MUSEUM\nRegistrant Name: Cary Karp\nRegistrant Organization: Museum Domain Management Association\nRegistrant Street: Frescativaegen 40\nRegistrant City: Stockholm\nRegistrant State/Province: \nRegistrant Postal Code: 104 05\nRegistrant Country: SE\nRegistrant Phone: \nRegistrant Phone Ext: \nRegistrant Fax: \nRegistrant Fax Ext: \nRegistrant Email: ck@nic.museum\nAdmin ID: C728-MUSEUM\nAdmin Name: Cary Karp\nAdmin Organization: Museum Domain Management Association\nAdmin Street: Frescativaegen 40\nAdmin City: Stockholm\nAdmin State/Province: \nAdmin Postal Code: 104 05\nAdmin Country: SE\nAdmin Phone: \nAdmin Phone Ext: \nAdmin Fax: \nAdmin Fax Ext: \nAdmin Email: ck@nic.museum\nTech ID: C728-MUSEUM\nTech Name: Cary Karp\nTech Organization: Museum Domain Management Association\nTech Street: Frescativaegen 40\nTech City: Stockholm\nTech State/Province: \nTech Postal Code: 104 05\nTech Country: SE\nTech Phone: \nTech Phone Ext: \nTech Fax: \nTech Fax Ext: \nTech Email: ck@nic.museum\nBilling ID: C728-MUSEUM\nBilling Name: Cary Karp\nBilling Organization: Museum Domain Management Association\nBilling Street: Frescativaegen 40\nBilling City: Stockholm\nBilling State/Province: \nBilling Postal Code: 104 05\nBilling Country: SE\nBilling Phone: \nBilling Phone Ext: \nBilling Fax: \nBilling Fax Ext: \nBilling Email: ck@nic.museum\nName Server: nic.frd.se \nName Server ACE: nic.frd.se \nName Server: nic.museum 130.242.24.5\nName Server ACE: nic.museum 130.242.24.5\n\n\n"], "id": ["D6137686-MUSEUM"]}
\ No newline at end of file
diff --git a/test/target_normalized/actu.org.au b/test/target_normalized/actu.org.au
index 4fb89b2..1e3826b 100644
--- a/test/target_normalized/actu.org.au
+++ b/test/target_normalized/actu.org.au
@@ -1 +1 @@
-{"status": ["ok"], "updated_date": ["2013-09-09T02:21:17"], "contacts": {"admin": null, "tech": {"handle": "WAPE1350", "name": "Peter Watkins"}, "registrant": {"organization": "Australian Council of Trade Unions", "handle": "WORO1080", "name": "Peter Watkins"}, "billing": null}, "expiration_date": null, "emails": null, "raw": ["Domain Name: actu.org.au\nLast Modified: 09-Sep-2013 02:21:17 UTC\nRegistrar ID: NetRegistry\nRegistrar Name: NetRegistry\nStatus: ok\n\nRegistrant: Australian Council of Trade Unions\nEligibility Type: Incorporated Association\nEligibility ID: ABN 67175982800\n\nRegistrant Contact ID: WORO1080\nRegistrant Contact Name: Peter Watkins\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: WAPE1350\nTech Contact Name: Peter Watkins\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: ns15.dnsmadeeasy.com\nName Server: ns10.dnsmadeeasy.com\nName Server: ns11.dnsmadeeasy.com\nName Server: ns12.dnsmadeeasy.com\nName Server: ns13.dnsmadeeasy.com\nName Server: ns14.dnsmadeeasy.com\n\n"], "whois_server": null, "registrar": ["NetRegistry"], "name_servers": ["ns15.dnsmadeeasy.com", "ns10.dnsmadeeasy.com", "ns11.dnsmadeeasy.com", "ns12.dnsmadeeasy.com", "ns13.dnsmadeeasy.com", "ns14.dnsmadeeasy.com"], "creation_date": null, "id": null}
\ No newline at end of file
+{"status": ["ok"], "updated_date": ["2013-09-09T02:21:17"], "contacts": {"admin": null, "tech": {"handle": "WAPE1350", "name": "Peter Watkins"}, "registrant": {"organization": "Australian Council of Trade Unions", "handle": "WORO1080", "name": "Peter Watkins"}, "billing": null}, "nameservers": ["ns15.dnsmadeeasy.com", "ns10.dnsmadeeasy.com", "ns11.dnsmadeeasy.com", "ns12.dnsmadeeasy.com", "ns13.dnsmadeeasy.com", "ns14.dnsmadeeasy.com"], "raw": ["Domain Name: actu.org.au\nLast Modified: 09-Sep-2013 02:21:17 UTC\nRegistrar ID: NetRegistry\nRegistrar Name: NetRegistry\nStatus: ok\n\nRegistrant: Australian Council of Trade Unions\nEligibility Type: Incorporated Association\nEligibility ID: ABN 67175982800\n\nRegistrant Contact ID: WORO1080\nRegistrant Contact Name: Peter Watkins\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: WAPE1350\nTech Contact Name: Peter Watkins\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: ns15.dnsmadeeasy.com\nName Server: ns10.dnsmadeeasy.com\nName Server: ns11.dnsmadeeasy.com\nName Server: ns12.dnsmadeeasy.com\nName Server: ns13.dnsmadeeasy.com\nName Server: ns14.dnsmadeeasy.com\n\n"], "registrar": ["NetRegistry"]}
\ No newline at end of file
diff --git a/test/target_normalized/alibaba.jp b/test/target_normalized/alibaba.jp
index f691b72..da41202 100644
--- a/test/target_normalized/alibaba.jp
+++ b/test/target_normalized/alibaba.jp
@@ -1 +1 @@
-{"status": ["Active"], "updated_date": ["2013-06-01T01:05:07"], "contacts": {"admin": null, "tech": null, "registrant": {"fax": "85222155200", "name": "Alibaba Group Holding Limited", "phone": "85222155100", "street": "George Town\nFourth Floor, One Capital Place\nP.O. Box 847", "postalcode": "KY1-1103", "email": "dnsadmin@hk.alibaba-inc.com"}, "billing": null}, "expiration_date": ["2014-05-31T00:00:00", "2014-05-31T00:00:00"], "id": null, "creation_date": ["2001-05-08T00:00:00", "2001-05-08T00:00:00"], "raw": ["[ JPRS database provides information on network administration. Its use is ]\n[ restricted to network administration purposes. For further information, ]\n[ use 'whois -h whois.jprs.jp help'. To suppress Japanese output, add'/e' ]\n[ at the end of command, e.g. 'whois -h whois.jprs.jp xxx/e'. ]\n\nDomain Information:\n[Domain Name] ALIBABA.JP\n\n[Registrant] Alibaba Group Holding Limited\n\n[Name Server] ns1.markmonitor.com\n[Name Server] ns6.markmonitor.com\n[Name Server] ns4.markmonitor.com\n[Name Server] ns3.markmonitor.com\n[Name Server] ns7.markmonitor.com\n[Name Server] ns2.markmonitor.com\n[Name Server] ns5.markmonitor.com\n[Signing Key] \n\n[Created on] 2001/05/08\n[Expires on] 2014/05/31\n[Status] Active\n[Last Updated] 2013/06/01 01:05:07 (JST)\n\nContact Information:\n[Name] Alibaba Group Holding Limited\n[Email] dnsadmin@hk.alibaba-inc.com\n[Web Page] \n[Postal code] KY1-1103\n[Postal Address] George Town\n Fourth Floor, One Capital Place\n P.O. Box 847\n[Phone] 85222155100\n[Fax] 85222155200\n\n\n"], "whois_server": null, "registrar": null, "name_servers": ["ns1.markmonitor.com", "ns6.markmonitor.com", "ns4.markmonitor.com", "ns3.markmonitor.com", "ns7.markmonitor.com", "ns2.markmonitor.com", "ns5.markmonitor.com"], "emails": []}
\ No newline at end of file
+{"status": ["Active"], "updated_date": ["2013-06-01T01:05:07"], "contacts": {"admin": null, "tech": null, "registrant": {"fax": "85222155200", "name": "Alibaba Group Holding Limited", "phone": "85222155100", "street": "George Town\nFourth Floor, One Capital Place\nP.O. Box 847", "postalcode": "KY1-1103", "email": "dnsadmin@hk.alibaba-inc.com"}, "billing": null}, "nameservers": ["ns1.markmonitor.com", "ns6.markmonitor.com", "ns4.markmonitor.com", "ns3.markmonitor.com", "ns7.markmonitor.com", "ns2.markmonitor.com", "ns5.markmonitor.com"], "expiration_date": ["2014-05-31T00:00:00", "2014-05-31T00:00:00"], "creation_date": ["2001-05-08T00:00:00", "2001-05-08T00:00:00"], "raw": ["[ JPRS database provides information on network administration. Its use is ]\n[ restricted to network administration purposes. For further information, ]\n[ use 'whois -h whois.jprs.jp help'. To suppress Japanese output, add'/e' ]\n[ at the end of command, e.g. 'whois -h whois.jprs.jp xxx/e'. ]\n\nDomain Information:\n[Domain Name] ALIBABA.JP\n\n[Registrant] Alibaba Group Holding Limited\n\n[Name Server] ns1.markmonitor.com\n[Name Server] ns6.markmonitor.com\n[Name Server] ns4.markmonitor.com\n[Name Server] ns3.markmonitor.com\n[Name Server] ns7.markmonitor.com\n[Name Server] ns2.markmonitor.com\n[Name Server] ns5.markmonitor.com\n[Signing Key] \n\n[Created on] 2001/05/08\n[Expires on] 2014/05/31\n[Status] Active\n[Last Updated] 2013/06/01 01:05:07 (JST)\n\nContact Information:\n[Name] Alibaba Group Holding Limited\n[Email] dnsadmin@hk.alibaba-inc.com\n[Web Page] \n[Postal code] KY1-1103\n[Postal Address] George Town\n Fourth Floor, One Capital Place\n P.O. Box 847\n[Phone] 85222155100\n[Fax] 85222155200\n\n\n"]}
\ No newline at end of file
diff --git a/test/target_normalized/anonne.ws b/test/target_normalized/anonne.ws
index 757f880..b3f304a 100644
--- a/test/target_normalized/anonne.ws
+++ b/test/target_normalized/anonne.ws
@@ -1 +1 @@
-{"updated_date": ["2013-04-06T00:00:00"], "status": null, "contacts": {"admin": {"city": "Dordrecht", "fax": "+1.5555555555", "name": "Sven Slootweg", "state": "Zuid-holland", "phone": "+31.626519955", "street": "Wijnstraat 211", "country": "NL", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "tech": {"city": "Dordrecht", "fax": "+1.5555555555", "name": "Sven Slootweg", "state": "Zuid-holland", "phone": "+31.626519955", "street": "Wijnstraat 211", "country": "NL", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "registrant": {"city": "Dordrecht", "name": "Sven Slootweg", "state": "Zuid-holland", "street": "Wijnstraat 211", "country": "NL", "postalcode": "3311BV"}, "billing": null}, "expiration_date": ["2014-04-07T19:40:22"], "id": null, "creation_date": ["2012-04-07T12:40:00"], "raw": ["\n\nDomain Name: ANONNE.WS\nCreation Date: 2012-04-07 12:40:00Z\nRegistrar Registration Expiration Date: 2014-04-07 19:40:22Z\nRegistrar: ENOM, INC.\nReseller: NAMECHEAP.COM\nRegistrant Name: SVEN SLOOTWEG\nRegistrant Organization: \nRegistrant Street: WIJNSTRAAT 211\nRegistrant City: DORDRECHT\nRegistrant State/Province: ZUID-HOLLAND\nRegistrant Postal Code: 3311BV\nRegistrant Country: NL\nAdmin Name: SVEN SLOOTWEG\nAdmin Organization: \nAdmin Street: WIJNSTRAAT 211\nAdmin City: DORDRECHT\nAdmin State/Province: ZUID-HOLLAND\nAdmin Postal Code: 3311BV\nAdmin Country: NL\nAdmin Phone: +31.626519955\nAdmin Phone Ext: \nAdmin Fax: +1.5555555555\nAdmin Fax Ext:\nAdmin Email: JAMSOFTGAMEDEV@GMAIL.COM\nTech Name: SVEN SLOOTWEG\nTech Organization: \nTech Street: WIJNSTRAAT 211\nTech City: DORDRECHT\nTech State/Province: ZUID-HOLLAND\nTech Postal Code: 3311BV\nTech Country: NL\nTech Phone: +31.626519955\nTech Phone Ext: \nTech Fax: +1.5555555555\nTech Fax Ext: \nTech Email: JAMSOFTGAMEDEV@GMAIL.COM\nName Server: NS1.HE.NET\nName Server: NS2.HE.NET\nName Server: NS3.HE.NET\nName Server: NS4.HE.NET\nName Server: NS5.HE.NET\n\nThe data in this whois database is provided to you for information\npurposes only, that is, to assist you in obtaining information about or\nrelated to a domain name registration record. We make this information\navailable \"as is,\" and do not guarantee its accuracy. By submitting a\nwhois query, you agree that you will use this data only for lawful\npurposes and that, under no circumstances will you use this data to: (1)\nenable high volume, automated, electronic processes that stress or load\nthis whois database system providing you this information; or (2) allow,\nenable, or otherwise support the transmission of mass unsolicited,\ncommercial advertising or solicitations via direct mail, electronic\nmail, or by telephone. The compilation, repackaging, dissemination or\nother use of this data is expressly prohibited without prior written\nconsent from us. \n\nWe reserve the right to modify these terms at any time. By submitting \nthis query, you agree to abide by these terms.\nVersion 6.3 4/3/2002\n", "\n\nWelcome to the .WS Whois Server\n\nUse of this service for any purpose other\nthan determining the availability of a domain\nin the .WS TLD to be registered is strictly\nprohibited.\n\n Domain Name: ANONNE.WS\n\n Registrant Name: Use registrar whois listed below\n Registrant Email: Use registrar whois listed below\n\n Administrative Contact Email: Use registrar whois listed below\n Administrative Contact Telephone: Use registrar whois listed below\n\n Registrar Name: eNom\n Registrar Email: info@enom.com\n Registrar Telephone: 425-974-4500\n Registrar Whois: whois.enom.com\n\n Domain Created: 2012-04-07\n Domain Last Updated: 2013-04-06\n Domain Currently Expires: 2014-04-07\n\n Current Nameservers:\n\n ns1.he.net\n ns2.he.net\n ns3.he.net\n ns4.he.net\n ns5.he.net\n\n\n\n"], "whois_server": ["whois.enom.com"], "registrar": ["Enom, Inc."], "name_servers": ["ns1.he.net", "ns2.he.net", "ns3.he.net", "ns4.he.net", "ns5.he.net"], "emails": []}
\ No newline at end of file
+{"updated_date": ["2013-04-06T00:00:00"], "contacts": {"admin": {"city": "Dordrecht", "fax": "+1.5555555555", "name": "Sven Slootweg", "state": "Zuid-holland", "phone": "+31.626519955", "street": "Wijnstraat 211", "country": "NL", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "tech": {"city": "Dordrecht", "fax": "+1.5555555555", "name": "Sven Slootweg", "state": "Zuid-holland", "phone": "+31.626519955", "street": "Wijnstraat 211", "country": "NL", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "registrant": {"city": "Dordrecht", "name": "Sven Slootweg", "state": "Zuid-holland", "street": "Wijnstraat 211", "country": "NL", "postalcode": "3311BV"}, "billing": null}, "nameservers": ["ns1.he.net", "ns2.he.net", "ns3.he.net", "ns4.he.net", "ns5.he.net"], "expiration_date": ["2014-04-07T19:40:22"], "creation_date": ["2012-04-07T12:40:00"], "raw": ["\n\nDomain Name: ANONNE.WS\nCreation Date: 2012-04-07 12:40:00Z\nRegistrar Registration Expiration Date: 2014-04-07 19:40:22Z\nRegistrar: ENOM, INC.\nReseller: NAMECHEAP.COM\nRegistrant Name: SVEN SLOOTWEG\nRegistrant Organization: \nRegistrant Street: WIJNSTRAAT 211\nRegistrant City: DORDRECHT\nRegistrant State/Province: ZUID-HOLLAND\nRegistrant Postal Code: 3311BV\nRegistrant Country: NL\nAdmin Name: SVEN SLOOTWEG\nAdmin Organization: \nAdmin Street: WIJNSTRAAT 211\nAdmin City: DORDRECHT\nAdmin State/Province: ZUID-HOLLAND\nAdmin Postal Code: 3311BV\nAdmin Country: NL\nAdmin Phone: +31.626519955\nAdmin Phone Ext: \nAdmin Fax: +1.5555555555\nAdmin Fax Ext:\nAdmin Email: JAMSOFTGAMEDEV@GMAIL.COM\nTech Name: SVEN SLOOTWEG\nTech Organization: \nTech Street: WIJNSTRAAT 211\nTech City: DORDRECHT\nTech State/Province: ZUID-HOLLAND\nTech Postal Code: 3311BV\nTech Country: NL\nTech Phone: +31.626519955\nTech Phone Ext: \nTech Fax: +1.5555555555\nTech Fax Ext: \nTech Email: JAMSOFTGAMEDEV@GMAIL.COM\nName Server: NS1.HE.NET\nName Server: NS2.HE.NET\nName Server: NS3.HE.NET\nName Server: NS4.HE.NET\nName Server: NS5.HE.NET\n\nThe data in this whois database is provided to you for information\npurposes only, that is, to assist you in obtaining information about or\nrelated to a domain name registration record. We make this information\navailable \"as is,\" and do not guarantee its accuracy. By submitting a\nwhois query, you agree that you will use this data only for lawful\npurposes and that, under no circumstances will you use this data to: (1)\nenable high volume, automated, electronic processes that stress or load\nthis whois database system providing you this information; or (2) allow,\nenable, or otherwise support the transmission of mass unsolicited,\ncommercial advertising or solicitations via direct mail, electronic\nmail, or by telephone. The compilation, repackaging, dissemination or\nother use of this data is expressly prohibited without prior written\nconsent from us. \n\nWe reserve the right to modify these terms at any time. By submitting \nthis query, you agree to abide by these terms.\nVersion 6.3 4/3/2002\n", "\n\nWelcome to the .WS Whois Server\n\nUse of this service for any purpose other\nthan determining the availability of a domain\nin the .WS TLD to be registered is strictly\nprohibited.\n\n Domain Name: ANONNE.WS\n\n Registrant Name: Use registrar whois listed below\n Registrant Email: Use registrar whois listed below\n\n Administrative Contact Email: Use registrar whois listed below\n Administrative Contact Telephone: Use registrar whois listed below\n\n Registrar Name: eNom\n Registrar Email: info@enom.com\n Registrar Telephone: 425-974-4500\n Registrar Whois: whois.enom.com\n\n Domain Created: 2012-04-07\n Domain Last Updated: 2013-04-06\n Domain Currently Expires: 2014-04-07\n\n Current Nameservers:\n\n ns1.he.net\n ns2.he.net\n ns3.he.net\n ns4.he.net\n ns5.he.net\n\n\n\n"], "whois_server": ["whois.enom.com"], "registrar": ["Enom, Inc."]}
\ No newline at end of file
diff --git a/test/target_normalized/anonnews.org b/test/target_normalized/anonnews.org
index 2f8ed8f..6893ee3 100644
--- a/test/target_normalized/anonnews.org
+++ b/test/target_normalized/anonnews.org
@@ -1 +1 @@
-{"status": ["Client Transfer Prohibited", "Renewperiod"], "updated_date": ["2013-11-16T12:22:49"], "contacts": {"admin": {"city": "Panama", "handle": "INTErkiewm5586ze", "name": "Domain Administrator", "phone": "+507.65995877", "street": "Attn: anonnews.org\nAptds. 0850-00056", "country": "PA", "postalcode": "Zona 15", "organization": "Fundacion Private Whois", "email": "52300fa7x2yb6oe6@5225b4d0pi3627q9.privatewhois.net"}, "tech": {"city": "Panama", "handle": "INTEl92g5h18b12w", "name": "Domain Administrator", "phone": "+507.65995877", "street": "Attn: anonnews.org\nAptds. 0850-00056", "country": "PA", "postalcode": "Zona 15", "organization": "Fundacion Private Whois", "email": "52300fa6vwq931xf@5225b4d0pi3627q9.privatewhois.net"}, "registrant": {"city": "Panama", "handle": "INTE381xro4k9z0m", "name": "Domain Administrator", "phone": "+507.65995877", "street": "Attn: anonnews.org\nAptds. 0850-00056", "country": "PA", "postalcode": "Zona 15", "organization": "Fundacion Private Whois", "email": "52300fa6c2nzfacc@5225b4d0pi3627q9.privatewhois.net"}, "billing": null}, "expiration_date": ["2014-12-12T20:31:54"], "emails": [], "raw": ["Access to .ORG WHOIS information is provided to assist persons in \ndetermining the contents of a domain name registration record in the \nPublic Interest Registry registry database. The data in this record is provided by \nPublic Interest Registry for informational purposes only, and Public Interest Registry does not \nguarantee its accuracy. This service is intended only for query-based \naccess. You agree that you will use this data only for lawful purposes \nand that, under no circumstances will you use this data to: (a) allow, \nenable, or otherwise support the transmission by e-mail, telephone, or \nfacsimile of mass unsolicited, commercial advertising or solicitations \nto entities other than the data recipient's own existing customers; or \n(b) enable high volume, automated, electronic processes that send \nqueries or data to the systems of Registry Operator, a Registrar, or \nAfilias except as reasonably necessary to register domain names or \nmodify existing registrations. All rights reserved. Public Interest Registry reserves \nthe right to modify these terms at any time. By submitting this query, \nyou agree to abide by this policy. \n\nDomain ID:D160909486-LROR\nDomain Name:ANONNEWS.ORG\nCreated On:12-Dec-2010 20:31:54 UTC\nLast Updated On:16-Nov-2013 12:22:49 UTC\nExpiration Date:12-Dec-2014 20:31:54 UTC\nSponsoring Registrar:Internet.bs Corp. (R1601-LROR)\nStatus:CLIENT TRANSFER PROHIBITED\nStatus:RENEWPERIOD\nRegistrant ID:INTE381xro4k9z0m\nRegistrant Name:Domain Administrator\nRegistrant Organization:Fundacion Private Whois\nRegistrant Street1:Attn: anonnews.org\nRegistrant Street2:Aptds. 0850-00056\nRegistrant Street3:\nRegistrant City:Panama\nRegistrant State/Province:\nRegistrant Postal Code:Zona 15\nRegistrant Country:PA\nRegistrant Phone:+507.65995877\nRegistrant Phone Ext.:\nRegistrant FAX:\nRegistrant FAX Ext.:\nRegistrant Email:52300fa6c2nzfacc@5225b4d0pi3627q9.privatewhois.net\nAdmin ID:INTErkiewm5586ze\nAdmin Name:Domain Administrator\nAdmin Organization:Fundacion Private Whois\nAdmin Street1:Attn: anonnews.org\nAdmin Street2:Aptds. 0850-00056\nAdmin Street3:\nAdmin City:Panama\nAdmin State/Province:\nAdmin Postal Code:Zona 15\nAdmin Country:PA\nAdmin Phone:+507.65995877\nAdmin Phone Ext.:\nAdmin FAX:\nAdmin FAX Ext.:\nAdmin Email:52300fa7x2yb6oe6@5225b4d0pi3627q9.privatewhois.net\nTech ID:INTEl92g5h18b12w\nTech Name:Domain Administrator\nTech Organization:Fundacion Private Whois\nTech Street1:Attn: anonnews.org\nTech Street2:Aptds. 0850-00056\nTech Street3:\nTech City:Panama\nTech State/Province:\nTech Postal Code:Zona 15\nTech Country:PA\nTech Phone:+507.65995877\nTech Phone Ext.:\nTech FAX:\nTech FAX Ext.:\nTech Email:52300fa6vwq931xf@5225b4d0pi3627q9.privatewhois.net\nName Server:LISA.NS.CLOUDFLARE.COM\nName Server:ED.NS.CLOUDFLARE.COM\nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nDNSSEC:Unsigned\n\n\n\n"], "whois_server": null, "registrar": ["Internet.bs Corp. (R1601-LROR)"], "name_servers": ["lisa.ns.cloudflare.com", "ed.ns.cloudflare.com"], "creation_date": ["2010-12-12T20:31:54", "2010-12-12T20:31:54"], "id": ["D160909486-LROR"]}
\ No newline at end of file
+{"status": ["Client Transfer Prohibited", "Renewperiod"], "updated_date": ["2013-11-16T12:22:49"], "contacts": {"admin": {"city": "Panama", "handle": "INTErkiewm5586ze", "name": "Domain Administrator", "phone": "+507.65995877", "street": "Attn: anonnews.org\nAptds. 0850-00056", "country": "PA", "postalcode": "Zona 15", "organization": "Fundacion Private Whois", "email": "52300fa7x2yb6oe6@5225b4d0pi3627q9.privatewhois.net"}, "tech": {"city": "Panama", "handle": "INTEl92g5h18b12w", "name": "Domain Administrator", "phone": "+507.65995877", "street": "Attn: anonnews.org\nAptds. 0850-00056", "country": "PA", "postalcode": "Zona 15", "organization": "Fundacion Private Whois", "email": "52300fa6vwq931xf@5225b4d0pi3627q9.privatewhois.net"}, "registrant": {"city": "Panama", "handle": "INTE381xro4k9z0m", "name": "Domain Administrator", "phone": "+507.65995877", "street": "Attn: anonnews.org\nAptds. 0850-00056", "country": "PA", "postalcode": "Zona 15", "organization": "Fundacion Private Whois", "email": "52300fa6c2nzfacc@5225b4d0pi3627q9.privatewhois.net"}, "billing": null}, "nameservers": ["lisa.ns.cloudflare.com", "ed.ns.cloudflare.com"], "expiration_date": ["2014-12-12T20:31:54"], "raw": ["Access to .ORG WHOIS information is provided to assist persons in \ndetermining the contents of a domain name registration record in the \nPublic Interest Registry registry database. The data in this record is provided by \nPublic Interest Registry for informational purposes only, and Public Interest Registry does not \nguarantee its accuracy. This service is intended only for query-based \naccess. You agree that you will use this data only for lawful purposes \nand that, under no circumstances will you use this data to: (a) allow, \nenable, or otherwise support the transmission by e-mail, telephone, or \nfacsimile of mass unsolicited, commercial advertising or solicitations \nto entities other than the data recipient's own existing customers; or \n(b) enable high volume, automated, electronic processes that send \nqueries or data to the systems of Registry Operator, a Registrar, or \nAfilias except as reasonably necessary to register domain names or \nmodify existing registrations. All rights reserved. Public Interest Registry reserves \nthe right to modify these terms at any time. By submitting this query, \nyou agree to abide by this policy. \n\nDomain ID:D160909486-LROR\nDomain Name:ANONNEWS.ORG\nCreated On:12-Dec-2010 20:31:54 UTC\nLast Updated On:16-Nov-2013 12:22:49 UTC\nExpiration Date:12-Dec-2014 20:31:54 UTC\nSponsoring Registrar:Internet.bs Corp. (R1601-LROR)\nStatus:CLIENT TRANSFER PROHIBITED\nStatus:RENEWPERIOD\nRegistrant ID:INTE381xro4k9z0m\nRegistrant Name:Domain Administrator\nRegistrant Organization:Fundacion Private Whois\nRegistrant Street1:Attn: anonnews.org\nRegistrant Street2:Aptds. 0850-00056\nRegistrant Street3:\nRegistrant City:Panama\nRegistrant State/Province:\nRegistrant Postal Code:Zona 15\nRegistrant Country:PA\nRegistrant Phone:+507.65995877\nRegistrant Phone Ext.:\nRegistrant FAX:\nRegistrant FAX Ext.:\nRegistrant Email:52300fa6c2nzfacc@5225b4d0pi3627q9.privatewhois.net\nAdmin ID:INTErkiewm5586ze\nAdmin Name:Domain Administrator\nAdmin Organization:Fundacion Private Whois\nAdmin Street1:Attn: anonnews.org\nAdmin Street2:Aptds. 0850-00056\nAdmin Street3:\nAdmin City:Panama\nAdmin State/Province:\nAdmin Postal Code:Zona 15\nAdmin Country:PA\nAdmin Phone:+507.65995877\nAdmin Phone Ext.:\nAdmin FAX:\nAdmin FAX Ext.:\nAdmin Email:52300fa7x2yb6oe6@5225b4d0pi3627q9.privatewhois.net\nTech ID:INTEl92g5h18b12w\nTech Name:Domain Administrator\nTech Organization:Fundacion Private Whois\nTech Street1:Attn: anonnews.org\nTech Street2:Aptds. 0850-00056\nTech Street3:\nTech City:Panama\nTech State/Province:\nTech Postal Code:Zona 15\nTech Country:PA\nTech Phone:+507.65995877\nTech Phone Ext.:\nTech FAX:\nTech FAX Ext.:\nTech Email:52300fa6vwq931xf@5225b4d0pi3627q9.privatewhois.net\nName Server:LISA.NS.CLOUDFLARE.COM\nName Server:ED.NS.CLOUDFLARE.COM\nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nDNSSEC:Unsigned\n\n\n\n"], "registrar": ["Internet.bs Corp. (R1601-LROR)"], "creation_date": ["2010-12-12T20:31:54", "2010-12-12T20:31:54"], "id": ["D160909486-LROR"]}
\ No newline at end of file
diff --git a/test/target_normalized/aol.com b/test/target_normalized/aol.com
index c81e85e..e807252 100644
--- a/test/target_normalized/aol.com
+++ b/test/target_normalized/aol.com
@@ -1 +1 @@
-{"status": ["clientTransferProhibited", "serverDeleteProhibited", "serverTransferProhibited", "serverUpdateProhibited"], "updated_date": ["2013-09-24T00:00:00", "2013-11-23T14:39:22"], "contacts": {"admin": {"city": "Dulles", "name": "Domain Admin", "phone": "+1.7032654670", "state": "VA", "street": "AOL Inc.\n22000 AOL Way", "country": "United States", "postalcode": "20166", "email": "domain-adm@corp.aol.com"}, "tech": {"city": "Dulles", "name": "Domain Admin", "phone": "+1.7032654670", "state": "VA", "street": "AOL Inc.\n22000 AOL Way", "country": "United States", "postalcode": "20166", "email": "domain-adm@corp.aol.com"}, "registrant": {"city": "Dulles", "name": "AOL Inc.", "state": "VA", "street": "22000 AOL Way", "country": "United States", "postalcode": "20166"}, "billing": null}, "expiration_date": ["2014-11-23T00:00:00"], "id": null, "creation_date": ["1995-06-22T00:00:00"], "raw": ["\nDomain Name.......... aol.com\n Creation Date........ 1995-06-22\n Registration Date.... 2009-10-03\n Expiry Date.......... 2014-11-24\n Organisation Name.... AOL Inc.\n Organisation Address. 22000 AOL Way\n Organisation Address. \n Organisation Address. \n Organisation Address. Dulles\n Organisation Address. 20166\n Organisation Address. VA\n Organisation Address. UNITED STATES\n\nAdmin Name........... Domain Admin\n Admin Address........ AOL Inc.\n Admin Address........ 22000 AOL Way\n Admin Address........ \n Admin Address. Dulles\n Admin Address........ 20166\n Admin Address........ VA\n Admin Address........ UNITED STATES\n Admin Email.......... domain-adm@corp.aol.com\n Admin Phone.......... +1.7032654670\n Admin Fax............ \n\nTech Name............ Domain Admin\n Tech Address......... AOL Inc.\n Tech Address......... 22000 AOL Way\n Tech Address......... \n Tech Address......... Dulles\n Tech Address......... 20166\n Tech Address......... VA\n Tech Address......... UNITED STATES\n Tech Email........... domain-adm@corp.aol.com\n Tech Phone........... +1.7032654670\n Tech Fax............. \n Name Server.......... DNS-02.NS.AOL.COM\n Name Server.......... DNS-01.NS.AOL.COM\n Name Server.......... DNS-07.NS.AOL.COM\n Name Server.......... DNS-06.NS.AOL.COM\n\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Server Name: AOL.COM.ZZZZZ.GET.LAID.AT.WWW.SWINGINGCOMMUNITY.COM\n IP Address: 69.41.185.197\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: AOL.COM.MORE.INFO.AT.WWW.BEYONDWHOIS.COM\n IP Address: 203.36.226.2\n Registrar: INSTRA CORPORATION PTY, LTD.\n Whois Server: whois.instra.net\n Referral URL: http://www.instra.com\n\n Server Name: AOL.COM.IS.N0T.AS.1337.AS.GULLI.COM\n IP Address: 80.190.192.24\n Registrar: CORE INTERNET COUNCIL OF REGISTRARS\n Whois Server: whois.corenic.net\n Referral URL: http://www.corenic.net\n\n Server Name: AOL.COM.IS.0WNED.BY.SUB7.NET\n IP Address: 216.78.25.45\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: AOL.COM.BR\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: AOL.COM.AINT.GOT.AS.MUCH.FREE.PORN.AS.SECZ.COM\n IP Address: 209.187.114.133\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Domain Name: AOL.COM\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n Name Server: DNS-01.NS.AOL.COM\n Name Server: DNS-02.NS.AOL.COM\n Name Server: DNS-06.NS.AOL.COM\n Name Server: DNS-07.NS.AOL.COM\n Status: clientTransferProhibited\n Status: serverDeleteProhibited\n Status: serverTransferProhibited\n Status: serverUpdateProhibited\n Updated Date: 24-sep-2013\n Creation Date: 22-jun-1995\n Expiration Date: 23-nov-2014\n\n>>> Last update of whois database: Sat, 23 Nov 2013 14:39:22 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.tucows.com", "whois.instra.net", "whois.corenic.net", "whois.tucows.com", "whois.enom.com", "whois.tucows.com", "whois.melbourneit.com"], "registrar": ["Tucows Domains Inc.", "Instra Corporation Pty, Ltd.", "Core Internet Council Of Registrars", "Enom, Inc.", "Melbourne It, Ltd. D/b/a Internet Names Worldwide"], "name_servers": ["dns-02.ns.aol.com", "dns-01.ns.aol.com", "dns-07.ns.aol.com", "dns-06.ns.aol.com"], "emails": []}
\ No newline at end of file
+{"status": ["clientTransferProhibited", "serverDeleteProhibited", "serverTransferProhibited", "serverUpdateProhibited"], "updated_date": ["2013-09-24T00:00:00", "2013-11-23T14:39:22"], "contacts": {"admin": {"city": "Dulles", "name": "Domain Admin", "phone": "+1.7032654670", "state": "VA", "street": "AOL Inc.\n22000 AOL Way", "country": "United States", "postalcode": "20166", "email": "domain-adm@corp.aol.com"}, "tech": {"city": "Dulles", "name": "Domain Admin", "phone": "+1.7032654670", "state": "VA", "street": "AOL Inc.\n22000 AOL Way", "country": "United States", "postalcode": "20166", "email": "domain-adm@corp.aol.com"}, "registrant": {"city": "Dulles", "name": "AOL Inc.", "state": "VA", "street": "22000 AOL Way", "country": "United States", "postalcode": "20166"}, "billing": null}, "nameservers": ["dns-02.ns.aol.com", "dns-01.ns.aol.com", "dns-07.ns.aol.com", "dns-06.ns.aol.com"], "expiration_date": ["2014-11-23T00:00:00"], "creation_date": ["1995-06-22T00:00:00"], "raw": ["\nDomain Name.......... aol.com\n Creation Date........ 1995-06-22\n Registration Date.... 2009-10-03\n Expiry Date.......... 2014-11-24\n Organisation Name.... AOL Inc.\n Organisation Address. 22000 AOL Way\n Organisation Address. \n Organisation Address. \n Organisation Address. Dulles\n Organisation Address. 20166\n Organisation Address. VA\n Organisation Address. UNITED STATES\n\nAdmin Name........... Domain Admin\n Admin Address........ AOL Inc.\n Admin Address........ 22000 AOL Way\n Admin Address........ \n Admin Address. Dulles\n Admin Address........ 20166\n Admin Address........ VA\n Admin Address........ UNITED STATES\n Admin Email.......... domain-adm@corp.aol.com\n Admin Phone.......... +1.7032654670\n Admin Fax............ \n\nTech Name............ Domain Admin\n Tech Address......... AOL Inc.\n Tech Address......... 22000 AOL Way\n Tech Address......... \n Tech Address......... Dulles\n Tech Address......... 20166\n Tech Address......... VA\n Tech Address......... UNITED STATES\n Tech Email........... domain-adm@corp.aol.com\n Tech Phone........... +1.7032654670\n Tech Fax............. \n Name Server.......... DNS-02.NS.AOL.COM\n Name Server.......... DNS-01.NS.AOL.COM\n Name Server.......... DNS-07.NS.AOL.COM\n Name Server.......... DNS-06.NS.AOL.COM\n\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Server Name: AOL.COM.ZZZZZ.GET.LAID.AT.WWW.SWINGINGCOMMUNITY.COM\n IP Address: 69.41.185.197\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: AOL.COM.MORE.INFO.AT.WWW.BEYONDWHOIS.COM\n IP Address: 203.36.226.2\n Registrar: INSTRA CORPORATION PTY, LTD.\n Whois Server: whois.instra.net\n Referral URL: http://www.instra.com\n\n Server Name: AOL.COM.IS.N0T.AS.1337.AS.GULLI.COM\n IP Address: 80.190.192.24\n Registrar: CORE INTERNET COUNCIL OF REGISTRARS\n Whois Server: whois.corenic.net\n Referral URL: http://www.corenic.net\n\n Server Name: AOL.COM.IS.0WNED.BY.SUB7.NET\n IP Address: 216.78.25.45\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: AOL.COM.BR\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: AOL.COM.AINT.GOT.AS.MUCH.FREE.PORN.AS.SECZ.COM\n IP Address: 209.187.114.133\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Domain Name: AOL.COM\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n Name Server: DNS-01.NS.AOL.COM\n Name Server: DNS-02.NS.AOL.COM\n Name Server: DNS-06.NS.AOL.COM\n Name Server: DNS-07.NS.AOL.COM\n Status: clientTransferProhibited\n Status: serverDeleteProhibited\n Status: serverTransferProhibited\n Status: serverUpdateProhibited\n Updated Date: 24-sep-2013\n Creation Date: 22-jun-1995\n Expiration Date: 23-nov-2014\n\n>>> Last update of whois database: Sat, 23 Nov 2013 14:39:22 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.tucows.com", "whois.instra.net", "whois.corenic.net", "whois.tucows.com", "whois.enom.com", "whois.tucows.com", "whois.melbourneit.com"], "registrar": ["Tucows Domains Inc.", "Instra Corporation Pty, Ltd.", "Core Internet Council Of Registrars", "Enom, Inc.", "Melbourne It, Ltd. D/b/a Internet Names Worldwide"]}
\ No newline at end of file
diff --git a/test/target_normalized/aridns.net.au b/test/target_normalized/aridns.net.au
index 16ed28a..7c7be6d 100644
--- a/test/target_normalized/aridns.net.au
+++ b/test/target_normalized/aridns.net.au
@@ -1 +1 @@
-{"status": ["serverDeleteProhibited (Protected by .auLOCKDOWN)", "serverUpdateProhibited (Protected by .auLOCKDOWN)"], "updated_date": ["2013-07-12T08:26:40"], "contacts": {"admin": null, "tech": {"handle": "83053T1868269", "name": "Domain Administrator"}, "registrant": {"organization": "AusRegistry International Pty. Ltd.", "handle": "83052O1868269", "name": "Domain Administrator"}, "billing": null}, "expiration_date": null, "emails": null, "raw": ["Domain Name: aridns.net.au\nLast Modified: 12-Jul-2013 08:26:40 UTC\nRegistrar ID: Melbourne IT\nRegistrar Name: Melbourne IT\nStatus: serverDeleteProhibited (Protected by .auLOCKDOWN)\nStatus: serverUpdateProhibited (Protected by .auLOCKDOWN)\n\nRegistrant: AusRegistry International Pty. Ltd.\nRegistrant ID: ABN 16103729620\nEligibility Type: Company\n\nRegistrant Contact ID: 83052O1868269\nRegistrant Contact Name: Domain Administrator\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: 83053T1868269\nTech Contact Name: Domain Administrator\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: ari.alpha.aridns.net.au\nName Server IP: 2001:dcd:1:0:0:0:0:2\nName Server IP: 37.209.192.2\nName Server: ari.beta.aridns.net.au\nName Server IP: 2001:dcd:2:0:0:0:0:2\nName Server IP: 37.209.194.2\nName Server: ari.gamma.aridns.net.au\nName Server IP: 2001:dcd:3:0:0:0:0:2\nName Server IP: 37.209.196.2\nName Server: ari.delta.aridns.net.au\nName Server IP: 2001:dcd:4:0:0:0:0:2\nName Server IP: 37.209.198.2\n\n"], "whois_server": null, "registrar": ["Melbourne IT"], "name_servers": ["ari.alpha.aridns.net.au", "ari.beta.aridns.net.au", "ari.gamma.aridns.net.au", "ari.delta.aridns.net.au"], "creation_date": null, "id": null}
\ No newline at end of file
+{"status": ["serverDeleteProhibited (Protected by .auLOCKDOWN)", "serverUpdateProhibited (Protected by .auLOCKDOWN)"], "updated_date": ["2013-07-12T08:26:40"], "contacts": {"admin": null, "tech": {"handle": "83053T1868269", "name": "Domain Administrator"}, "registrant": {"organization": "AusRegistry International Pty. Ltd.", "handle": "83052O1868269", "name": "Domain Administrator"}, "billing": null}, "nameservers": ["ari.alpha.aridns.net.au", "ari.beta.aridns.net.au", "ari.gamma.aridns.net.au", "ari.delta.aridns.net.au"], "raw": ["Domain Name: aridns.net.au\nLast Modified: 12-Jul-2013 08:26:40 UTC\nRegistrar ID: Melbourne IT\nRegistrar Name: Melbourne IT\nStatus: serverDeleteProhibited (Protected by .auLOCKDOWN)\nStatus: serverUpdateProhibited (Protected by .auLOCKDOWN)\n\nRegistrant: AusRegistry International Pty. Ltd.\nRegistrant ID: ABN 16103729620\nEligibility Type: Company\n\nRegistrant Contact ID: 83052O1868269\nRegistrant Contact Name: Domain Administrator\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: 83053T1868269\nTech Contact Name: Domain Administrator\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: ari.alpha.aridns.net.au\nName Server IP: 2001:dcd:1:0:0:0:0:2\nName Server IP: 37.209.192.2\nName Server: ari.beta.aridns.net.au\nName Server IP: 2001:dcd:2:0:0:0:0:2\nName Server IP: 37.209.194.2\nName Server: ari.gamma.aridns.net.au\nName Server IP: 2001:dcd:3:0:0:0:0:2\nName Server IP: 37.209.196.2\nName Server: ari.delta.aridns.net.au\nName Server IP: 2001:dcd:4:0:0:0:0:2\nName Server IP: 37.209.198.2\n\n"], "registrar": ["Melbourne IT"]}
\ No newline at end of file
diff --git a/test/target_normalized/atheme.org b/test/target_normalized/atheme.org
index 082c21b..392890e 100644
--- a/test/target_normalized/atheme.org
+++ b/test/target_normalized/atheme.org
@@ -1 +1 @@
-{"status": ["OK"], "updated_date": ["2013-06-20T04:41:04"], "contacts": {"admin": {"city": "Tulsa", "handle": "WP684-GANDI", "name": "William Pitcock", "state": "OK", "phone": "+1.9188949052", "street": "217 E Zion St", "country": "US", "postalcode": "74106", "email": "f4256b942aa5a0a7e65f2a91e62e95c2-1580801@contact.gandi.net"}, "tech": {"city": "Tulsa", "handle": "WP684-GANDI", "name": "William Pitcock", "state": "OK", "phone": "+1.9188949052", "street": "217 E Zion St", "country": "US", "postalcode": "74106", "email": "f4256b942aa5a0a7e65f2a91e62e95c2-1580801@contact.gandi.net"}, "registrant": {"city": "Tulsa", "handle": "0-1280133-GANDI", "name": "William Pitcock", "phone": "+1.9188949052", "street": "217 E Zion St", "country": "US", "postalcode": "74106", "organization": "atheme.org", "email": "e370de2cae0d52f8b0c6da942578cef1-815986@contact.gandi.net"}, "billing": null}, "expiration_date": ["2014-06-19T22:15:59"], "emails": [], "raw": ["Access to .ORG WHOIS information is provided to assist persons in \ndetermining the contents of a domain name registration record in the \nPublic Interest Registry registry database. The data in this record is provided by \nPublic Interest Registry for informational purposes only, and Public Interest Registry does not \nguarantee its accuracy. This service is intended only for query-based \naccess. You agree that you will use this data only for lawful purposes \nand that, under no circumstances will you use this data to: (a) allow, \nenable, or otherwise support the transmission by e-mail, telephone, or \nfacsimile of mass unsolicited, commercial advertising or solicitations \nto entities other than the data recipient's own existing customers; or \n(b) enable high volume, automated, electronic processes that send \nqueries or data to the systems of Registry Operator, a Registrar, or \nAfilias except as reasonably necessary to register domain names or \nmodify existing registrations. All rights reserved. Public Interest Registry reserves \nthe right to modify these terms at any time. By submitting this query, \nyou agree to abide by this policy. \n\nDomain ID:D106661323-LROR\nDomain Name:ATHEME.ORG\nCreated On:19-Jun-2005 22:15:59 UTC\nLast Updated On:20-Jun-2013 04:41:04 UTC\nExpiration Date:19-Jun-2014 22:15:59 UTC\nSponsoring Registrar:Gandi SAS (R42-LROR)\nStatus:OK\nRegistrant ID:0-1280133-GANDI\nRegistrant Name:William Pitcock\nRegistrant Organization:atheme.org\nRegistrant Street1:217 E Zion St\nRegistrant Street2:\nRegistrant Street3:\nRegistrant City:Tulsa\nRegistrant State/Province:\nRegistrant Postal Code:74106\nRegistrant Country:US\nRegistrant Phone:+1.9188949052\nRegistrant Phone Ext.:\nRegistrant FAX:\nRegistrant FAX Ext.:\nRegistrant Email:e370de2cae0d52f8b0c6da942578cef1-815986@contact.gandi.net\nAdmin ID:WP684-GANDI\nAdmin Name:William Pitcock\nAdmin Street1:217 E Zion St\nAdmin Street2:\nAdmin Street3:\nAdmin City:Tulsa\nAdmin State/Province:OK\nAdmin Postal Code:74106\nAdmin Country:US\nAdmin Phone:+1.9188949052\nAdmin Phone Ext.:\nAdmin FAX:\nAdmin FAX Ext.:\nAdmin Email:f4256b942aa5a0a7e65f2a91e62e95c2-1580801@contact.gandi.net\nTech ID:WP684-GANDI\nTech Name:William Pitcock\nTech Street1:217 E Zion St\nTech Street2:\nTech Street3:\nTech City:Tulsa\nTech State/Province:OK\nTech Postal Code:74106\nTech Country:US\nTech Phone:+1.9188949052\nTech Phone Ext.:\nTech FAX:\nTech FAX Ext.:\nTech Email:f4256b942aa5a0a7e65f2a91e62e95c2-1580801@contact.gandi.net\nName Server:C.DNS.GANDI.NET\nName Server:B.DNS.GANDI.NET\nName Server:A.DNS.GANDI.NET\nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nDNSSEC:Unsigned\n\n\n"], "whois_server": null, "registrar": ["Gandi SAS (R42-LROR)"], "name_servers": ["c.dns.gandi.net", "b.dns.gandi.net", "a.dns.gandi.net"], "creation_date": ["2005-06-19T22:15:59", "2005-06-19T22:15:59"], "id": ["D106661323-LROR"]}
\ No newline at end of file
+{"status": ["OK"], "updated_date": ["2013-06-20T04:41:04"], "contacts": {"admin": {"city": "Tulsa", "handle": "WP684-GANDI", "name": "William Pitcock", "state": "OK", "phone": "+1.9188949052", "street": "217 E Zion St", "country": "US", "postalcode": "74106", "email": "f4256b942aa5a0a7e65f2a91e62e95c2-1580801@contact.gandi.net"}, "tech": {"city": "Tulsa", "handle": "WP684-GANDI", "name": "William Pitcock", "state": "OK", "phone": "+1.9188949052", "street": "217 E Zion St", "country": "US", "postalcode": "74106", "email": "f4256b942aa5a0a7e65f2a91e62e95c2-1580801@contact.gandi.net"}, "registrant": {"city": "Tulsa", "handle": "0-1280133-GANDI", "name": "William Pitcock", "phone": "+1.9188949052", "street": "217 E Zion St", "country": "US", "postalcode": "74106", "organization": "atheme.org", "email": "e370de2cae0d52f8b0c6da942578cef1-815986@contact.gandi.net"}, "billing": null}, "nameservers": ["c.dns.gandi.net", "b.dns.gandi.net", "a.dns.gandi.net"], "expiration_date": ["2014-06-19T22:15:59"], "raw": ["Access to .ORG WHOIS information is provided to assist persons in \ndetermining the contents of a domain name registration record in the \nPublic Interest Registry registry database. The data in this record is provided by \nPublic Interest Registry for informational purposes only, and Public Interest Registry does not \nguarantee its accuracy. This service is intended only for query-based \naccess. You agree that you will use this data only for lawful purposes \nand that, under no circumstances will you use this data to: (a) allow, \nenable, or otherwise support the transmission by e-mail, telephone, or \nfacsimile of mass unsolicited, commercial advertising or solicitations \nto entities other than the data recipient's own existing customers; or \n(b) enable high volume, automated, electronic processes that send \nqueries or data to the systems of Registry Operator, a Registrar, or \nAfilias except as reasonably necessary to register domain names or \nmodify existing registrations. All rights reserved. Public Interest Registry reserves \nthe right to modify these terms at any time. By submitting this query, \nyou agree to abide by this policy. \n\nDomain ID:D106661323-LROR\nDomain Name:ATHEME.ORG\nCreated On:19-Jun-2005 22:15:59 UTC\nLast Updated On:20-Jun-2013 04:41:04 UTC\nExpiration Date:19-Jun-2014 22:15:59 UTC\nSponsoring Registrar:Gandi SAS (R42-LROR)\nStatus:OK\nRegistrant ID:0-1280133-GANDI\nRegistrant Name:William Pitcock\nRegistrant Organization:atheme.org\nRegistrant Street1:217 E Zion St\nRegistrant Street2:\nRegistrant Street3:\nRegistrant City:Tulsa\nRegistrant State/Province:\nRegistrant Postal Code:74106\nRegistrant Country:US\nRegistrant Phone:+1.9188949052\nRegistrant Phone Ext.:\nRegistrant FAX:\nRegistrant FAX Ext.:\nRegistrant Email:e370de2cae0d52f8b0c6da942578cef1-815986@contact.gandi.net\nAdmin ID:WP684-GANDI\nAdmin Name:William Pitcock\nAdmin Street1:217 E Zion St\nAdmin Street2:\nAdmin Street3:\nAdmin City:Tulsa\nAdmin State/Province:OK\nAdmin Postal Code:74106\nAdmin Country:US\nAdmin Phone:+1.9188949052\nAdmin Phone Ext.:\nAdmin FAX:\nAdmin FAX Ext.:\nAdmin Email:f4256b942aa5a0a7e65f2a91e62e95c2-1580801@contact.gandi.net\nTech ID:WP684-GANDI\nTech Name:William Pitcock\nTech Street1:217 E Zion St\nTech Street2:\nTech Street3:\nTech City:Tulsa\nTech State/Province:OK\nTech Postal Code:74106\nTech Country:US\nTech Phone:+1.9188949052\nTech Phone Ext.:\nTech FAX:\nTech FAX Ext.:\nTech Email:f4256b942aa5a0a7e65f2a91e62e95c2-1580801@contact.gandi.net\nName Server:C.DNS.GANDI.NET\nName Server:B.DNS.GANDI.NET\nName Server:A.DNS.GANDI.NET\nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nName Server: \nDNSSEC:Unsigned\n\n\n"], "registrar": ["Gandi SAS (R42-LROR)"], "creation_date": ["2005-06-19T22:15:59", "2005-06-19T22:15:59"], "id": ["D106661323-LROR"]}
\ No newline at end of file
diff --git a/test/target_normalized/australia.gov.au b/test/target_normalized/australia.gov.au
index 9df9a3e..72bb573 100644
--- a/test/target_normalized/australia.gov.au
+++ b/test/target_normalized/australia.gov.au
@@ -1 +1 @@
-{"status": ["ok"], "updated_date": ["2013-06-04T02:20:37"], "contacts": {"admin": null, "tech": {"handle": "GOVAU-SUTE1002", "name": "Technical Support"}, "registrant": {"organization": "Department of Finance and Deregulation", "handle": "GOVAU-IVLY1033", "name": "Web Manager"}, "billing": null}, "expiration_date": null, "emails": null, "raw": ["Domain Name: australia.gov.au\nLast Modified: 04-Jun-2013 02:20:37 UTC\nRegistrar ID: Finance\nRegistrar Name: Department of Finance\nStatus: ok\n\nRegistrant: Department of Finance and Deregulation\nEligibility Type: Other\n\nRegistrant Contact ID: GOVAU-IVLY1033\nRegistrant Contact Name: Web Manager\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: GOVAU-SUTE1002\nTech Contact Name: Technical Support\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: dns1.sge.net\nName Server: dns2.sge.net\nName Server: dns3.sge.net\nName Server: dns4.sge.net\n\n"], "whois_server": null, "registrar": ["Department of Finance"], "name_servers": ["dns1.sge.net", "dns2.sge.net", "dns3.sge.net", "dns4.sge.net"], "creation_date": null, "id": null}
\ No newline at end of file
+{"status": ["ok"], "updated_date": ["2013-06-04T02:20:37"], "contacts": {"admin": null, "tech": {"handle": "GOVAU-SUTE1002", "name": "Technical Support"}, "registrant": {"organization": "Department of Finance and Deregulation", "handle": "GOVAU-IVLY1033", "name": "Web Manager"}, "billing": null}, "nameservers": ["dns1.sge.net", "dns2.sge.net", "dns3.sge.net", "dns4.sge.net"], "raw": ["Domain Name: australia.gov.au\nLast Modified: 04-Jun-2013 02:20:37 UTC\nRegistrar ID: Finance\nRegistrar Name: Department of Finance\nStatus: ok\n\nRegistrant: Department of Finance and Deregulation\nEligibility Type: Other\n\nRegistrant Contact ID: GOVAU-IVLY1033\nRegistrant Contact Name: Web Manager\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: GOVAU-SUTE1002\nTech Contact Name: Technical Support\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: dns1.sge.net\nName Server: dns2.sge.net\nName Server: dns3.sge.net\nName Server: dns4.sge.net\n\n"], "registrar": ["Department of Finance"]}
\ No newline at end of file
diff --git a/test/target_normalized/cryto.net b/test/target_normalized/cryto.net
index 149b187..35795cf 100644
--- a/test/target_normalized/cryto.net
+++ b/test/target_normalized/cryto.net
@@ -1 +1 @@
-{"status": ["clientTransferProhibited"], "updated_date": ["2013-02-11T00:00:00", "2013-11-20T04:12:42"], "contacts": {"admin": {"city": "Dordrecht", "name": "Sven Slootweg", "country": "Netherlands", "phone": "+31.626519955", "street": "Wijnstraat 211", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "tech": {"city": "Dordrecht", "name": "Sven Slootweg", "country": "Netherlands", "phone": "+31.626519955", "street": "Wijnstraat 211", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "registrant": {"city": "Dordrecht", "name": "Sven Slootweg", "country": "Netherlands", "phone": "+31.626519955", "street": "Wijnstraat 211", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "billing": null}, "expiration_date": ["2014-02-14T00:00:00"], "id": null, "creation_date": ["2010-02-14T00:00:00"], "raw": ["Domain cryto.net\n\nDate Registered: 2010-2-14\nExpiry Date: 2014-2-14\n\nDNS1: ns1.he.net\nDNS2: ns2.he.net\nDNS3: ns3.he.net\nDNS4: ns4.he.net\nDNS5: ns5.he.net\n\nRegistrant\n Sven Slootweg\n Email:jamsoftgamedev@gmail.com\n Wijnstraat 211\n 3311BV Dordrecht\n Netherlands\n Tel: +31.626519955\n\nAdministrative Contact\n Sven Slootweg\n Email:jamsoftgamedev@gmail.com\n Wijnstraat 211\n 3311BV Dordrecht\n Netherlands\n Tel: +31.626519955\n\nTechnical Contact\n Sven Slootweg\n Email:jamsoftgamedev@gmail.com\n Wijnstraat 211\n 3311BV Dordrecht\n Netherlands\n Tel: +31.626519955\n\nRegistrar: Internet.bs Corp.\nRegistrar's Website : http://www.internetbs.net/\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: CRYTO.NET\n Registrar: INTERNET.BS CORP.\n Whois Server: whois.internet.bs\n Referral URL: http://www.internet.bs\n Name Server: NS1.HE.NET\n Name Server: NS2.HE.NET\n Name Server: NS3.HE.NET\n Name Server: NS4.HE.NET\n Name Server: NS5.HE.NET\n Status: clientTransferProhibited\n Updated Date: 11-feb-2013\n Creation Date: 14-feb-2010\n Expiration Date: 14-feb-2014\n\n>>> Last update of whois database: Wed, 20 Nov 2013 04:12:42 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.internet.bs"], "registrar": ["Internet.bs Corp."], "name_servers": ["ns1.he.net", "ns2.he.net", "ns3.he.net", "ns4.he.net", "ns5.he.net"], "emails": []}
\ No newline at end of file
+{"status": ["clientTransferProhibited"], "updated_date": ["2013-02-11T00:00:00", "2013-11-20T04:12:42"], "contacts": {"admin": {"city": "Dordrecht", "name": "Sven Slootweg", "country": "Netherlands", "phone": "+31.626519955", "street": "Wijnstraat 211", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "tech": {"city": "Dordrecht", "name": "Sven Slootweg", "country": "Netherlands", "phone": "+31.626519955", "street": "Wijnstraat 211", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "registrant": {"city": "Dordrecht", "name": "Sven Slootweg", "country": "Netherlands", "phone": "+31.626519955", "street": "Wijnstraat 211", "postalcode": "3311BV", "email": "jamsoftgamedev@gmail.com"}, "billing": null}, "nameservers": ["ns1.he.net", "ns2.he.net", "ns3.he.net", "ns4.he.net", "ns5.he.net"], "expiration_date": ["2014-02-14T00:00:00"], "creation_date": ["2010-02-14T00:00:00"], "raw": ["Domain cryto.net\n\nDate Registered: 2010-2-14\nExpiry Date: 2014-2-14\n\nDNS1: ns1.he.net\nDNS2: ns2.he.net\nDNS3: ns3.he.net\nDNS4: ns4.he.net\nDNS5: ns5.he.net\n\nRegistrant\n Sven Slootweg\n Email:jamsoftgamedev@gmail.com\n Wijnstraat 211\n 3311BV Dordrecht\n Netherlands\n Tel: +31.626519955\n\nAdministrative Contact\n Sven Slootweg\n Email:jamsoftgamedev@gmail.com\n Wijnstraat 211\n 3311BV Dordrecht\n Netherlands\n Tel: +31.626519955\n\nTechnical Contact\n Sven Slootweg\n Email:jamsoftgamedev@gmail.com\n Wijnstraat 211\n 3311BV Dordrecht\n Netherlands\n Tel: +31.626519955\n\nRegistrar: Internet.bs Corp.\nRegistrar's Website : http://www.internetbs.net/\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: CRYTO.NET\n Registrar: INTERNET.BS CORP.\n Whois Server: whois.internet.bs\n Referral URL: http://www.internet.bs\n Name Server: NS1.HE.NET\n Name Server: NS2.HE.NET\n Name Server: NS3.HE.NET\n Name Server: NS4.HE.NET\n Name Server: NS5.HE.NET\n Status: clientTransferProhibited\n Updated Date: 11-feb-2013\n Creation Date: 14-feb-2010\n Expiration Date: 14-feb-2014\n\n>>> Last update of whois database: Wed, 20 Nov 2013 04:12:42 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.internet.bs"], "registrar": ["Internet.bs Corp."]}
\ No newline at end of file
diff --git a/test/target_normalized/daemonrage.net b/test/target_normalized/daemonrage.net
index be3951b..e25c842 100644
--- a/test/target_normalized/daemonrage.net
+++ b/test/target_normalized/daemonrage.net
@@ -1 +1 @@
-{"status": ["clientTransferProhibited"], "updated_date": ["2013-10-18T00:00:00", "2013-11-21T04:08:18"], "contacts": {"admin": {"city": "Lincoln", "name": "Paul Webster", "state": "Lincolnshire", "phone": "01522718954", "street": "Worldformee\n257 Monks Road", "country": "GB", "postalcode": "LN25JX", "email": "paul.g.webster@googlemail.com"}, "tech": {"city": "Lincoln", "name": "Paul Webster", "state": "Lincolnshire", "phone": "01522718954", "street": "Worldformee\n257 Monks Road", "country": "GB", "postalcode": "LN25JX", "email": "paul.g.webster@googlemail.com"}, "registrant": {"city": "Lincoln", "state": "Lincolnshire", "street": "257 Monks Road", "country": "GB", "postalcode": "LN25JX", "organization": "Worldformee"}, "billing": null}, "expiration_date": ["2014-10-02T21:37:48"], "id": null, "creation_date": ["2009-10-02T21:37:00"], "raw": ["\nDomain Name: DAEMONRAGE.NET\nCreation Date: 2009-10-02 21:37:00Z\nRegistrar Registration Expiration Date: 2014-10-02 21:37:48Z\nRegistrar: ENOM, INC.\nReseller: NAMECHEAP.COM\nRegistrant Name: \nRegistrant Organization: WORLDFORMEE\nRegistrant Street: 257 MONKS ROAD\nRegistrant City: LINCOLN\nRegistrant State/Province: LINCOLNSHIRE\nRegistrant Postal Code: LN25JX\nRegistrant Country: GB\nAdmin Name: PAUL WEBSTER\nAdmin Organization: \nAdmin Street: WORLDFORMEE\nAdmin Street: 257 MONKS ROAD\nAdmin City: LINCOLN\nAdmin State/Province: LINCOLNSHIRE\nAdmin Postal Code: LN25JX\nAdmin Country: GB\nAdmin Phone: 01522718954\nAdmin Phone Ext: \nAdmin Fax: \nAdmin Fax Ext:\nAdmin Email: PAUL.G.WEBSTER@GOOGLEMAIL.COM\nTech Name: PAUL WEBSTER\nTech Organization: \nTech Street: WORLDFORMEE\nTech Street: 257 MONKS ROAD\nTech City: LINCOLN\nTech State/Province: LINCOLNSHIRE\nTech Postal Code: LN25JX\nTech Country: GB\nTech Phone: 01522718954\nTech Phone Ext: \nTech Fax: \nTech Fax Ext: \nTech Email: PAUL.G.WEBSTER@GOOGLEMAIL.COM\nName Server: NS1.HE.NET\nName Server: NS2.HE.NET\nName Server: NS3.HE.NET\nName Server: NS4.HE.NET\nName Server: NS5.HE.NET\n\nThe data in this whois database is provided to you for information\npurposes only, that is, to assist you in obtaining information about or\nrelated to a domain name registration record. We make this information\navailable \"as is,\" and do not guarantee its accuracy. By submitting a\nwhois query, you agree that you will use this data only for lawful\npurposes and that, under no circumstances will you use this data to: (1)\nenable high volume, automated, electronic processes that stress or load\nthis whois database system providing you this information; or (2) allow,\nenable, or otherwise support the transmission of mass unsolicited,\ncommercial advertising or solicitations via direct mail, electronic\nmail, or by telephone. The compilation, repackaging, dissemination or\nother use of this data is expressly prohibited without prior written\nconsent from us. \n\nWe reserve the right to modify these terms at any time. By submitting \nthis query, you agree to abide by these terms.\nVersion 6.3 4/3/2002\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: DAEMONRAGE.NET\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n Name Server: NS1.HE.NET\n Name Server: NS2.HE.NET\n Name Server: NS3.HE.NET\n Name Server: NS4.HE.NET\n Name Server: NS5.HE.NET\n Status: clientTransferProhibited\n Updated Date: 18-oct-2013\n Creation Date: 02-oct-2009\n Expiration Date: 02-oct-2014\n\n>>> Last update of whois database: Thu, 21 Nov 2013 04:08:18 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.enom.com"], "registrar": ["Enom, Inc."], "name_servers": ["ns1.he.net", "ns2.he.net", "ns3.he.net", "ns4.he.net", "ns5.he.net"], "emails": []}
\ No newline at end of file
+{"status": ["clientTransferProhibited"], "updated_date": ["2013-10-18T00:00:00", "2013-11-21T04:08:18"], "contacts": {"admin": {"city": "Lincoln", "name": "Paul Webster", "state": "Lincolnshire", "phone": "01522718954", "street": "Worldformee\n257 Monks Road", "country": "GB", "postalcode": "LN25JX", "email": "paul.g.webster@googlemail.com"}, "tech": {"city": "Lincoln", "name": "Paul Webster", "state": "Lincolnshire", "phone": "01522718954", "street": "Worldformee\n257 Monks Road", "country": "GB", "postalcode": "LN25JX", "email": "paul.g.webster@googlemail.com"}, "registrant": {"city": "Lincoln", "state": "Lincolnshire", "street": "257 Monks Road", "country": "GB", "postalcode": "LN25JX", "organization": "Worldformee"}, "billing": null}, "nameservers": ["ns1.he.net", "ns2.he.net", "ns3.he.net", "ns4.he.net", "ns5.he.net"], "expiration_date": ["2014-10-02T21:37:48"], "creation_date": ["2009-10-02T21:37:00"], "raw": ["\nDomain Name: DAEMONRAGE.NET\nCreation Date: 2009-10-02 21:37:00Z\nRegistrar Registration Expiration Date: 2014-10-02 21:37:48Z\nRegistrar: ENOM, INC.\nReseller: NAMECHEAP.COM\nRegistrant Name: \nRegistrant Organization: WORLDFORMEE\nRegistrant Street: 257 MONKS ROAD\nRegistrant City: LINCOLN\nRegistrant State/Province: LINCOLNSHIRE\nRegistrant Postal Code: LN25JX\nRegistrant Country: GB\nAdmin Name: PAUL WEBSTER\nAdmin Organization: \nAdmin Street: WORLDFORMEE\nAdmin Street: 257 MONKS ROAD\nAdmin City: LINCOLN\nAdmin State/Province: LINCOLNSHIRE\nAdmin Postal Code: LN25JX\nAdmin Country: GB\nAdmin Phone: 01522718954\nAdmin Phone Ext: \nAdmin Fax: \nAdmin Fax Ext:\nAdmin Email: PAUL.G.WEBSTER@GOOGLEMAIL.COM\nTech Name: PAUL WEBSTER\nTech Organization: \nTech Street: WORLDFORMEE\nTech Street: 257 MONKS ROAD\nTech City: LINCOLN\nTech State/Province: LINCOLNSHIRE\nTech Postal Code: LN25JX\nTech Country: GB\nTech Phone: 01522718954\nTech Phone Ext: \nTech Fax: \nTech Fax Ext: \nTech Email: PAUL.G.WEBSTER@GOOGLEMAIL.COM\nName Server: NS1.HE.NET\nName Server: NS2.HE.NET\nName Server: NS3.HE.NET\nName Server: NS4.HE.NET\nName Server: NS5.HE.NET\n\nThe data in this whois database is provided to you for information\npurposes only, that is, to assist you in obtaining information about or\nrelated to a domain name registration record. We make this information\navailable \"as is,\" and do not guarantee its accuracy. By submitting a\nwhois query, you agree that you will use this data only for lawful\npurposes and that, under no circumstances will you use this data to: (1)\nenable high volume, automated, electronic processes that stress or load\nthis whois database system providing you this information; or (2) allow,\nenable, or otherwise support the transmission of mass unsolicited,\ncommercial advertising or solicitations via direct mail, electronic\nmail, or by telephone. The compilation, repackaging, dissemination or\nother use of this data is expressly prohibited without prior written\nconsent from us. \n\nWe reserve the right to modify these terms at any time. By submitting \nthis query, you agree to abide by these terms.\nVersion 6.3 4/3/2002\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: DAEMONRAGE.NET\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n Name Server: NS1.HE.NET\n Name Server: NS2.HE.NET\n Name Server: NS3.HE.NET\n Name Server: NS4.HE.NET\n Name Server: NS5.HE.NET\n Status: clientTransferProhibited\n Updated Date: 18-oct-2013\n Creation Date: 02-oct-2009\n Expiration Date: 02-oct-2014\n\n>>> Last update of whois database: Thu, 21 Nov 2013 04:08:18 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.enom.com"], "registrar": ["Enom, Inc."]}
\ No newline at end of file
diff --git a/test/target_normalized/dns4pro.com b/test/target_normalized/dns4pro.com
index aa7a23d..22c1c30 100644
--- a/test/target_normalized/dns4pro.com
+++ b/test/target_normalized/dns4pro.com
@@ -1 +1 @@
-{"status": ["clientTransferProhibited"], "updated_date": ["2013-08-12T00:00:00", "2013-11-21T08:54:31"], "contacts": {"admin": {"city": "M\u00fcnchen", "handle": "107329", "name": "Florian Moschner", "country": "DE", "phone": "+49.1781415353", "street": "Walter-Flex-Str. 4", "postalcode": "80637", "email": "florian@moschner.biz"}, "tech": {"city": "Berlin", "fax": "+49 30 66400138", "handle": "1", "name": "Hostmaster Of The Day", "country": "DE", "phone": "+49 30 66400137", "street": "Tempelhofer Damm 140", "postalcode": "12099", "organization": "InterNetworX Ltd. & Co. KG", "email": "hostmaster@inwx.de"}, "registrant": {"city": "M\u00fcnchen", "handle": "107329", "name": "Florian Moschner", "country": "DE", "phone": "+49.1781415353", "street": "Walter-Flex-Str. 4", "postalcode": "80637", "email": "florian@moschner.biz"}, "billing": {"city": "Berlin", "fax": "+49 30 66400138", "handle": "1", "name": "Hostmaster Of The Day", "country": "DE", "phone": "+49 30 66400137", "street": "Tempelhofer Damm 140", "postalcode": "12099", "organization": "InterNetworX Ltd. & Co. KG", "email": "hostmaster@inwx.de"}}, "expiration_date": ["2015-04-06T00:00:00"], "id": null, "creation_date": ["2013-08-12T00:00:00"], "raw": ["; This data is provided by InterNetworX Ltd. & Co. KG\n; for information purposes, and to assist persons obtaining information\n; about or related to domain name registration records.\n; InterNetworX Ltd. & Co. KG does not guarantee its accuracy.\n; By submitting a WHOIS query, you agree that you will use this data\n; only for lawful purposes and that, under no circumstances, you will\n; use this data to\n; 1) allow, enable, or otherwise support the transmission of mass\n; unsolicited, commercial advertising or solicitations via E-mail\n; (spam); or\n; 2) enable high volume, automated, electronic processes that apply\n; to this WHOIS server.\n; These terms may be changed without prior notice.\n; By submitting this query, you agree to abide by this policy.\n\nISP: InterNetworX Ltd. & Co. KG\nURL: www.inwx.de\n\ndomain: dns4pro.com\n\ncreated-date: 2013-08-12\nupdated-date: 2013-08-12\nexpiration-date: 2015-04-06\n\nowner-id: 107329\nowner-name: Florian Moschner\nowner-street: Walter-Flex-Str. 4\nowner-city: M\u00fcnchen\nowner-zip: 80637\nowner-country: DE\nowner-phone: +49.1781415353\nowner-email: florian@moschner.biz\n\nadmin-id: 107329\nadmin-name: Florian Moschner\nadmin-street: Walter-Flex-Str. 4\nadmin-city: M\u00fcnchen\nadmin-zip: 80637\nadmin-country: DE\nadmin-phone: +49.1781415353\nadmin-email: florian@moschner.biz\n\ntech-id: 1\ntech-organization: InterNetworX Ltd. & Co. KG\ntech-name: Hostmaster Of The Day\ntech-street: Tempelhofer Damm 140\ntech-city: Berlin\ntech-zip: 12099\ntech-country: DE\ntech-phone: +49 30 66400137\ntech-fax: +49 30 66400138\ntech-email: hostmaster@inwx.de\n\nbilling-id: 1\nbilling-organization: InterNetworX Ltd. & Co. KG\nbilling-name: Hostmaster Of The Day\nbilling-street: Tempelhofer Damm 140\nbilling-city: Berlin\nbilling-zip: 12099\nbilling-country: DE\nbilling-phone: +49 30 66400137\nbilling-fax: +49 30 66400138\nbilling-email: hostmaster@inwx.de\n\nnameserver: ns1.as199438.net\nnameserver: ns2.as199438.net\n\n; Please register your domains at\n; www.inwx.de\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: DNS4PRO.COM\n Registrar: INTERNETWORX LTD. & CO. KG\n Whois Server: whois.domrobot.com\n Referral URL: http://www.domrobot.com\n Name Server: NS1.AS199438.NET\n Name Server: NS2.AS199438.NET\n Status: clientTransferProhibited\n Updated Date: 12-aug-2013\n Creation Date: 06-apr-2013\n Expiration Date: 06-apr-2015\n\n>>> Last update of whois database: Thu, 21 Nov 2013 08:54:31 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.domrobot.com"], "registrar": ["Internetworx Ltd. & Co. Kg"], "name_servers": ["ns1.as199438.net", "ns2.as199438.net"], "emails": []}
\ No newline at end of file
+{"status": ["clientTransferProhibited"], "updated_date": ["2013-08-12T00:00:00", "2013-11-21T08:54:31"], "contacts": {"admin": {"city": "M\u00fcnchen", "handle": "107329", "name": "Florian Moschner", "country": "DE", "phone": "+49.1781415353", "street": "Walter-Flex-Str. 4", "postalcode": "80637", "email": "florian@moschner.biz"}, "tech": {"city": "Berlin", "fax": "+49 30 66400138", "handle": "1", "name": "Hostmaster Of The Day", "country": "DE", "phone": "+49 30 66400137", "street": "Tempelhofer Damm 140", "postalcode": "12099", "organization": "InterNetworX Ltd. & Co. KG", "email": "hostmaster@inwx.de"}, "registrant": {"city": "M\u00fcnchen", "handle": "107329", "name": "Florian Moschner", "country": "DE", "phone": "+49.1781415353", "street": "Walter-Flex-Str. 4", "postalcode": "80637", "email": "florian@moschner.biz"}, "billing": {"city": "Berlin", "fax": "+49 30 66400138", "handle": "1", "name": "Hostmaster Of The Day", "country": "DE", "phone": "+49 30 66400137", "street": "Tempelhofer Damm 140", "postalcode": "12099", "organization": "InterNetworX Ltd. & Co. KG", "email": "hostmaster@inwx.de"}}, "nameservers": ["ns1.as199438.net", "ns2.as199438.net"], "expiration_date": ["2015-04-06T00:00:00"], "creation_date": ["2013-08-12T00:00:00"], "raw": ["; This data is provided by InterNetworX Ltd. & Co. KG\n; for information purposes, and to assist persons obtaining information\n; about or related to domain name registration records.\n; InterNetworX Ltd. & Co. KG does not guarantee its accuracy.\n; By submitting a WHOIS query, you agree that you will use this data\n; only for lawful purposes and that, under no circumstances, you will\n; use this data to\n; 1) allow, enable, or otherwise support the transmission of mass\n; unsolicited, commercial advertising or solicitations via E-mail\n; (spam); or\n; 2) enable high volume, automated, electronic processes that apply\n; to this WHOIS server.\n; These terms may be changed without prior notice.\n; By submitting this query, you agree to abide by this policy.\n\nISP: InterNetworX Ltd. & Co. KG\nURL: www.inwx.de\n\ndomain: dns4pro.com\n\ncreated-date: 2013-08-12\nupdated-date: 2013-08-12\nexpiration-date: 2015-04-06\n\nowner-id: 107329\nowner-name: Florian Moschner\nowner-street: Walter-Flex-Str. 4\nowner-city: M\u00fcnchen\nowner-zip: 80637\nowner-country: DE\nowner-phone: +49.1781415353\nowner-email: florian@moschner.biz\n\nadmin-id: 107329\nadmin-name: Florian Moschner\nadmin-street: Walter-Flex-Str. 4\nadmin-city: M\u00fcnchen\nadmin-zip: 80637\nadmin-country: DE\nadmin-phone: +49.1781415353\nadmin-email: florian@moschner.biz\n\ntech-id: 1\ntech-organization: InterNetworX Ltd. & Co. KG\ntech-name: Hostmaster Of The Day\ntech-street: Tempelhofer Damm 140\ntech-city: Berlin\ntech-zip: 12099\ntech-country: DE\ntech-phone: +49 30 66400137\ntech-fax: +49 30 66400138\ntech-email: hostmaster@inwx.de\n\nbilling-id: 1\nbilling-organization: InterNetworX Ltd. & Co. KG\nbilling-name: Hostmaster Of The Day\nbilling-street: Tempelhofer Damm 140\nbilling-city: Berlin\nbilling-zip: 12099\nbilling-country: DE\nbilling-phone: +49 30 66400137\nbilling-fax: +49 30 66400138\nbilling-email: hostmaster@inwx.de\n\nnameserver: ns1.as199438.net\nnameserver: ns2.as199438.net\n\n; Please register your domains at\n; www.inwx.de\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: DNS4PRO.COM\n Registrar: INTERNETWORX LTD. & CO. KG\n Whois Server: whois.domrobot.com\n Referral URL: http://www.domrobot.com\n Name Server: NS1.AS199438.NET\n Name Server: NS2.AS199438.NET\n Status: clientTransferProhibited\n Updated Date: 12-aug-2013\n Creation Date: 06-apr-2013\n Expiration Date: 06-apr-2015\n\n>>> Last update of whois database: Thu, 21 Nov 2013 08:54:31 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.domrobot.com"], "registrar": ["Internetworx Ltd. & Co. Kg"]}
\ No newline at end of file
diff --git a/test/target_normalized/donuts.co b/test/target_normalized/donuts.co
index 9ae3123..16f9a8e 100644
--- a/test/target_normalized/donuts.co
+++ b/test/target_normalized/donuts.co
@@ -1 +1 @@
-{"status": ["clientDeleteProhibited", "clientRenewProhibited", "clientTransferProhibited", "clientUpdateProhibited"], "updated_date": ["2013-08-08T21:52:32", "2013-11-20T04:14:46"], "contacts": {"admin": {"city": "Bellevue", "handle": "CR86259720", "name": "Chris Cowherd", "phone": "+1.4252966802", "state": "Washington", "street": "10500 Ne 8th St\nSte 350", "country_code": "US", "country": "United States", "postalcode": "98004", "organization": "Donuts Inc.", "email": "it@donuts.co"}, "tech": {"city": "Bellevue", "handle": "CR86259718", "name": "Chris Cowherd", "phone": "+1.4252966802", "state": "Washington", "street": "10500 Ne 8th St\nSte 350", "country_code": "US", "country": "United States", "postalcode": "98004", "organization": "Donuts Inc.", "email": "it@donuts.co"}, "registrant": {"city": "Bellevue", "handle": "CR86259716", "name": "Chris Cowherd", "phone": "+1.4252966802", "state": "Washington", "street": "10500 Ne 8th St\nSte 350", "country_code": "US", "country": "United States", "postalcode": "98004", "organization": "Donuts Inc.", "email": "it@donuts.co"}, "billing": {"city": "Bellevue", "handle": "CR86259722", "name": "Chris Cowherd", "phone": "+1.4252966802", "state": "Washington", "street": "10500 Ne 8th St\nSte 350", "country_code": "US", "country": "United States", "postalcode": "98004", "organization": "Donuts Inc.", "email": "it@donuts.co"}}, "expiration_date": ["2014-07-19T23:59:59"], "emails": [], "raw": ["Domain Name: DONUTS.CO\nDomain ID: D1142814-CO\nSponsoring Registrar: GODADDY.COM, INC.\nSponsoring Registrar IANA ID: 146\nRegistrar URL (registration services): www.godaddy.com\nDomain Status: clientDeleteProhibited\nDomain Status: clientRenewProhibited\nDomain Status: clientTransferProhibited\nDomain Status: clientUpdateProhibited\nRegistrant ID: CR86259716\nRegistrant Name: Chris Cowherd\nRegistrant Organization: Donuts Inc.\nRegistrant Address1: 10500 Ne 8th St\nRegistrant Address2: Ste 350\nRegistrant City: Bellevue\nRegistrant State/Province: Washington\nRegistrant Postal Code: 98004\nRegistrant Country: United States\nRegistrant Country Code: US\nRegistrant Phone Number: +1.4252966802\nRegistrant Email: it@donuts.co\nAdministrative Contact ID: CR86259720\nAdministrative Contact Name: Chris Cowherd\nAdministrative Contact Organization: Donuts Inc.\nAdministrative Contact Address1: 10500 Ne 8th St\nAdministrative Contact Address2: Ste 350\nAdministrative Contact City: Bellevue\nAdministrative Contact State/Province: Washington\nAdministrative Contact Postal Code: 98004\nAdministrative Contact Country: United States\nAdministrative Contact Country Code: US\nAdministrative Contact Phone Number: +1.4252966802\nAdministrative Contact Email: it@donuts.co\nBilling Contact ID: CR86259722\nBilling Contact Name: Chris Cowherd\nBilling Contact Organization: Donuts Inc.\nBilling Contact Address1: 10500 Ne 8th St\nBilling Contact Address2: Ste 350\nBilling Contact City: Bellevue\nBilling Contact State/Province: Washington\nBilling Contact Postal Code: 98004\nBilling Contact Country: United States\nBilling Contact Country Code: US\nBilling Contact Phone Number: +1.4252966802\nBilling Contact Email: it@donuts.co\nTechnical Contact ID: CR86259718\nTechnical Contact Name: Chris Cowherd\nTechnical Contact Organization: Donuts Inc.\nTechnical Contact Address1: 10500 Ne 8th St\nTechnical Contact Address2: Ste 350\nTechnical Contact City: Bellevue\nTechnical Contact State/Province: Washington\nTechnical Contact Postal Code: 98004\nTechnical Contact Country: United States\nTechnical Contact Country Code: US\nTechnical Contact Phone Number: +1.4252966802\nTechnical Contact Email: it@donuts.co\nName Server: NS1.DREAMHOST.COM\nName Server: NS2.DREAMHOST.COM\nName Server: NS3.DREAMHOST.COM\nCreated by Registrar: INTERNETX GMBH\nLast Updated by Registrar: GODADDY.COM, INC.\nLast Transferred Date: Sun Jan 30 16:35:56 GMT 2011\nDomain Registration Date: Tue Jul 20 18:01:35 GMT 2010\nDomain Expiration Date: Sat Jul 19 23:59:59 GMT 2014\nDomain Last Updated Date: Thu Aug 08 21:52:32 GMT 2013\n\n>>>> Whois database was last updated on: Wed Nov 20 04:14:46 GMT 2013 <<<<\n.CO Internet, S.A.S., the Administrator for .CO, has collected this\ninformation for the WHOIS database through Accredited Registrars. \nThis information is provided to you for informational purposes only \nand is designed to assist persons in determining contents of a domain \nname registration record in the .CO Internet registry database. .CO \nInternet makes this information available to you \"as is\" and does not \nguarantee its accuracy.\n \nBy submitting a WHOIS query, you agree that you will use this data \nonly for lawful purposes and that, under no circumstances will you \nuse this data: (1) to allow, enable, or otherwise support the transmission \nof mass unsolicited, commercial advertising or solicitations via direct \nmail, electronic mail, or by telephone; (2) in contravention of any \napplicable data and privacy protection laws; or (3) to enable high volume, \nautomated, electronic processes that apply to the registry (or its systems). \nCompilation, repackaging, dissemination, or other use of the WHOIS \ndatabase in its entirety, or of a substantial portion thereof, is not allowed \nwithout .CO Internet's prior written permission. .CO Internet reserves the \nright to modify or change these conditions at any time without prior or \nsubsequent notification of any kind. By executing this query, in any manner \nwhatsoever, you agree to abide by these terms. In some limited cases, \ndomains that might appear as available in whois might not actually be \navailable as they could be already registered and the whois not yet updated \nand/or they could be part of the Restricted list. In this cases, performing a \ncheck through your Registrar's (EPP check) will give you the actual status \nof the domain. Additionally, domains currently or previously used as \nextensions in 3rd level domains will not be available for registration in the \n2nd level. For example, org.co,mil.co,edu.co,com.co,net.co,nom.co,arts.co,\nfirm.co,info.co,int.co,web.co,rec.co,co.co. \n \nNOTE: FAILURE TO LOCATE A RECORD IN THE WHOIS DATABASE IS NOT \nINDICATIVE OF THE AVAILABILITY OF A DOMAIN NAME. \n \nAll domain names are subject to certain additional domain name registration \nrules. For details, please visit our site at www.cointernet.co .\n\n"], "whois_server": null, "registrar": ["Godaddy.com, Inc.", "Internetx Gmbh"], "name_servers": ["ns1.dreamhost.com", "ns2.dreamhost.com", "ns3.dreamhost.com"], "creation_date": ["2010-07-20T18:01:35", "2010-07-20T18:01:35"], "id": ["D1142814-CO"]}
\ No newline at end of file
+{"status": ["clientDeleteProhibited", "clientRenewProhibited", "clientTransferProhibited", "clientUpdateProhibited"], "updated_date": ["2013-08-08T21:52:32", "2013-11-20T04:14:46"], "contacts": {"admin": {"city": "Bellevue", "handle": "CR86259720", "name": "Chris Cowherd", "phone": "+1.4252966802", "state": "Washington", "street": "10500 Ne 8th St\nSte 350", "country_code": "US", "country": "United States", "postalcode": "98004", "organization": "Donuts Inc.", "email": "it@donuts.co"}, "tech": {"city": "Bellevue", "handle": "CR86259718", "name": "Chris Cowherd", "phone": "+1.4252966802", "state": "Washington", "street": "10500 Ne 8th St\nSte 350", "country_code": "US", "country": "United States", "postalcode": "98004", "organization": "Donuts Inc.", "email": "it@donuts.co"}, "registrant": {"city": "Bellevue", "handle": "CR86259716", "name": "Chris Cowherd", "phone": "+1.4252966802", "state": "Washington", "street": "10500 Ne 8th St\nSte 350", "country_code": "US", "country": "United States", "postalcode": "98004", "organization": "Donuts Inc.", "email": "it@donuts.co"}, "billing": {"city": "Bellevue", "handle": "CR86259722", "name": "Chris Cowherd", "phone": "+1.4252966802", "state": "Washington", "street": "10500 Ne 8th St\nSte 350", "country_code": "US", "country": "United States", "postalcode": "98004", "organization": "Donuts Inc.", "email": "it@donuts.co"}}, "nameservers": ["ns1.dreamhost.com", "ns2.dreamhost.com", "ns3.dreamhost.com"], "expiration_date": ["2014-07-19T23:59:59"], "raw": ["Domain Name: DONUTS.CO\nDomain ID: D1142814-CO\nSponsoring Registrar: GODADDY.COM, INC.\nSponsoring Registrar IANA ID: 146\nRegistrar URL (registration services): www.godaddy.com\nDomain Status: clientDeleteProhibited\nDomain Status: clientRenewProhibited\nDomain Status: clientTransferProhibited\nDomain Status: clientUpdateProhibited\nRegistrant ID: CR86259716\nRegistrant Name: Chris Cowherd\nRegistrant Organization: Donuts Inc.\nRegistrant Address1: 10500 Ne 8th St\nRegistrant Address2: Ste 350\nRegistrant City: Bellevue\nRegistrant State/Province: Washington\nRegistrant Postal Code: 98004\nRegistrant Country: United States\nRegistrant Country Code: US\nRegistrant Phone Number: +1.4252966802\nRegistrant Email: it@donuts.co\nAdministrative Contact ID: CR86259720\nAdministrative Contact Name: Chris Cowherd\nAdministrative Contact Organization: Donuts Inc.\nAdministrative Contact Address1: 10500 Ne 8th St\nAdministrative Contact Address2: Ste 350\nAdministrative Contact City: Bellevue\nAdministrative Contact State/Province: Washington\nAdministrative Contact Postal Code: 98004\nAdministrative Contact Country: United States\nAdministrative Contact Country Code: US\nAdministrative Contact Phone Number: +1.4252966802\nAdministrative Contact Email: it@donuts.co\nBilling Contact ID: CR86259722\nBilling Contact Name: Chris Cowherd\nBilling Contact Organization: Donuts Inc.\nBilling Contact Address1: 10500 Ne 8th St\nBilling Contact Address2: Ste 350\nBilling Contact City: Bellevue\nBilling Contact State/Province: Washington\nBilling Contact Postal Code: 98004\nBilling Contact Country: United States\nBilling Contact Country Code: US\nBilling Contact Phone Number: +1.4252966802\nBilling Contact Email: it@donuts.co\nTechnical Contact ID: CR86259718\nTechnical Contact Name: Chris Cowherd\nTechnical Contact Organization: Donuts Inc.\nTechnical Contact Address1: 10500 Ne 8th St\nTechnical Contact Address2: Ste 350\nTechnical Contact City: Bellevue\nTechnical Contact State/Province: Washington\nTechnical Contact Postal Code: 98004\nTechnical Contact Country: United States\nTechnical Contact Country Code: US\nTechnical Contact Phone Number: +1.4252966802\nTechnical Contact Email: it@donuts.co\nName Server: NS1.DREAMHOST.COM\nName Server: NS2.DREAMHOST.COM\nName Server: NS3.DREAMHOST.COM\nCreated by Registrar: INTERNETX GMBH\nLast Updated by Registrar: GODADDY.COM, INC.\nLast Transferred Date: Sun Jan 30 16:35:56 GMT 2011\nDomain Registration Date: Tue Jul 20 18:01:35 GMT 2010\nDomain Expiration Date: Sat Jul 19 23:59:59 GMT 2014\nDomain Last Updated Date: Thu Aug 08 21:52:32 GMT 2013\n\n>>>> Whois database was last updated on: Wed Nov 20 04:14:46 GMT 2013 <<<<\n.CO Internet, S.A.S., the Administrator for .CO, has collected this\ninformation for the WHOIS database through Accredited Registrars. \nThis information is provided to you for informational purposes only \nand is designed to assist persons in determining contents of a domain \nname registration record in the .CO Internet registry database. .CO \nInternet makes this information available to you \"as is\" and does not \nguarantee its accuracy.\n \nBy submitting a WHOIS query, you agree that you will use this data \nonly for lawful purposes and that, under no circumstances will you \nuse this data: (1) to allow, enable, or otherwise support the transmission \nof mass unsolicited, commercial advertising or solicitations via direct \nmail, electronic mail, or by telephone; (2) in contravention of any \napplicable data and privacy protection laws; or (3) to enable high volume, \nautomated, electronic processes that apply to the registry (or its systems). \nCompilation, repackaging, dissemination, or other use of the WHOIS \ndatabase in its entirety, or of a substantial portion thereof, is not allowed \nwithout .CO Internet's prior written permission. .CO Internet reserves the \nright to modify or change these conditions at any time without prior or \nsubsequent notification of any kind. By executing this query, in any manner \nwhatsoever, you agree to abide by these terms. In some limited cases, \ndomains that might appear as available in whois might not actually be \navailable as they could be already registered and the whois not yet updated \nand/or they could be part of the Restricted list. In this cases, performing a \ncheck through your Registrar's (EPP check) will give you the actual status \nof the domain. Additionally, domains currently or previously used as \nextensions in 3rd level domains will not be available for registration in the \n2nd level. For example, org.co,mil.co,edu.co,com.co,net.co,nom.co,arts.co,\nfirm.co,info.co,int.co,web.co,rec.co,co.co. \n \nNOTE: FAILURE TO LOCATE A RECORD IN THE WHOIS DATABASE IS NOT \nINDICATIVE OF THE AVAILABILITY OF A DOMAIN NAME. \n \nAll domain names are subject to certain additional domain name registration \nrules. For details, please visit our site at www.cointernet.co .\n\n"], "registrar": ["Godaddy.com, Inc.", "Internetx Gmbh"], "creation_date": ["2010-07-20T18:01:35", "2010-07-20T18:01:35"], "id": ["D1142814-CO"]}
\ No newline at end of file
diff --git a/test/target_normalized/edis.at b/test/target_normalized/edis.at
index b1fa86b..73faa03 100644
--- a/test/target_normalized/edis.at
+++ b/test/target_normalized/edis.at
@@ -1 +1 @@
-{"updated_date": ["2011-10-24T14:51:40", "2013-08-09T15:17:35"], "status": null, "contacts": {"admin": {"city": "Graz", "fax": "+43316827500777", "handle": "KG8294627-NICAT", "name": "EDIS GmbH", "country": "Austria", "phone": "+43316827500300", "street": "Hauptplatz 3", "postalcode": "8010", "organization": "Kleewein Gerhard", "email": "domreg@edis.at", "changedate": "2013-08-09T15:17:35"}, "tech": {"city": "Graz", "fax": "+43316827500777", "handle": "KG8294627-NICAT", "name": "EDIS GmbH", "country": "Austria", "phone": "+43316827500300", "street": "Hauptplatz 3", "postalcode": "8010", "organization": "Kleewein Gerhard", "email": "domreg@edis.at", "changedate": "2013-08-09T15:17:35"}, "registrant": {"city": "Graz", "fax": "+43316827500777", "handle": "KG8294626-NICAT", "name": "EDIS GmbH", "country": "Austria", "phone": "+43316827500300", "street": "Widmannstettergasse 3", "postalcode": "8053", "organization": "Kleewein Gerhard", "email": "support@edis.at", "changedate": "2011-10-24T14:51:40"}, "billing": null}, "expiration_date": null, "id": null, "raw": ["% Copyright (c)2013 by NIC.AT (1) \n%\n% Restricted rights.\n%\n% Except for agreed Internet operational purposes, no part of this\n% information may be reproduced, stored in a retrieval system, or\n% transmitted, in any form or by any means, electronic, mechanical,\n% recording, or otherwise, without prior permission of NIC.AT on behalf\n% of itself and/or the copyright holders. Any use of this material to\n% target advertising or similar activities is explicitly forbidden and\n% can be prosecuted.\n%\n% It is furthermore strictly forbidden to use the Whois-Database in such\n% a way that jeopardizes or could jeopardize the stability of the\n% technical systems of NIC.AT under any circumstances. In particular,\n% this includes any misuse of the Whois-Database and any use of the\n% Whois-Database which disturbs its operation.\n%\n% Should the user violate these points, NIC.AT reserves the right to\n% deactivate the Whois-Database entirely or partly for the user.\n% Moreover, the user shall be held liable for any and all damage\n% arising from a violation of these points.\n\ndomain: edis.at\nregistrant: KG8294626-NICAT\nadmin-c: KG8294627-NICAT\ntech-c: KG8294627-NICAT\nnserver: ns1.edis.at\nremarks: 91.227.204.227\nnserver: ns2.edis.at\nremarks: 91.227.205.227\nnserver: ns5.edis.at\nremarks: 46.17.57.5\nnserver: ns6.edis.at\nremarks: 178.209.42.105\nchanged: 20111024 14:51:40\nsource: AT-DOM\n\npersonname: EDIS GmbH\norganization: Kleewein Gerhard\nstreet address: Widmannstettergasse 3\npostal code: 8053\ncity: Graz\ncountry: Austria\nphone: +43316827500300\nfax-no: +43316827500777\ne-mail: support@edis.at\nnic-hdl: KG8294626-NICAT\nchanged: 20111024 14:51:40\nsource: AT-DOM\n\npersonname: EDIS GmbH\norganization: Kleewein Gerhard\nstreet address: Hauptplatz 3\npostal code: 8010\ncity: Graz\ncountry: Austria\nphone: +43316827500300\nfax-no: +43316827500777\ne-mail: domreg@edis.at\nnic-hdl: KG8294627-NICAT\nchanged: 20130809 15:17:35\nsource: AT-DOM\n\n\n"], "whois_server": null, "registrar": null, "name_servers": ["ns1.edis.at", "ns2.edis.at", "ns5.edis.at", "ns6.edis.at"], "creation_date": null, "emails": []}
\ No newline at end of file
+{"updated_date": ["2011-10-24T14:51:40", "2013-08-09T15:17:35"], "nameservers": ["ns1.edis.at", "ns2.edis.at", "ns5.edis.at", "ns6.edis.at"], "raw": ["% Copyright (c)2013 by NIC.AT (1) \n%\n% Restricted rights.\n%\n% Except for agreed Internet operational purposes, no part of this\n% information may be reproduced, stored in a retrieval system, or\n% transmitted, in any form or by any means, electronic, mechanical,\n% recording, or otherwise, without prior permission of NIC.AT on behalf\n% of itself and/or the copyright holders. Any use of this material to\n% target advertising or similar activities is explicitly forbidden and\n% can be prosecuted.\n%\n% It is furthermore strictly forbidden to use the Whois-Database in such\n% a way that jeopardizes or could jeopardize the stability of the\n% technical systems of NIC.AT under any circumstances. In particular,\n% this includes any misuse of the Whois-Database and any use of the\n% Whois-Database which disturbs its operation.\n%\n% Should the user violate these points, NIC.AT reserves the right to\n% deactivate the Whois-Database entirely or partly for the user.\n% Moreover, the user shall be held liable for any and all damage\n% arising from a violation of these points.\n\ndomain: edis.at\nregistrant: KG8294626-NICAT\nadmin-c: KG8294627-NICAT\ntech-c: KG8294627-NICAT\nnserver: ns1.edis.at\nremarks: 91.227.204.227\nnserver: ns2.edis.at\nremarks: 91.227.205.227\nnserver: ns5.edis.at\nremarks: 46.17.57.5\nnserver: ns6.edis.at\nremarks: 178.209.42.105\nchanged: 20111024 14:51:40\nsource: AT-DOM\n\npersonname: EDIS GmbH\norganization: Kleewein Gerhard\nstreet address: Widmannstettergasse 3\npostal code: 8053\ncity: Graz\ncountry: Austria\nphone: +43316827500300\nfax-no: +43316827500777\ne-mail: support@edis.at\nnic-hdl: KG8294626-NICAT\nchanged: 20111024 14:51:40\nsource: AT-DOM\n\npersonname: EDIS GmbH\norganization: Kleewein Gerhard\nstreet address: Hauptplatz 3\npostal code: 8010\ncity: Graz\ncountry: Austria\nphone: +43316827500300\nfax-no: +43316827500777\ne-mail: domreg@edis.at\nnic-hdl: KG8294627-NICAT\nchanged: 20130809 15:17:35\nsource: AT-DOM\n\n\n"], "contacts": {"admin": {"city": "Graz", "fax": "+43316827500777", "handle": "KG8294627-NICAT", "name": "EDIS GmbH", "country": "Austria", "phone": "+43316827500300", "street": "Hauptplatz 3", "postalcode": "8010", "organization": "Kleewein Gerhard", "email": "domreg@edis.at", "changedate": "2013-08-09T15:17:35"}, "tech": {"city": "Graz", "fax": "+43316827500777", "handle": "KG8294627-NICAT", "name": "EDIS GmbH", "country": "Austria", "phone": "+43316827500300", "street": "Hauptplatz 3", "postalcode": "8010", "organization": "Kleewein Gerhard", "email": "domreg@edis.at", "changedate": "2013-08-09T15:17:35"}, "registrant": {"city": "Graz", "fax": "+43316827500777", "handle": "KG8294626-NICAT", "name": "EDIS GmbH", "country": "Austria", "phone": "+43316827500300", "street": "Widmannstettergasse 3", "postalcode": "8053", "organization": "Kleewein Gerhard", "email": "support@edis.at", "changedate": "2011-10-24T14:51:40"}, "billing": null}}
\ No newline at end of file
diff --git a/test/target_normalized/f63.net b/test/target_normalized/f63.net
index deae725..885503b 100644
--- a/test/target_normalized/f63.net
+++ b/test/target_normalized/f63.net
@@ -1 +1 @@
-{"status": ["Active", "NB", "NB", "NB", "NB"], "updated_date": ["2013-09-28T20:31:36"], "contacts": {"admin": {"city": "Eindhoven", "handle": "P-CAT559", "name": "Chris Talma", "country": "NL", "state": "NB", "phone": "+31.408200199", "street": "Cranendonck 2", "postalcode": "5653LA", "organization": "Orange Lemon BV", "email": "info@orangelemon.nl"}, "tech": {"city": "Eindhoven", "handle": "P-CAT559", "name": "Chris Talma", "country": "NL", "state": "NB", "phone": "+31.408200199", "street": "Cranendonck 2", "postalcode": "5653LA", "organization": "Orange Lemon BV", "email": "info@orangelemon.nl"}, "registrant": {"city": "Eindhoven", "handle": "P-CAT559", "name": "Chris Talma", "country": "NL", "state": "NB", "phone": "+31.408200199", "street": "Cranendonck 2", "postalcode": "5653LA", "organization": "Orange Lemon BV", "email": "info@orangelemon.nl"}, "billing": {"city": "Eindhoven", "handle": "P-CAT559", "name": "Chris Talma", "country": "NL", "state": "NB", "phone": "+31.408200199", "street": "Cranendonck 2", "postalcode": "5653LA", "organization": "Orange Lemon BV", "email": "info@orangelemon.nl"}}, "expiration_date": ["2014-01-14T19:23:35"], "emails": [], "raw": ["; This data is provided by Orange Lemon BV\n; for information purposes, and to assist persons obtaining information\n; about or related to domain name registration records.\n; Orange Lemon BV does not guarantee its accuracy.\n; By submitting a WHOIS query, you agree that you will use this data\n; only for lawful purposes and that, under no circumstances, you will\n; use this data to\n; 1) allow, enable, or otherwise support the transmission of mass\n; unsolicited, commercial advertising or solicitations via E-mail\n; (spam); or\n; 2) enable high volume, automated, electronic processes that apply\n; to this WHOIS server.\n; These terms may be changed without prior notice.\n; By submitting this query, you agree to abide by this policy.\n; Please register your domains at; http://www.orangelemon.nl/\n\nDomain: f63.net\nRegistry Domain ID: 1773437237_DOMAIN_NET-VRSN\nRegistrar WHOIS Server: whois.rrpproxy.net\nRegistrar URL: http://www.orangelemon.nl/\nCreated Date: 2013-01-14T19:23:35.0Z\nUpdated Date: 2013-09-28T20:31:36.0Z\nRegistrar Registration Expiration Date: 2014-01-14T19:23:35.0Z\nRegistrar: Key-Systems GmbH\nRegistrar IANA ID: 269\nRegistrar Abuse Contact Email: abuse[at]key-systems.net\nRegistrar Abuse Contact Phone: - (Please send an email)\nReseller: Orange Lemon BV\nDomain Status: ACTIVE\nRegistrant Contact: P-CAT559\nRegistrant Organization: Orange Lemon BV\nRegistrant Name: Chris Talma\nRegistrant Street: Cranendonck 2\nRegistrant City: Eindhoven\nRegistrant Postal Code: 5653LA\nRegistrant State: NB\nRegistrant Country: NL\nRegistrant Phone: +31.408200199\nRegistrant Phone Ext: \nRegistrant Fax: \nRegistrant Fax Ext: \nRegistrant Email: info@orangelemon.nl\nAdmin Contact: P-CAT559\nAdmin Organization: Orange Lemon BV\nAdmin Name: Chris Talma\nAdmin Street: Cranendonck 2\nAdmin City: Eindhoven\nAdmin State: NB\nAdmin Postal Code: 5653LA\nAdmin Country: NL\nAdmin Phone: +31.408200199\nAdmin Phone Ext: \nAdmin Fax: \nAdmin Fax Ext: \nAdmin Email: info@orangelemon.nl\nTech Contact: P-CAT559\nTech Organization: Orange Lemon BV\nTech Name: Chris Talma\nTech Street: Cranendonck 2\nTech City: Eindhoven\nTech Postal Code: 5653LA\nTech State: NB\nTech Country: NL\nTech Phone: +31.408200199\nTech Phone Ext: \nTech Fax: \nTech Fax Ext: \nTech Email: info@orangelemon.nl\nBilling Contact: P-CAT559\nBilling Organization: Orange Lemon BV\nBilling Name: Chris Talma\nBilling Street: Cranendonck 2\nBilling City: Eindhoven\nBilling Postal Code: 5653LA\nBilling State: NB\nBilling Country: NL\nBilling Phone: +31.408200199\nBilling Phone Ext: \nBilling Fax: \nBilling Fax Ext: \nBilling Email: info@orangelemon.nl\nName Server: lucy.ns.cloudflare.com \nName Server: sid.ns.cloudflare.com \nDNSSEC: unsigned\nURL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/\n>>> Last update of WHOIS database: 2013-11-20T04:15:32.0Z <<<\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: F63.NET\n Registrar: KEY-SYSTEMS GMBH\n Whois Server: whois.rrpproxy.net\n Referral URL: http://www.key-systems.net\n Name Server: LUCY.NS.CLOUDFLARE.COM\n Name Server: SID.NS.CLOUDFLARE.COM\n Status: ok\n Updated Date: 28-sep-2013\n Creation Date: 14-jan-2013\n Expiration Date: 14-jan-2014\n\n>>> Last update of whois database: Wed, 20 Nov 2013 04:14:59 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.rrpproxy.net"], "registrar": ["Key-Systems GmbH"], "name_servers": ["lucy.ns.cloudflare.com", "sid.ns.cloudflare.com"], "creation_date": ["2013-01-14T19:23:35", "2013-01-14T19:23:35"], "id": ["1773437237_DOMAIN_NET-VRSN"]}
\ No newline at end of file
+{"status": ["Active", "NB", "NB", "NB", "NB"], "updated_date": ["2013-09-28T20:31:36"], "contacts": {"admin": {"city": "Eindhoven", "handle": "P-CAT559", "name": "Chris Talma", "country": "NL", "state": "NB", "phone": "+31.408200199", "street": "Cranendonck 2", "postalcode": "5653LA", "organization": "Orange Lemon BV", "email": "info@orangelemon.nl"}, "tech": {"city": "Eindhoven", "handle": "P-CAT559", "name": "Chris Talma", "country": "NL", "state": "NB", "phone": "+31.408200199", "street": "Cranendonck 2", "postalcode": "5653LA", "organization": "Orange Lemon BV", "email": "info@orangelemon.nl"}, "registrant": {"city": "Eindhoven", "handle": "P-CAT559", "name": "Chris Talma", "country": "NL", "state": "NB", "phone": "+31.408200199", "street": "Cranendonck 2", "postalcode": "5653LA", "organization": "Orange Lemon BV", "email": "info@orangelemon.nl"}, "billing": {"city": "Eindhoven", "handle": "P-CAT559", "name": "Chris Talma", "country": "NL", "state": "NB", "phone": "+31.408200199", "street": "Cranendonck 2", "postalcode": "5653LA", "organization": "Orange Lemon BV", "email": "info@orangelemon.nl"}}, "nameservers": ["lucy.ns.cloudflare.com", "sid.ns.cloudflare.com"], "expiration_date": ["2014-01-14T19:23:35"], "raw": ["; This data is provided by Orange Lemon BV\n; for information purposes, and to assist persons obtaining information\n; about or related to domain name registration records.\n; Orange Lemon BV does not guarantee its accuracy.\n; By submitting a WHOIS query, you agree that you will use this data\n; only for lawful purposes and that, under no circumstances, you will\n; use this data to\n; 1) allow, enable, or otherwise support the transmission of mass\n; unsolicited, commercial advertising or solicitations via E-mail\n; (spam); or\n; 2) enable high volume, automated, electronic processes that apply\n; to this WHOIS server.\n; These terms may be changed without prior notice.\n; By submitting this query, you agree to abide by this policy.\n; Please register your domains at; http://www.orangelemon.nl/\n\nDomain: f63.net\nRegistry Domain ID: 1773437237_DOMAIN_NET-VRSN\nRegistrar WHOIS Server: whois.rrpproxy.net\nRegistrar URL: http://www.orangelemon.nl/\nCreated Date: 2013-01-14T19:23:35.0Z\nUpdated Date: 2013-09-28T20:31:36.0Z\nRegistrar Registration Expiration Date: 2014-01-14T19:23:35.0Z\nRegistrar: Key-Systems GmbH\nRegistrar IANA ID: 269\nRegistrar Abuse Contact Email: abuse[at]key-systems.net\nRegistrar Abuse Contact Phone: - (Please send an email)\nReseller: Orange Lemon BV\nDomain Status: ACTIVE\nRegistrant Contact: P-CAT559\nRegistrant Organization: Orange Lemon BV\nRegistrant Name: Chris Talma\nRegistrant Street: Cranendonck 2\nRegistrant City: Eindhoven\nRegistrant Postal Code: 5653LA\nRegistrant State: NB\nRegistrant Country: NL\nRegistrant Phone: +31.408200199\nRegistrant Phone Ext: \nRegistrant Fax: \nRegistrant Fax Ext: \nRegistrant Email: info@orangelemon.nl\nAdmin Contact: P-CAT559\nAdmin Organization: Orange Lemon BV\nAdmin Name: Chris Talma\nAdmin Street: Cranendonck 2\nAdmin City: Eindhoven\nAdmin State: NB\nAdmin Postal Code: 5653LA\nAdmin Country: NL\nAdmin Phone: +31.408200199\nAdmin Phone Ext: \nAdmin Fax: \nAdmin Fax Ext: \nAdmin Email: info@orangelemon.nl\nTech Contact: P-CAT559\nTech Organization: Orange Lemon BV\nTech Name: Chris Talma\nTech Street: Cranendonck 2\nTech City: Eindhoven\nTech Postal Code: 5653LA\nTech State: NB\nTech Country: NL\nTech Phone: +31.408200199\nTech Phone Ext: \nTech Fax: \nTech Fax Ext: \nTech Email: info@orangelemon.nl\nBilling Contact: P-CAT559\nBilling Organization: Orange Lemon BV\nBilling Name: Chris Talma\nBilling Street: Cranendonck 2\nBilling City: Eindhoven\nBilling Postal Code: 5653LA\nBilling State: NB\nBilling Country: NL\nBilling Phone: +31.408200199\nBilling Phone Ext: \nBilling Fax: \nBilling Fax Ext: \nBilling Email: info@orangelemon.nl\nName Server: lucy.ns.cloudflare.com \nName Server: sid.ns.cloudflare.com \nDNSSEC: unsigned\nURL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/\n>>> Last update of WHOIS database: 2013-11-20T04:15:32.0Z <<<\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: F63.NET\n Registrar: KEY-SYSTEMS GMBH\n Whois Server: whois.rrpproxy.net\n Referral URL: http://www.key-systems.net\n Name Server: LUCY.NS.CLOUDFLARE.COM\n Name Server: SID.NS.CLOUDFLARE.COM\n Status: ok\n Updated Date: 28-sep-2013\n Creation Date: 14-jan-2013\n Expiration Date: 14-jan-2014\n\n>>> Last update of whois database: Wed, 20 Nov 2013 04:14:59 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.rrpproxy.net"], "registrar": ["Key-Systems GmbH"], "creation_date": ["2013-01-14T19:23:35", "2013-01-14T19:23:35"], "id": ["1773437237_DOMAIN_NET-VRSN"]}
\ No newline at end of file
diff --git a/test/target_normalized/geko.dk b/test/target_normalized/geko.dk
index b8d5f67..49345a3 100644
--- a/test/target_normalized/geko.dk
+++ b/test/target_normalized/geko.dk
@@ -1 +1 @@
-{"status": ["Active"], "updated_date": null, "contacts": {"admin": null, "tech": null, "registrant": null, "billing": null}, "expiration_date": ["2014-03-31T00:00:00"], "emails": null, "creation_date": ["2001-02-23T00:00:00"], "raw": ["# Hello 77.162.55.23. Your session has been logged.\n#\n# Copyright (c) 2002 - 2013 by DK Hostmaster A/S\n# \n# The data in the DK Whois database is provided by DK Hostmaster A/S\n# for information purposes only, and to assist persons in obtaining\n# information about or related to a domain name registration record.\n# We do not guarantee its accuracy. We will reserve the right to remove\n# access for entities abusing the data, without notice.\n# \n# Any use of this material to target advertising or similar activities\n# are explicitly forbidden and will be prosecuted. DK Hostmaster A/S\n# requests to be notified of any such activities or suspicions thereof.\n\nDomain: geko.dk\nDNS: geko.dk\nRegistered: 2001-02-23\nExpires: 2014-03-31\nRegistration period: 1 year\nVID: no\nStatus: Active\n\nNameservers\nHostname: ns1.cb.dk\nHostname: ns2.cb.dk\n\n# Use option --show-handles to get handle information.\n# Whois HELP for more help.\n\n\n"], "whois_server": null, "registrar": null, "name_servers": ["ns1.cb.dk", "ns2.cb.dk"], "id": null}
\ No newline at end of file
+{"status": ["Active"], "contacts": {"admin": null, "tech": null, "registrant": null, "billing": null}, "nameservers": ["ns1.cb.dk", "ns2.cb.dk"], "expiration_date": ["2014-03-31T00:00:00"], "creation_date": ["2001-02-23T00:00:00"], "raw": ["# Hello 77.162.55.23. Your session has been logged.\n#\n# Copyright (c) 2002 - 2013 by DK Hostmaster A/S\n# \n# The data in the DK Whois database is provided by DK Hostmaster A/S\n# for information purposes only, and to assist persons in obtaining\n# information about or related to a domain name registration record.\n# We do not guarantee its accuracy. We will reserve the right to remove\n# access for entities abusing the data, without notice.\n# \n# Any use of this material to target advertising or similar activities\n# are explicitly forbidden and will be prosecuted. DK Hostmaster A/S\n# requests to be notified of any such activities or suspicions thereof.\n\nDomain: geko.dk\nDNS: geko.dk\nRegistered: 2001-02-23\nExpires: 2014-03-31\nRegistration period: 1 year\nVID: no\nStatus: Active\n\nNameservers\nHostname: ns1.cb.dk\nHostname: ns2.cb.dk\n\n# Use option --show-handles to get handle information.\n# Whois HELP for more help.\n\n\n"]}
\ No newline at end of file
diff --git a/test/target_normalized/google.com b/test/target_normalized/google.com
index 5f516ad..6913845 100644
--- a/test/target_normalized/google.com
+++ b/test/target_normalized/google.com
@@ -1 +1 @@
-{"status": ["clientUpdateProhibited", "clientTransferProhibited", "clientDeleteProhibited"], "updated_date": ["2013-10-29T11:50:06"], "contacts": {"admin": {"city": "Mountain View", "fax": "+1.6506188571", "name": "DNS Admin", "state": "CA", "phone": "+1.6506234000", "street": "1600 Amphitheatre Parkway", "country": "US", "postalcode": "94043", "organization": "Google Inc.", "email": "dns-admin@google.com"}, "tech": {"city": "Mountain View", "fax": "+1.6506181499", "name": "DNS Admin", "state": "CA", "phone": "+1.6503300100", "street": "2400 E. Bayshore Pkwy", "country": "US", "postalcode": "94043", "organization": "Google Inc.", "email": "dns-admin@google.com"}, "registrant": {"city": "Mountain View", "fax": "+1.6506188571", "name": "Dns Admin", "state": "CA", "phone": "+1.6502530000", "street": "Please contact contact-admin@google.com, 1600 Amphitheatre Parkway", "country": "US", "postalcode": "94043", "organization": "Google Inc.", "email": "dns-admin@google.com"}, "billing": null}, "expiration_date": ["2020-09-13T21:00:00", "2020-09-13T21:00:00"], "id": null, "creation_date": ["2002-10-02T00:00:00"], "raw": ["Domain Name: google.com\nRegistry Domain ID: \nRegistrar WHOIS Server: whois.markmonitor.com\nRegistrar URL: http://www.markmonitor.com\nUpdated Date: 2013-10-29T11:50:06-0700\nCreation Date: 2002-10-02T00:00:00-0700\nRegistrar Registration Expiration Date: 2020-09-13T21:00:00-0700\nRegistrar: MarkMonitor, Inc.\nRegistrar IANA ID: 292\nRegistrar Abuse Contact Email: compliance@markmonitor.com\nRegistrar Abuse Contact Phone: +1.2083895740\nDomain Status: clientUpdateProhibited\nDomain Status: clientTransferProhibited\nDomain Status: clientDeleteProhibited\nRegistry Registrant ID: \nRegistrant Name: Dns Admin\nRegistrant Organization: Google Inc.\nRegistrant Street: Please contact contact-admin@google.com, 1600 Amphitheatre Parkway\nRegistrant City: Mountain View\nRegistrant State/Province: CA\nRegistrant Postal Code: 94043\nRegistrant Country: US\nRegistrant Phone: +1.6502530000\nRegistrant Phone Ext: \nRegistrant Fax: +1.6506188571\nRegistrant Fax Ext: \nRegistrant Email: dns-admin@google.com\nRegistry Admin ID: \nAdmin Name: DNS Admin\nAdmin Organization: Google Inc.\nAdmin Street: 1600 Amphitheatre Parkway\nAdmin City: Mountain View\nAdmin State/Province: CA\nAdmin Postal Code: 94043\nAdmin Country: US\nAdmin Phone: +1.6506234000\nAdmin Phone Ext: \nAdmin Fax: +1.6506188571\nAdmin Fax Ext: \nAdmin Email: dns-admin@google.com\nRegistry Tech ID: \nTech Name: DNS Admin\nTech Organization: Google Inc.\nTech Street: 2400 E. Bayshore Pkwy\nTech City: Mountain View\nTech State/Province: CA\nTech Postal Code: 94043\nTech Country: US\nTech Phone: +1.6503300100\nTech Phone Ext: \nTech Fax: +1.6506181499\nTech Fax Ext: \nTech Email: dns-admin@google.com\nName Server: ns4.google.com\nName Server: ns3.google.com\nName Server: ns2.google.com\nName Server: ns1.google.com\nURL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/\n>>> Last update of WHOIS database: 2013-11-23T06:21:09-0800 <<<\n\nThe Data in MarkMonitor.com's WHOIS database is provided by MarkMonitor.com for\ninformation purposes, and to assist persons in obtaining information about or\nrelated to a domain name registration record. MarkMonitor.com does not guarantee\nits accuracy. By submitting a WHOIS query, you agree that you will use this Data\nonly for lawful purposes and that, under no circumstances will you use this Data to:\n (1) allow, enable, or otherwise support the transmission of mass unsolicited,\n commercial advertising or solicitations via e-mail (spam); or\n (2) enable high volume, automated, electronic processes that apply to\n MarkMonitor.com (or its systems).\nMarkMonitor.com reserves the right to modify these terms at any time.\nBy submitting this query, you agree to abide by this policy.\n\nMarkMonitor is the Global Leader in Online Brand Protection.\n\nMarkMonitor Domain Management(TM)\nMarkMonitor Brand Protection(TM)\nMarkMonitor AntiPiracy(TM)\nMarkMonitor AntiFraud(TM)\nProfessional and Managed Services\n\nVisit MarkMonitor at http://www.markmonitor.com\nContact us at +1.8007459229\nIn Europe, at +44.02032062220", "", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Server Name: GOOGLE.COM.ZZZZZZZZZZZZZZZZZZZZZZZZZZ.HAVENDATA.COM\n IP Address: 50.23.75.44\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.ZZZZZZZZZZZZZ.GET.ONE.MILLION.DOLLARS.AT.WWW.UNIMUNDI.COM\n IP Address: 209.126.190.70\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.ZZZZZ.GET.LAID.AT.WWW.SWINGINGCOMMUNITY.COM\n IP Address: 69.41.185.195\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: GOOGLE.COM.ZOMBIED.AND.HACKED.BY.WWW.WEB-HACK.COM\n IP Address: 217.107.217.167\n Registrar: DOMAINCONTEXT, INC.\n Whois Server: whois.domaincontext.com\n Referral URL: http://www.domaincontext.com\n\n Server Name: GOOGLE.COM.ZNAET.PRODOMEN.COM\n IP Address: 62.149.23.126\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.YUCEKIRBAC.COM\n IP Address: 88.246.115.134\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.YUCEHOCA.COM\n IP Address: 88.246.115.134\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.WORDT.DOOR.VEEL.WHTERS.GEBRUIKT.SERVERTJE.NET\n IP Address: 62.41.27.144\n Registrar: KEY-SYSTEMS GMBH\n Whois Server: whois.rrpproxy.net\n Referral URL: http://www.key-systems.net\n\n Server Name: GOOGLE.COM.VN\n Registrar: ONLINENIC, INC.\n Whois Server: whois.onlinenic.com\n Referral URL: http://www.OnlineNIC.com\n\n Server Name: GOOGLE.COM.VABDAYOFF.COM\n IP Address: 8.8.8.8\n Registrar: DOMAIN.COM, LLC\n Whois Server: whois.domain.com\n Referral URL: http://www.domain.com\n\n Server Name: GOOGLE.COM.UY\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.UA\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.TW\n Registrar: WEB COMMERCE COMMUNICATIONS LIMITED DBA WEBNIC.CC\n Whois Server: whois.webnic.cc\n Referral URL: http://www.webnic.cc\n\n Server Name: GOOGLE.COM.TR\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.SUCKS.FIND.CRACKZ.WITH.SEARCH.GULLI.COM\n IP Address: 80.190.192.24\n Registrar: CORE INTERNET COUNCIL OF REGISTRARS\n Whois Server: whois.corenic.net\n Referral URL: http://www.corenic.net\n\n Server Name: GOOGLE.COM.SPROSIUYANDEKSA.RU\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n\n Server Name: GOOGLE.COM.SPAMMING.IS.UNETHICAL.PLEASE.STOP.THEM.HUAXUEERBAN.COM\n IP Address: 211.64.175.66\n IP Address: 211.64.175.67\n Registrar: GODADDY.COM, LLC\n Whois Server: whois.godaddy.com\n Referral URL: http://registrar.godaddy.com\n\n Server Name: GOOGLE.COM.SOUTHBEACHNEEDLEARTISTRY.COM\n IP Address: 74.125.229.52\n Registrar: GODADDY.COM, LLC\n Whois Server: whois.godaddy.com\n Referral URL: http://registrar.godaddy.com\n\n Server Name: GOOGLE.COM.SHQIPERIA.COM\n IP Address: 70.84.145.107\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: GOOGLE.COM.SA\n Registrar: OMNIS NETWORK, LLC\n Whois Server: whois.omnis.com\n Referral URL: http://domains.omnis.com\n\n Server Name: GOOGLE.COM.PK\n Registrar: BIGROCK SOLUTIONS LIMITED\n Whois Server: Whois.bigrock.com\n Referral URL: http://www.bigrock.com\n\n Server Name: GOOGLE.COM.PE\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.NS2.CHALESHGAR.COM\n IP Address: 8.8.8.8\n Registrar: REALTIME REGISTER BV\n Whois Server: whois.yoursrs.com\n Referral URL: http://www.realtimeregister.com\n\n Server Name: GOOGLE.COM.NS1.CHALESHGAR.COM\n IP Address: 8.8.8.8\n Registrar: REALTIME REGISTER BV\n Whois Server: whois.yoursrs.com\n Referral URL: http://www.realtimeregister.com\n\n Server Name: GOOGLE.COM.MY\n Registrar: WILD WEST DOMAINS, LLC\n Whois Server: whois.wildwestdomains.com\n Referral URL: http://www.wildwestdomains.com\n\n Server Name: GOOGLE.COM.MX\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.LOLOLOLOLOL.SHTHEAD.COM\n IP Address: 123.123.123.123\n Registrar: CRAZY DOMAINS FZ-LLC\n Whois Server: whois.syra.com.au\n Referral URL: http://www.crazydomains.com \n\n Server Name: GOOGLE.COM.LASERPIPE.COM\n IP Address: 209.85.227.106\n Registrar: REALTIME REGISTER BV\n Whois Server: whois.yoursrs.com\n Referral URL: http://www.realtimeregister.com\n\n Server Name: GOOGLE.COM.IS.NOT.HOSTED.BY.ACTIVEDOMAINDNS.NET\n IP Address: 217.148.161.5\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: GOOGLE.COM.IS.HOSTED.ON.PROFITHOSTING.NET\n IP Address: 66.49.213.213\n Registrar: NAME.COM, INC.\n Whois Server: whois.name.com\n Referral URL: http://www.name.com\n\n Server Name: GOOGLE.COM.IS.APPROVED.BY.NUMEA.COM\n IP Address: 213.228.0.43\n Registrar: GANDI SAS\n Whois Server: whois.gandi.net\n Referral URL: http://www.gandi.net\n\n Server Name: GOOGLE.COM.HK\n Registrar: CLOUD GROUP LIMITED\n Whois Server: whois.hostingservicesinc.net\n Referral URL: http://www.resell.biz\n\n Server Name: GOOGLE.COM.HICHINA.COM\n IP Address: 218.103.1.1\n Registrar: HICHINA ZHICHENG TECHNOLOGY LTD.\n Whois Server: grs-whois.hichina.com\n Referral URL: http://www.net.cn\n\n Server Name: GOOGLE.COM.HAS.LESS.FREE.PORN.IN.ITS.SEARCH.ENGINE.THAN.SECZY.COM\n IP Address: 209.187.114.130\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: GOOGLE.COM.DO\n Registrar: GODADDY.COM, LLC\n Whois Server: whois.godaddy.com\n Referral URL: http://registrar.godaddy.com\n\n Server Name: GOOGLE.COM.CO\n Registrar: NAMESECURE.COM\n Whois Server: whois.namesecure.com\n Referral URL: http://www.namesecure.com\n\n Server Name: GOOGLE.COM.CN\n Registrar: XIN NET TECHNOLOGY CORPORATION\n Whois Server: whois.paycenter.com.cn\n Referral URL: http://www.xinnet.com\n\n Server Name: GOOGLE.COM.BR\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: GOOGLE.COM.BEYONDWHOIS.COM\n IP Address: 203.36.226.2\n Registrar: INSTRA CORPORATION PTY, LTD.\n Whois Server: whois.instra.net\n Referral URL: http://www.instra.com\n\n Server Name: GOOGLE.COM.AU\n Registrar: PLANETDOMAIN PTY LTD.\n Whois Server: whois.planetdomain.com\n Referral URL: http://www.planetdomain.com\n\n Server Name: GOOGLE.COM.ARTVISUALRIO.COM\n IP Address: 200.222.44.35\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: GOOGLE.COM.AR\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: GOOGLE.COM.AFRICANBATS.ORG\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Domain Name: GOOGLE.COM\n Registrar: MARKMONITOR INC.\n Whois Server: whois.markmonitor.com\n Referral URL: http://www.markmonitor.com\n Name Server: NS1.GOOGLE.COM\n Name Server: NS2.GOOGLE.COM\n Name Server: NS3.GOOGLE.COM\n Name Server: NS4.GOOGLE.COM\n Status: clientDeleteProhibited\n Status: clientTransferProhibited\n Status: clientUpdateProhibited\n Status: serverDeleteProhibited\n Status: serverTransferProhibited\n Status: serverUpdateProhibited\n Updated Date: 20-jul-2011\n Creation Date: 15-sep-1997\n Expiration Date: 14-sep-2020\n\n>>> Last update of whois database: Sat, 23 Nov 2013 14:23:45 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.markmonitor.com"], "registrar": ["MarkMonitor, Inc."], "name_servers": ["ns4.google.com", "ns3.google.com", "ns2.google.com", "ns1.google.com"], "emails": ["compliance@markmonitor.com", "contact-admin@google.com"]}
\ No newline at end of file
+{"status": ["clientUpdateProhibited", "clientTransferProhibited", "clientDeleteProhibited"], "updated_date": ["2013-10-29T11:50:06"], "contacts": {"admin": {"city": "Mountain View", "fax": "+1.6506188571", "name": "DNS Admin", "state": "CA", "phone": "+1.6506234000", "street": "1600 Amphitheatre Parkway", "country": "US", "postalcode": "94043", "organization": "Google Inc.", "email": "dns-admin@google.com"}, "tech": {"city": "Mountain View", "fax": "+1.6506181499", "name": "DNS Admin", "state": "CA", "phone": "+1.6503300100", "street": "2400 E. Bayshore Pkwy", "country": "US", "postalcode": "94043", "organization": "Google Inc.", "email": "dns-admin@google.com"}, "registrant": {"city": "Mountain View", "fax": "+1.6506188571", "name": "Dns Admin", "state": "CA", "phone": "+1.6502530000", "street": "Please contact contact-admin@google.com, 1600 Amphitheatre Parkway", "country": "US", "postalcode": "94043", "organization": "Google Inc.", "email": "dns-admin@google.com"}, "billing": null}, "nameservers": ["ns4.google.com", "ns3.google.com", "ns2.google.com", "ns1.google.com"], "expiration_date": ["2020-09-13T21:00:00", "2020-09-13T21:00:00"], "creation_date": ["2002-10-02T00:00:00"], "raw": ["Domain Name: google.com\nRegistry Domain ID: \nRegistrar WHOIS Server: whois.markmonitor.com\nRegistrar URL: http://www.markmonitor.com\nUpdated Date: 2013-10-29T11:50:06-0700\nCreation Date: 2002-10-02T00:00:00-0700\nRegistrar Registration Expiration Date: 2020-09-13T21:00:00-0700\nRegistrar: MarkMonitor, Inc.\nRegistrar IANA ID: 292\nRegistrar Abuse Contact Email: compliance@markmonitor.com\nRegistrar Abuse Contact Phone: +1.2083895740\nDomain Status: clientUpdateProhibited\nDomain Status: clientTransferProhibited\nDomain Status: clientDeleteProhibited\nRegistry Registrant ID: \nRegistrant Name: Dns Admin\nRegistrant Organization: Google Inc.\nRegistrant Street: Please contact contact-admin@google.com, 1600 Amphitheatre Parkway\nRegistrant City: Mountain View\nRegistrant State/Province: CA\nRegistrant Postal Code: 94043\nRegistrant Country: US\nRegistrant Phone: +1.6502530000\nRegistrant Phone Ext: \nRegistrant Fax: +1.6506188571\nRegistrant Fax Ext: \nRegistrant Email: dns-admin@google.com\nRegistry Admin ID: \nAdmin Name: DNS Admin\nAdmin Organization: Google Inc.\nAdmin Street: 1600 Amphitheatre Parkway\nAdmin City: Mountain View\nAdmin State/Province: CA\nAdmin Postal Code: 94043\nAdmin Country: US\nAdmin Phone: +1.6506234000\nAdmin Phone Ext: \nAdmin Fax: +1.6506188571\nAdmin Fax Ext: \nAdmin Email: dns-admin@google.com\nRegistry Tech ID: \nTech Name: DNS Admin\nTech Organization: Google Inc.\nTech Street: 2400 E. Bayshore Pkwy\nTech City: Mountain View\nTech State/Province: CA\nTech Postal Code: 94043\nTech Country: US\nTech Phone: +1.6503300100\nTech Phone Ext: \nTech Fax: +1.6506181499\nTech Fax Ext: \nTech Email: dns-admin@google.com\nName Server: ns4.google.com\nName Server: ns3.google.com\nName Server: ns2.google.com\nName Server: ns1.google.com\nURL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/\n>>> Last update of WHOIS database: 2013-11-23T06:21:09-0800 <<<\n\nThe Data in MarkMonitor.com's WHOIS database is provided by MarkMonitor.com for\ninformation purposes, and to assist persons in obtaining information about or\nrelated to a domain name registration record. MarkMonitor.com does not guarantee\nits accuracy. By submitting a WHOIS query, you agree that you will use this Data\nonly for lawful purposes and that, under no circumstances will you use this Data to:\n (1) allow, enable, or otherwise support the transmission of mass unsolicited,\n commercial advertising or solicitations via e-mail (spam); or\n (2) enable high volume, automated, electronic processes that apply to\n MarkMonitor.com (or its systems).\nMarkMonitor.com reserves the right to modify these terms at any time.\nBy submitting this query, you agree to abide by this policy.\n\nMarkMonitor is the Global Leader in Online Brand Protection.\n\nMarkMonitor Domain Management(TM)\nMarkMonitor Brand Protection(TM)\nMarkMonitor AntiPiracy(TM)\nMarkMonitor AntiFraud(TM)\nProfessional and Managed Services\n\nVisit MarkMonitor at http://www.markmonitor.com\nContact us at +1.8007459229\nIn Europe, at +44.02032062220", "", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Server Name: GOOGLE.COM.ZZZZZZZZZZZZZZZZZZZZZZZZZZ.HAVENDATA.COM\n IP Address: 50.23.75.44\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.ZZZZZZZZZZZZZ.GET.ONE.MILLION.DOLLARS.AT.WWW.UNIMUNDI.COM\n IP Address: 209.126.190.70\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.ZZZZZ.GET.LAID.AT.WWW.SWINGINGCOMMUNITY.COM\n IP Address: 69.41.185.195\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: GOOGLE.COM.ZOMBIED.AND.HACKED.BY.WWW.WEB-HACK.COM\n IP Address: 217.107.217.167\n Registrar: DOMAINCONTEXT, INC.\n Whois Server: whois.domaincontext.com\n Referral URL: http://www.domaincontext.com\n\n Server Name: GOOGLE.COM.ZNAET.PRODOMEN.COM\n IP Address: 62.149.23.126\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.YUCEKIRBAC.COM\n IP Address: 88.246.115.134\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.YUCEHOCA.COM\n IP Address: 88.246.115.134\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.WORDT.DOOR.VEEL.WHTERS.GEBRUIKT.SERVERTJE.NET\n IP Address: 62.41.27.144\n Registrar: KEY-SYSTEMS GMBH\n Whois Server: whois.rrpproxy.net\n Referral URL: http://www.key-systems.net\n\n Server Name: GOOGLE.COM.VN\n Registrar: ONLINENIC, INC.\n Whois Server: whois.onlinenic.com\n Referral URL: http://www.OnlineNIC.com\n\n Server Name: GOOGLE.COM.VABDAYOFF.COM\n IP Address: 8.8.8.8\n Registrar: DOMAIN.COM, LLC\n Whois Server: whois.domain.com\n Referral URL: http://www.domain.com\n\n Server Name: GOOGLE.COM.UY\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.UA\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.TW\n Registrar: WEB COMMERCE COMMUNICATIONS LIMITED DBA WEBNIC.CC\n Whois Server: whois.webnic.cc\n Referral URL: http://www.webnic.cc\n\n Server Name: GOOGLE.COM.TR\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.SUCKS.FIND.CRACKZ.WITH.SEARCH.GULLI.COM\n IP Address: 80.190.192.24\n Registrar: CORE INTERNET COUNCIL OF REGISTRARS\n Whois Server: whois.corenic.net\n Referral URL: http://www.corenic.net\n\n Server Name: GOOGLE.COM.SPROSIUYANDEKSA.RU\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n\n Server Name: GOOGLE.COM.SPAMMING.IS.UNETHICAL.PLEASE.STOP.THEM.HUAXUEERBAN.COM\n IP Address: 211.64.175.66\n IP Address: 211.64.175.67\n Registrar: GODADDY.COM, LLC\n Whois Server: whois.godaddy.com\n Referral URL: http://registrar.godaddy.com\n\n Server Name: GOOGLE.COM.SOUTHBEACHNEEDLEARTISTRY.COM\n IP Address: 74.125.229.52\n Registrar: GODADDY.COM, LLC\n Whois Server: whois.godaddy.com\n Referral URL: http://registrar.godaddy.com\n\n Server Name: GOOGLE.COM.SHQIPERIA.COM\n IP Address: 70.84.145.107\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: GOOGLE.COM.SA\n Registrar: OMNIS NETWORK, LLC\n Whois Server: whois.omnis.com\n Referral URL: http://domains.omnis.com\n\n Server Name: GOOGLE.COM.PK\n Registrar: BIGROCK SOLUTIONS LIMITED\n Whois Server: Whois.bigrock.com\n Referral URL: http://www.bigrock.com\n\n Server Name: GOOGLE.COM.PE\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.NS2.CHALESHGAR.COM\n IP Address: 8.8.8.8\n Registrar: REALTIME REGISTER BV\n Whois Server: whois.yoursrs.com\n Referral URL: http://www.realtimeregister.com\n\n Server Name: GOOGLE.COM.NS1.CHALESHGAR.COM\n IP Address: 8.8.8.8\n Registrar: REALTIME REGISTER BV\n Whois Server: whois.yoursrs.com\n Referral URL: http://www.realtimeregister.com\n\n Server Name: GOOGLE.COM.MY\n Registrar: WILD WEST DOMAINS, LLC\n Whois Server: whois.wildwestdomains.com\n Referral URL: http://www.wildwestdomains.com\n\n Server Name: GOOGLE.COM.MX\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: GOOGLE.COM.LOLOLOLOLOL.SHTHEAD.COM\n IP Address: 123.123.123.123\n Registrar: CRAZY DOMAINS FZ-LLC\n Whois Server: whois.syra.com.au\n Referral URL: http://www.crazydomains.com \n\n Server Name: GOOGLE.COM.LASERPIPE.COM\n IP Address: 209.85.227.106\n Registrar: REALTIME REGISTER BV\n Whois Server: whois.yoursrs.com\n Referral URL: http://www.realtimeregister.com\n\n Server Name: GOOGLE.COM.IS.NOT.HOSTED.BY.ACTIVEDOMAINDNS.NET\n IP Address: 217.148.161.5\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: GOOGLE.COM.IS.HOSTED.ON.PROFITHOSTING.NET\n IP Address: 66.49.213.213\n Registrar: NAME.COM, INC.\n Whois Server: whois.name.com\n Referral URL: http://www.name.com\n\n Server Name: GOOGLE.COM.IS.APPROVED.BY.NUMEA.COM\n IP Address: 213.228.0.43\n Registrar: GANDI SAS\n Whois Server: whois.gandi.net\n Referral URL: http://www.gandi.net\n\n Server Name: GOOGLE.COM.HK\n Registrar: CLOUD GROUP LIMITED\n Whois Server: whois.hostingservicesinc.net\n Referral URL: http://www.resell.biz\n\n Server Name: GOOGLE.COM.HICHINA.COM\n IP Address: 218.103.1.1\n Registrar: HICHINA ZHICHENG TECHNOLOGY LTD.\n Whois Server: grs-whois.hichina.com\n Referral URL: http://www.net.cn\n\n Server Name: GOOGLE.COM.HAS.LESS.FREE.PORN.IN.ITS.SEARCH.ENGINE.THAN.SECZY.COM\n IP Address: 209.187.114.130\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: GOOGLE.COM.DO\n Registrar: GODADDY.COM, LLC\n Whois Server: whois.godaddy.com\n Referral URL: http://registrar.godaddy.com\n\n Server Name: GOOGLE.COM.CO\n Registrar: NAMESECURE.COM\n Whois Server: whois.namesecure.com\n Referral URL: http://www.namesecure.com\n\n Server Name: GOOGLE.COM.CN\n Registrar: XIN NET TECHNOLOGY CORPORATION\n Whois Server: whois.paycenter.com.cn\n Referral URL: http://www.xinnet.com\n\n Server Name: GOOGLE.COM.BR\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: GOOGLE.COM.BEYONDWHOIS.COM\n IP Address: 203.36.226.2\n Registrar: INSTRA CORPORATION PTY, LTD.\n Whois Server: whois.instra.net\n Referral URL: http://www.instra.com\n\n Server Name: GOOGLE.COM.AU\n Registrar: PLANETDOMAIN PTY LTD.\n Whois Server: whois.planetdomain.com\n Referral URL: http://www.planetdomain.com\n\n Server Name: GOOGLE.COM.ARTVISUALRIO.COM\n IP Address: 200.222.44.35\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: GOOGLE.COM.AR\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: GOOGLE.COM.AFRICANBATS.ORG\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Domain Name: GOOGLE.COM\n Registrar: MARKMONITOR INC.\n Whois Server: whois.markmonitor.com\n Referral URL: http://www.markmonitor.com\n Name Server: NS1.GOOGLE.COM\n Name Server: NS2.GOOGLE.COM\n Name Server: NS3.GOOGLE.COM\n Name Server: NS4.GOOGLE.COM\n Status: clientDeleteProhibited\n Status: clientTransferProhibited\n Status: clientUpdateProhibited\n Status: serverDeleteProhibited\n Status: serverTransferProhibited\n Status: serverUpdateProhibited\n Updated Date: 20-jul-2011\n Creation Date: 15-sep-1997\n Expiration Date: 14-sep-2020\n\n>>> Last update of whois database: Sat, 23 Nov 2013 14:23:45 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.markmonitor.com"], "registrar": ["MarkMonitor, Inc."], "emails": ["compliance@markmonitor.com", "contact-admin@google.com"]}
\ No newline at end of file
diff --git a/test/target_normalized/huskeh.net b/test/target_normalized/huskeh.net
index 149b0e4..e705686 100644
--- a/test/target_normalized/huskeh.net
+++ b/test/target_normalized/huskeh.net
@@ -1 +1 @@
-{"updated_date": ["2013-09-18T00:00:00"], "status": ["clientDeleteProhibited", "clientTransferProhibited"], "contacts": {"admin": {"city": "Roubaix Cedex 1", "name": "Poulton Sam", "phone": "+33.899498765", "street": "huskeh.net, Office #5075960\nc/o OwO, BP80157", "country": "FR", "postalcode": "59053", "email": "mtv1ufny8x589jxnfcsx@c.o-w-o.info"}, "tech": {"city": "Roubaix Cedex 1", "name": "Poulton Sam", "phone": "+33.899498765", "street": "huskeh.net, Office #5075960\nc/o OwO, BP80157", "country": "FR", "postalcode": "59053", "email": "mtv1ufny8x589jxnfcsx@c.o-w-o.info"}, "registrant": {"city": "Roubaix Cedex 1", "name": "Poulton Sam", "phone": "+33.899498765", "street": "huskeh.net, Office #5075960\nc/o OwO, BP80157", "country": "FR", "postalcode": "59053", "email": "0vdudcszg7joly3irb2u@e.o-w-o.info"}, "billing": {"city": "Roubaix Cedex 1", "name": "Poulton Sam", "phone": "+33.899498765", "street": "huskeh.net, Office #5075960\nc/o OwO, BP80157", "country": "FR", "postalcode": "59053", "email": "mtv1ufny8x589jxnfcsx@c.o-w-o.info"}}, "expiration_date": ["2014-09-29T00:00:00", "2014-09-29T00:00:00"], "id": null, "creation_date": ["2009-09-29T00:00:00", "2009-09-29T00:00:00"], "raw": ["###############################################################################\n#\n# Welcome to the OVH WHOIS Server.\n# \n# whois server : whois.ovh.com check server : check.ovh.com\n# \n# The data in this Whois is at your disposal with the aim of supplying you the\n# information only, that is helping you in the obtaining of the information\n# about or related to a domain name registration record. OVH Sas make this\n# information available \"as is\", and do not guarantee its accuracy. By using\n# Whois, you agree that you will use these data only for legal purposes and\n# that, under no circumstances will you use this data to: (1) Allow, enable,\n# or otherwise support the transmission of mass unsolicited, commercial\n# advertisement or roughly or requests via the individual mail (courier),\n# the E-mail (SPAM), by telephone or by fax. (2) Enable high volume, automated,\n# electronic processes that apply to OVH Sas (or its computer systems).\n# The copy, the compilation, the re-packaging, the dissemination or the\n# other use of the Whois base is expressly forbidden without the prior\n# written consent of OVH. Domain ownership disputes should be settled using\n# ICANN's Uniform Dispute Resolution Policy: http://www.icann.org/udrp/udrp.htm\n# We reserve the right to modify these terms at any time. By submitting\n# this query, you agree to abide by these terms. OVH Sas reserves the right\n# to terminate your access to the OVH Sas Whois database in its sole\n# discretion, including without limitation, for excessive querying of\n# the Whois database or for failure to otherwise abide by this policy.\n#\n# L'outil du Whois est \u00e0 votre disposition dans le but de vous fournir\n# l'information seulement, c'est-\u00e0-dire vous aider dans l'obtention de\n# l'information sur ou li\u00e9 \u00e0 un rapport d'enregistrement de nom de domaine.\n# OVH Sas rend cette information disponible \"comme est,\" et ne garanti pas\n# son exactitude. En utilisant notre outil Whois, vous reconnaissez que vous\n# emploierez ces donn\u00e9es seulement pour des buts l\u00e9gaux et ne pas utiliser cet\n# outil dans les buts suivant: (1) la transmission de publicit\u00e9 non sollicit\u00e9e,\n# commerciale massive ou en gros ou des sollicitations via courrier individuel,\n# le courrier \u00e9lectronique (c'est-\u00e0-dire SPAM), par t\u00e9l\u00e9phone ou par fax. (2)\n# l'utilisation d'un grand volume, automatis\u00e9 des processus \u00e9lectroniques qui\n# soulignent ou chargent ce syst\u00e8me de base de donn\u00e9es Whois vous fournissant\n# cette information. La copie de tout ou partie, la compilation, le\n# re-emballage, la diss\u00e9mination ou d'autre utilisation de la base Whois sont\n# express\u00e9ment interdits sans consentement \u00e9crit ant\u00e9rieur de OVH. Un d\u00e9saccord\n# sur la possession d'un nom de domaine peut \u00eatre r\u00e9solu en suivant la Uniform\n# Dispute Resolution Policy de l'ICANN: http://www.icann.org/udrp/udrp.htm\n# Nous nous r\u00e9servons le droit de modifier ces termes \u00e0 tout moment. En\n# soumettant une requ\u00eate au Whois vous consentez \u00e0 vous soumettre \u00e0 ces termes.\n\n# local time : Wednesday, 20-Nov-2013 09:27:14 CET\n# gmt time : Wednesday, 20-Nov-2013 08:27:14 GMT\n# last modify : Saturday, 12-Oct-2013 12:38:49 CEST\n# request from : 192.168.244.150:25929\n\nDomain name: huskeh.net\n\nRegistrant:\n Poulton Sam\n huskeh.net, office #5075960\n c/o OwO, BP80157\n 59053, Roubaix Cedex 1\n FR\n +33.899498765\n 0vdudcszg7joly3irb2u@e.o-w-o.info\n\nAdministrative Contact:\n Poulton Sam\n huskeh.net, office #5075960\n c/o OwO, BP80157\n 59053, Roubaix Cedex 1\n FR\n +33.899498765\n mtv1ufny8x589jxnfcsx@c.o-w-o.info\n\nTechnical Contact:\n Poulton Sam\n huskeh.net, office #5075960\n c/o OwO, BP80157\n 59053, Roubaix Cedex 1\n FR\n +33.899498765\n mtv1ufny8x589jxnfcsx@c.o-w-o.info\n\nBilling Contact:\n Poulton Sam\n huskeh.net, office #5075960\n c/o OwO, BP80157\n 59053, Roubaix Cedex 1\n FR\n +33.899498765\n mtv1ufny8x589jxnfcsx@c.o-w-o.info\n\nRegistrar of Record: OVH.\nRecord last updated on 2013-09-18.\nRecord expires on 2014-09-29.\nRecord created on 2009-09-29.\n\n###############################################################################\n# powered by GNU/Linux\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: HUSKEH.NET\n Registrar: OVH\n Whois Server: whois.ovh.com\n Referral URL: http://www.ovh.com\n Name Server: NS1.SLPHOSTS.CO.UK\n Name Server: NS2.SLPHOSTS.CO.UK\n Status: clientDeleteProhibited\n Status: clientTransferProhibited\n Updated Date: 18-sep-2013\n Creation Date: 29-sep-2009\n Expiration Date: 29-sep-2014\n\n>>> Last update of whois database: Wed, 20 Nov 2013 08:26:33 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.ovh.com"], "registrar": ["Ovh."], "name_servers": ["ns1.slphosts.co.uk", "ns2.slphosts.co.uk"], "emails": []}
\ No newline at end of file
+{"updated_date": ["2013-09-18T00:00:00"], "status": ["clientDeleteProhibited", "clientTransferProhibited"], "contacts": {"admin": {"city": "Roubaix Cedex 1", "name": "Poulton Sam", "phone": "+33.899498765", "street": "huskeh.net, Office #5075960\nc/o OwO, BP80157", "country": "FR", "postalcode": "59053", "email": "mtv1ufny8x589jxnfcsx@c.o-w-o.info"}, "tech": {"city": "Roubaix Cedex 1", "name": "Poulton Sam", "phone": "+33.899498765", "street": "huskeh.net, Office #5075960\nc/o OwO, BP80157", "country": "FR", "postalcode": "59053", "email": "mtv1ufny8x589jxnfcsx@c.o-w-o.info"}, "registrant": {"city": "Roubaix Cedex 1", "name": "Poulton Sam", "phone": "+33.899498765", "street": "huskeh.net, Office #5075960\nc/o OwO, BP80157", "country": "FR", "postalcode": "59053", "email": "0vdudcszg7joly3irb2u@e.o-w-o.info"}, "billing": {"city": "Roubaix Cedex 1", "name": "Poulton Sam", "phone": "+33.899498765", "street": "huskeh.net, Office #5075960\nc/o OwO, BP80157", "country": "FR", "postalcode": "59053", "email": "mtv1ufny8x589jxnfcsx@c.o-w-o.info"}}, "nameservers": ["ns1.slphosts.co.uk", "ns2.slphosts.co.uk"], "expiration_date": ["2014-09-29T00:00:00", "2014-09-29T00:00:00"], "creation_date": ["2009-09-29T00:00:00", "2009-09-29T00:00:00"], "raw": ["###############################################################################\n#\n# Welcome to the OVH WHOIS Server.\n# \n# whois server : whois.ovh.com check server : check.ovh.com\n# \n# The data in this Whois is at your disposal with the aim of supplying you the\n# information only, that is helping you in the obtaining of the information\n# about or related to a domain name registration record. OVH Sas make this\n# information available \"as is\", and do not guarantee its accuracy. By using\n# Whois, you agree that you will use these data only for legal purposes and\n# that, under no circumstances will you use this data to: (1) Allow, enable,\n# or otherwise support the transmission of mass unsolicited, commercial\n# advertisement or roughly or requests via the individual mail (courier),\n# the E-mail (SPAM), by telephone or by fax. (2) Enable high volume, automated,\n# electronic processes that apply to OVH Sas (or its computer systems).\n# The copy, the compilation, the re-packaging, the dissemination or the\n# other use of the Whois base is expressly forbidden without the prior\n# written consent of OVH. Domain ownership disputes should be settled using\n# ICANN's Uniform Dispute Resolution Policy: http://www.icann.org/udrp/udrp.htm\n# We reserve the right to modify these terms at any time. By submitting\n# this query, you agree to abide by these terms. OVH Sas reserves the right\n# to terminate your access to the OVH Sas Whois database in its sole\n# discretion, including without limitation, for excessive querying of\n# the Whois database or for failure to otherwise abide by this policy.\n#\n# L'outil du Whois est \u00e0 votre disposition dans le but de vous fournir\n# l'information seulement, c'est-\u00e0-dire vous aider dans l'obtention de\n# l'information sur ou li\u00e9 \u00e0 un rapport d'enregistrement de nom de domaine.\n# OVH Sas rend cette information disponible \"comme est,\" et ne garanti pas\n# son exactitude. En utilisant notre outil Whois, vous reconnaissez que vous\n# emploierez ces donn\u00e9es seulement pour des buts l\u00e9gaux et ne pas utiliser cet\n# outil dans les buts suivant: (1) la transmission de publicit\u00e9 non sollicit\u00e9e,\n# commerciale massive ou en gros ou des sollicitations via courrier individuel,\n# le courrier \u00e9lectronique (c'est-\u00e0-dire SPAM), par t\u00e9l\u00e9phone ou par fax. (2)\n# l'utilisation d'un grand volume, automatis\u00e9 des processus \u00e9lectroniques qui\n# soulignent ou chargent ce syst\u00e8me de base de donn\u00e9es Whois vous fournissant\n# cette information. La copie de tout ou partie, la compilation, le\n# re-emballage, la diss\u00e9mination ou d'autre utilisation de la base Whois sont\n# express\u00e9ment interdits sans consentement \u00e9crit ant\u00e9rieur de OVH. Un d\u00e9saccord\n# sur la possession d'un nom de domaine peut \u00eatre r\u00e9solu en suivant la Uniform\n# Dispute Resolution Policy de l'ICANN: http://www.icann.org/udrp/udrp.htm\n# Nous nous r\u00e9servons le droit de modifier ces termes \u00e0 tout moment. En\n# soumettant une requ\u00eate au Whois vous consentez \u00e0 vous soumettre \u00e0 ces termes.\n\n# local time : Wednesday, 20-Nov-2013 09:27:14 CET\n# gmt time : Wednesday, 20-Nov-2013 08:27:14 GMT\n# last modify : Saturday, 12-Oct-2013 12:38:49 CEST\n# request from : 192.168.244.150:25929\n\nDomain name: huskeh.net\n\nRegistrant:\n Poulton Sam\n huskeh.net, office #5075960\n c/o OwO, BP80157\n 59053, Roubaix Cedex 1\n FR\n +33.899498765\n 0vdudcszg7joly3irb2u@e.o-w-o.info\n\nAdministrative Contact:\n Poulton Sam\n huskeh.net, office #5075960\n c/o OwO, BP80157\n 59053, Roubaix Cedex 1\n FR\n +33.899498765\n mtv1ufny8x589jxnfcsx@c.o-w-o.info\n\nTechnical Contact:\n Poulton Sam\n huskeh.net, office #5075960\n c/o OwO, BP80157\n 59053, Roubaix Cedex 1\n FR\n +33.899498765\n mtv1ufny8x589jxnfcsx@c.o-w-o.info\n\nBilling Contact:\n Poulton Sam\n huskeh.net, office #5075960\n c/o OwO, BP80157\n 59053, Roubaix Cedex 1\n FR\n +33.899498765\n mtv1ufny8x589jxnfcsx@c.o-w-o.info\n\nRegistrar of Record: OVH.\nRecord last updated on 2013-09-18.\nRecord expires on 2014-09-29.\nRecord created on 2009-09-29.\n\n###############################################################################\n# powered by GNU/Linux\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: HUSKEH.NET\n Registrar: OVH\n Whois Server: whois.ovh.com\n Referral URL: http://www.ovh.com\n Name Server: NS1.SLPHOSTS.CO.UK\n Name Server: NS2.SLPHOSTS.CO.UK\n Status: clientDeleteProhibited\n Status: clientTransferProhibited\n Updated Date: 18-sep-2013\n Creation Date: 29-sep-2009\n Expiration Date: 29-sep-2014\n\n>>> Last update of whois database: Wed, 20 Nov 2013 08:26:33 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.ovh.com"], "registrar": ["Ovh."]}
\ No newline at end of file
diff --git a/test/target_normalized/keybase.io b/test/target_normalized/keybase.io
index 4dfa1a9..ddd060a 100644
--- a/test/target_normalized/keybase.io
+++ b/test/target_normalized/keybase.io
@@ -1 +1 @@
-{"status": ["Live"], "updated_date": null, "contacts": {"admin": null, "tech": null, "registrant": {"city": "New York", "name": "Krohn, Maxwell", "country": "United States", "state": "NY", "street": "902 Broadway, 4th Floor", "organization": "CrashMix.org"}, "billing": null}, "expiration_date": ["2014-09-06T00:00:00"], "emails": null, "raw": ["\nDomain : keybase.io\nStatus : Live\nExpiry : 2014-09-06\n\nNS 1 : ns-1016.awsdns-63.net\nNS 2 : ns-1722.awsdns-23.co.uk\nNS 3 : ns-1095.awsdns-08.org\nNS 4 : ns-337.awsdns-42.com\n\nOwner : Krohn, Maxwell\n : CrashMix.org\n : 902 Broadway, 4th Floor\n : New York\n : NY\n : United States\n\n\n"], "whois_server": null, "registrar": null, "name_servers": ["ns-1016.awsdns-63.net", "ns-1722.awsdns-23.co.uk", "ns-1095.awsdns-08.org", "ns-337.awsdns-42.com"], "creation_date": null, "id": null}
\ No newline at end of file
+{"status": ["Live"], "nameservers": ["ns-1016.awsdns-63.net", "ns-1722.awsdns-23.co.uk", "ns-1095.awsdns-08.org", "ns-337.awsdns-42.com"], "raw": ["\nDomain : keybase.io\nStatus : Live\nExpiry : 2014-09-06\n\nNS 1 : ns-1016.awsdns-63.net\nNS 2 : ns-1722.awsdns-23.co.uk\nNS 3 : ns-1095.awsdns-08.org\nNS 4 : ns-337.awsdns-42.com\n\nOwner : Krohn, Maxwell\n : CrashMix.org\n : 902 Broadway, 4th Floor\n : New York\n : NY\n : United States\n\n\n"], "contacts": {"admin": null, "tech": null, "registrant": {"city": "New York", "name": "Krohn, Maxwell", "country": "United States", "state": "NY", "street": "902 Broadway, 4th Floor", "organization": "CrashMix.org"}, "billing": null}, "expiration_date": ["2014-09-06T00:00:00"]}
\ No newline at end of file
diff --git a/test/target_normalized/linux.conf.au b/test/target_normalized/linux.conf.au
index a151047..9cf6fdc 100644
--- a/test/target_normalized/linux.conf.au
+++ b/test/target_normalized/linux.conf.au
@@ -1 +1 @@
-{"status": ["serverUpdateProhibited (Regulator Domain)", "serverTransferProhibited (Regulator Domain)", "serverDeleteProhibited (Regulator Domain)", "serverRenewProhibited (Regulator Domain)"], "updated_date": ["2011-04-29T09:22:00"], "contacts": {"admin": null, "tech": {"handle": "C28042011", "name": "Stephen Walsh"}, "registrant": {"organization": ".au Domain Administration Ltd", "handle": "C28042011", "name": "Stephen Walsh"}, "billing": null}, "expiration_date": null, "emails": null, "raw": ["Domain Name: linux.conf.au\nLast Modified: 29-Apr-2011 09:22:00 UTC\nRegistrar ID: auDA\nRegistrar Name: auDA\nStatus: serverUpdateProhibited (Regulator Domain)\nStatus: serverTransferProhibited (Regulator Domain)\nStatus: serverDeleteProhibited (Regulator Domain)\nStatus: serverRenewProhibited (Regulator Domain)\n\nRegistrant: .au Domain Administration Ltd\nRegistrant ID: OTHER 079 009 340\nEligibility Type: Other\n\nRegistrant Contact ID: C28042011\nRegistrant Contact Name: Stephen Walsh\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: C28042011\nTech Contact Name: Stephen Walsh\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: russell.linux.org.au\nName Server IP: 202.158.218.245\nName Server: daedalus.andrew.net.au\n\n"], "whois_server": null, "registrar": ["auDA"], "name_servers": ["russell.linux.org.au", "daedalus.andrew.net.au"], "creation_date": null, "id": null}
\ No newline at end of file
+{"status": ["serverUpdateProhibited (Regulator Domain)", "serverTransferProhibited (Regulator Domain)", "serverDeleteProhibited (Regulator Domain)", "serverRenewProhibited (Regulator Domain)"], "updated_date": ["2011-04-29T09:22:00"], "contacts": {"admin": null, "tech": {"handle": "C28042011", "name": "Stephen Walsh"}, "registrant": {"organization": ".au Domain Administration Ltd", "handle": "C28042011", "name": "Stephen Walsh"}, "billing": null}, "nameservers": ["russell.linux.org.au", "daedalus.andrew.net.au"], "raw": ["Domain Name: linux.conf.au\nLast Modified: 29-Apr-2011 09:22:00 UTC\nRegistrar ID: auDA\nRegistrar Name: auDA\nStatus: serverUpdateProhibited (Regulator Domain)\nStatus: serverTransferProhibited (Regulator Domain)\nStatus: serverDeleteProhibited (Regulator Domain)\nStatus: serverRenewProhibited (Regulator Domain)\n\nRegistrant: .au Domain Administration Ltd\nRegistrant ID: OTHER 079 009 340\nEligibility Type: Other\n\nRegistrant Contact ID: C28042011\nRegistrant Contact Name: Stephen Walsh\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: C28042011\nTech Contact Name: Stephen Walsh\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: russell.linux.org.au\nName Server IP: 202.158.218.245\nName Server: daedalus.andrew.net.au\n\n"], "registrar": ["auDA"]}
\ No newline at end of file
diff --git a/test/target_normalized/lowendbox.com b/test/target_normalized/lowendbox.com
index c667ef4..86f8f00 100644
--- a/test/target_normalized/lowendbox.com
+++ b/test/target_normalized/lowendbox.com
@@ -1 +1 @@
-{"updated_date": ["2012-12-20T00:18:28"], "status": ["clientDeleteProhibited", "clientRenewProhibited", "clientTransferProhibited", "clientUpdateProhibited"], "contacts": {"admin": {"city": "Scottsdale", "fax": "(480) 624-2598", "name": "Registration Private", "state": "Arizona", "phone": "(480) 624-2599", "street": "DomainsByProxy.com\n14747 N Northsight Blvd Suite 111, PMB 309", "country": "United States", "postalcode": "85260", "organization": "Domains By Proxy, LLC", "email": "lowendbox.com@domainsbyproxy.com"}, "tech": {"city": "Scottsdale", "fax": "(480) 624-2598", "name": "Registration Private", "state": "Arizona", "phone": "(480) 624-2599", "street": "DomainsByProxy.com\n14747 N Northsight Blvd Suite 111, PMB 309", "country": "United States", "postalcode": "85260", "organization": "Domains By Proxy, LLC", "email": "lowendbox.com@domainsbyproxy.com"}, "registrant": {"city": "Scottsdale", "name": "Registration Private", "state": "Arizona", "street": "DomainsByProxy.com\n14747 N Northsight Blvd Suite 111, PMB 309", "country": "United States", "postalcode": "85260", "organization": "Domains By Proxy, LLC"}, "billing": null}, "expiration_date": ["2015-02-01T00:39:38"], "id": null, "creation_date": ["2008-02-01T00:39:38"], "raw": ["Domain Name: LOWENDBOX.COM\nRegistrar URL: http://www.godaddy.com\nUpdated Date: 2012-12-20 00:18:28\nCreation Date: 2008-02-01 00:39:38\nRegistrar Expiration Date: 2015-02-01 00:39:38\nRegistrar: GoDaddy.com, LLC\nRegistrant Name: Registration Private\nRegistrant Organization: Domains By Proxy, LLC\nRegistrant Street: DomainsByProxy.com\nRegistrant Street: 14747 N Northsight Blvd Suite 111, PMB 309\nRegistrant City: Scottsdale\nRegistrant State/Province: Arizona\nRegistrant Postal Code: 85260\nRegistrant Country: United States\nAdmin Name: Registration Private\nAdmin Organization: Domains By Proxy, LLC\nAdmin Street: DomainsByProxy.com\nAdmin Street: 14747 N Northsight Blvd Suite 111, PMB 309\nAdmin City: Scottsdale\nAdmin State/Province: Arizona\nAdmin Postal Code: 85260\nAdmin Country: United States\nAdmin Phone: (480) 624-2599\nAdmin Fax: (480) 624-2598\nAdmin Email: LOWENDBOX.COM@domainsbyproxy.com\nTech Name: Registration Private\nTech Organization: Domains By Proxy, LLC\nTech Street: DomainsByProxy.com\nTech Street: 14747 N Northsight Blvd Suite 111, PMB 309\nTech City: Scottsdale\nTech State/Province: Arizona\nTech Postal Code: 85260\nTech Country: United States\nTech Phone: (480) 624-2599\nTech Fax: (480) 624-2598\nTech Email: LOWENDBOX.COM@domainsbyproxy.com\nName Server: RUTH.NS.CLOUDFLARE.COM\nName Server: KEN.NS.CLOUDFLARE.COM\n\n****************************************************\nSee Business Registration Listing\n****************************************************\nCopy and paste the link below to view additional details:\nhttp://who.godaddy.com/whoischeck.aspx?domain=LOWENDBOX.COM\n\nThe data contained in GoDaddy.com, LLC's WhoIs database,\nwhile believed by the company to be reliable, is provided \"as is\"\nwith no guarantee or warranties regarding its accuracy. This\ninformation is provided for the sole purpose of assisting you\nin obtaining information about domain name registration records.\nAny use of this data for any other purpose is expressly forbidden without the prior written\npermission of GoDaddy.com, LLC. By submitting an inquiry,\nyou agree to these terms of usage and limitations of warranty. In particular,\nyou agree not to use this data to allow, enable, or otherwise make possible,\ndissemination or collection of this data, in part or in its entirety, for any\npurpose, such as the transmission of unsolicited advertising and\nand solicitations of any kind, including spam. You further agree\nnot to use this data to enable high volume, automated or robotic electronic\nprocesses designed to collect or compile this data for any purpose,\nincluding mining this data for your own personal or commercial purposes. \n\nPlease note: the registrant of the domain name is specified\nin the \"registrant\" section. In most cases, GoDaddy.com, LLC \nis not the registrant of domain names listed in this database.\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: LOWENDBOX.COM\n Registrar: GODADDY.COM, LLC\n Whois Server: whois.godaddy.com\n Referral URL: http://registrar.godaddy.com\n Name Server: KEN.NS.CLOUDFLARE.COM\n Name Server: RUTH.NS.CLOUDFLARE.COM\n Status: clientDeleteProhibited\n Status: clientRenewProhibited\n Status: clientTransferProhibited\n Status: clientUpdateProhibited\n Updated Date: 20-dec-2012\n Creation Date: 01-feb-2008\n Expiration Date: 01-feb-2015\n\n>>> Last update of whois database: Wed, 20 Nov 2013 10:14:17 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.godaddy.com"], "registrar": ["GoDaddy.com, LLC"], "name_servers": ["ruth.ns.cloudflare.com", "ken.ns.cloudflare.com"], "emails": []}
\ No newline at end of file
+{"updated_date": ["2012-12-20T00:18:28"], "status": ["clientDeleteProhibited", "clientRenewProhibited", "clientTransferProhibited", "clientUpdateProhibited"], "contacts": {"admin": {"city": "Scottsdale", "fax": "(480) 624-2598", "name": "Registration Private", "state": "Arizona", "phone": "(480) 624-2599", "street": "DomainsByProxy.com\n14747 N Northsight Blvd Suite 111, PMB 309", "country": "United States", "postalcode": "85260", "organization": "Domains By Proxy, LLC", "email": "lowendbox.com@domainsbyproxy.com"}, "tech": {"city": "Scottsdale", "fax": "(480) 624-2598", "name": "Registration Private", "state": "Arizona", "phone": "(480) 624-2599", "street": "DomainsByProxy.com\n14747 N Northsight Blvd Suite 111, PMB 309", "country": "United States", "postalcode": "85260", "organization": "Domains By Proxy, LLC", "email": "lowendbox.com@domainsbyproxy.com"}, "registrant": {"city": "Scottsdale", "name": "Registration Private", "state": "Arizona", "street": "DomainsByProxy.com\n14747 N Northsight Blvd Suite 111, PMB 309", "country": "United States", "postalcode": "85260", "organization": "Domains By Proxy, LLC"}, "billing": null}, "nameservers": ["ruth.ns.cloudflare.com", "ken.ns.cloudflare.com"], "expiration_date": ["2015-02-01T00:39:38"], "creation_date": ["2008-02-01T00:39:38"], "raw": ["Domain Name: LOWENDBOX.COM\nRegistrar URL: http://www.godaddy.com\nUpdated Date: 2012-12-20 00:18:28\nCreation Date: 2008-02-01 00:39:38\nRegistrar Expiration Date: 2015-02-01 00:39:38\nRegistrar: GoDaddy.com, LLC\nRegistrant Name: Registration Private\nRegistrant Organization: Domains By Proxy, LLC\nRegistrant Street: DomainsByProxy.com\nRegistrant Street: 14747 N Northsight Blvd Suite 111, PMB 309\nRegistrant City: Scottsdale\nRegistrant State/Province: Arizona\nRegistrant Postal Code: 85260\nRegistrant Country: United States\nAdmin Name: Registration Private\nAdmin Organization: Domains By Proxy, LLC\nAdmin Street: DomainsByProxy.com\nAdmin Street: 14747 N Northsight Blvd Suite 111, PMB 309\nAdmin City: Scottsdale\nAdmin State/Province: Arizona\nAdmin Postal Code: 85260\nAdmin Country: United States\nAdmin Phone: (480) 624-2599\nAdmin Fax: (480) 624-2598\nAdmin Email: LOWENDBOX.COM@domainsbyproxy.com\nTech Name: Registration Private\nTech Organization: Domains By Proxy, LLC\nTech Street: DomainsByProxy.com\nTech Street: 14747 N Northsight Blvd Suite 111, PMB 309\nTech City: Scottsdale\nTech State/Province: Arizona\nTech Postal Code: 85260\nTech Country: United States\nTech Phone: (480) 624-2599\nTech Fax: (480) 624-2598\nTech Email: LOWENDBOX.COM@domainsbyproxy.com\nName Server: RUTH.NS.CLOUDFLARE.COM\nName Server: KEN.NS.CLOUDFLARE.COM\n\n****************************************************\nSee Business Registration Listing\n****************************************************\nCopy and paste the link below to view additional details:\nhttp://who.godaddy.com/whoischeck.aspx?domain=LOWENDBOX.COM\n\nThe data contained in GoDaddy.com, LLC's WhoIs database,\nwhile believed by the company to be reliable, is provided \"as is\"\nwith no guarantee or warranties regarding its accuracy. This\ninformation is provided for the sole purpose of assisting you\nin obtaining information about domain name registration records.\nAny use of this data for any other purpose is expressly forbidden without the prior written\npermission of GoDaddy.com, LLC. By submitting an inquiry,\nyou agree to these terms of usage and limitations of warranty. In particular,\nyou agree not to use this data to allow, enable, or otherwise make possible,\ndissemination or collection of this data, in part or in its entirety, for any\npurpose, such as the transmission of unsolicited advertising and\nand solicitations of any kind, including spam. You further agree\nnot to use this data to enable high volume, automated or robotic electronic\nprocesses designed to collect or compile this data for any purpose,\nincluding mining this data for your own personal or commercial purposes. \n\nPlease note: the registrant of the domain name is specified\nin the \"registrant\" section. In most cases, GoDaddy.com, LLC \nis not the registrant of domain names listed in this database.\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: LOWENDBOX.COM\n Registrar: GODADDY.COM, LLC\n Whois Server: whois.godaddy.com\n Referral URL: http://registrar.godaddy.com\n Name Server: KEN.NS.CLOUDFLARE.COM\n Name Server: RUTH.NS.CLOUDFLARE.COM\n Status: clientDeleteProhibited\n Status: clientRenewProhibited\n Status: clientTransferProhibited\n Status: clientUpdateProhibited\n Updated Date: 20-dec-2012\n Creation Date: 01-feb-2008\n Expiration Date: 01-feb-2015\n\n>>> Last update of whois database: Wed, 20 Nov 2013 10:14:17 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.godaddy.com"], "registrar": ["GoDaddy.com, LLC"]}
\ No newline at end of file
diff --git a/test/target_normalized/lowendshare.com b/test/target_normalized/lowendshare.com
index 9ec12bd..8d53435 100644
--- a/test/target_normalized/lowendshare.com
+++ b/test/target_normalized/lowendshare.com
@@ -1 +1 @@
-{"status": ["clientTransferProhibited"], "updated_date": ["2013-08-30T00:00:00", "2013-11-23T13:55:04"], "contacts": {"admin": {"city": "Panama", "name": "Domain Administrator", "country": "Panama", "phone": "+507.65995877", "street": "Attn: lowendshare.com\nAptds. 0850-00056", "postalcode": "Zona 15", "organization": "Fundacion Private Whois", "email": "522ff121nsq4zosx@5225b4d0pi3627q9.privatewhois.net"}, "tech": {"city": "Panama", "name": "Domain Administrator", "country": "Panama", "phone": "+507.65995877", "street": "Attn: lowendshare.com\nAptds. 0850-00056", "postalcode": "Zona 15", "organization": "Fundacion Private Whois", "email": "522ff121vt0xukg2@5225b4d0pi3627q9.privatewhois.net"}, "registrant": {"city": "Panama", "name": "Domain Administrator", "country": "Panama", "phone": "+507.65995877", "street": "Attn: lowendshare.com\nAptds. 0850-00056", "postalcode": "Zona 15", "organization": "Fundacion Private Whois", "email": "522ff120qi9mqlng@5225b4d0pi3627q9.privatewhois.net"}, "billing": null}, "expiration_date": ["2014-07-13T00:00:00"], "id": null, "creation_date": ["2012-07-13T00:00:00"], "raw": ["Domain lowendshare.com\n\nDate Registered: 2012-7-13\nExpiry Date: 2014-7-13\n\nDNS1: ns10.dns4pro.at\nDNS2: ns20.dns4pro.at\nDNS3: ns30.dns4pro.at\n\nRegistrant\n Fundacion Private Whois\n Domain Administrator\n Email:522ff120qi9mqlng@5225b4d0pi3627q9.privatewhois.net\n Attn: lowendshare.com\n Aptds. 0850-00056\n Zona 15 Panama\n Panama\n Tel: +507.65995877\n\nAdministrative Contact\n Fundacion Private Whois\n Domain Administrator\n Email:522ff121nsq4zosx@5225b4d0pi3627q9.privatewhois.net\n Attn: lowendshare.com\n Aptds. 0850-00056\n Zona 15 Panama\n Panama\n Tel: +507.65995877\n\nTechnical Contact\n Fundacion Private Whois\n Domain Administrator\n Email:522ff121vt0xukg2@5225b4d0pi3627q9.privatewhois.net\n Attn: lowendshare.com\n Aptds. 0850-00056\n Zona 15 Panama\n Panama\n Tel: +507.65995877\n\nRegistrar: Internet.bs Corp.\nRegistrar's Website : http://www.internetbs.net/\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: LOWENDSHARE.COM\n Registrar: INTERNET.BS CORP.\n Whois Server: whois.internet.bs\n Referral URL: http://www.internet.bs\n Name Server: NS10.DNS4PRO.AT\n Name Server: NS20.DNS4PRO.AT\n Name Server: NS30.DNS4PRO.AT\n Status: clientTransferProhibited\n Updated Date: 30-aug-2013\n Creation Date: 13-jul-2012\n Expiration Date: 13-jul-2014\n\n>>> Last update of whois database: Sat, 23 Nov 2013 13:55:04 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.internet.bs"], "registrar": ["Internet.bs Corp."], "name_servers": ["ns10.dns4pro.at", "ns20.dns4pro.at", "ns30.dns4pro.at"], "emails": []}
\ No newline at end of file
+{"status": ["clientTransferProhibited"], "updated_date": ["2013-08-30T00:00:00", "2013-11-23T13:55:04"], "contacts": {"admin": {"city": "Panama", "name": "Domain Administrator", "country": "Panama", "phone": "+507.65995877", "street": "Attn: lowendshare.com\nAptds. 0850-00056", "postalcode": "Zona 15", "organization": "Fundacion Private Whois", "email": "522ff121nsq4zosx@5225b4d0pi3627q9.privatewhois.net"}, "tech": {"city": "Panama", "name": "Domain Administrator", "country": "Panama", "phone": "+507.65995877", "street": "Attn: lowendshare.com\nAptds. 0850-00056", "postalcode": "Zona 15", "organization": "Fundacion Private Whois", "email": "522ff121vt0xukg2@5225b4d0pi3627q9.privatewhois.net"}, "registrant": {"city": "Panama", "name": "Domain Administrator", "country": "Panama", "phone": "+507.65995877", "street": "Attn: lowendshare.com\nAptds. 0850-00056", "postalcode": "Zona 15", "organization": "Fundacion Private Whois", "email": "522ff120qi9mqlng@5225b4d0pi3627q9.privatewhois.net"}, "billing": null}, "nameservers": ["ns10.dns4pro.at", "ns20.dns4pro.at", "ns30.dns4pro.at"], "expiration_date": ["2014-07-13T00:00:00"], "creation_date": ["2012-07-13T00:00:00"], "raw": ["Domain lowendshare.com\n\nDate Registered: 2012-7-13\nExpiry Date: 2014-7-13\n\nDNS1: ns10.dns4pro.at\nDNS2: ns20.dns4pro.at\nDNS3: ns30.dns4pro.at\n\nRegistrant\n Fundacion Private Whois\n Domain Administrator\n Email:522ff120qi9mqlng@5225b4d0pi3627q9.privatewhois.net\n Attn: lowendshare.com\n Aptds. 0850-00056\n Zona 15 Panama\n Panama\n Tel: +507.65995877\n\nAdministrative Contact\n Fundacion Private Whois\n Domain Administrator\n Email:522ff121nsq4zosx@5225b4d0pi3627q9.privatewhois.net\n Attn: lowendshare.com\n Aptds. 0850-00056\n Zona 15 Panama\n Panama\n Tel: +507.65995877\n\nTechnical Contact\n Fundacion Private Whois\n Domain Administrator\n Email:522ff121vt0xukg2@5225b4d0pi3627q9.privatewhois.net\n Attn: lowendshare.com\n Aptds. 0850-00056\n Zona 15 Panama\n Panama\n Tel: +507.65995877\n\nRegistrar: Internet.bs Corp.\nRegistrar's Website : http://www.internetbs.net/\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: LOWENDSHARE.COM\n Registrar: INTERNET.BS CORP.\n Whois Server: whois.internet.bs\n Referral URL: http://www.internet.bs\n Name Server: NS10.DNS4PRO.AT\n Name Server: NS20.DNS4PRO.AT\n Name Server: NS30.DNS4PRO.AT\n Status: clientTransferProhibited\n Updated Date: 30-aug-2013\n Creation Date: 13-jul-2012\n Expiration Date: 13-jul-2014\n\n>>> Last update of whois database: Sat, 23 Nov 2013 13:55:04 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.internet.bs"], "registrar": ["Internet.bs Corp."]}
\ No newline at end of file
diff --git a/test/target_normalized/microsoft.com b/test/target_normalized/microsoft.com
index 56019e3..1725d43 100644
--- a/test/target_normalized/microsoft.com
+++ b/test/target_normalized/microsoft.com
@@ -1 +1 @@
-{"status": ["clientUpdateProhibited", "clientTransferProhibited", "clientDeleteProhibited"], "updated_date": ["2013-08-11T04:00:51"], "contacts": {"admin": {"city": "Redmond", "fax": "+1.4259367329", "name": "Domain Administrator", "state": "WA", "phone": "+1.4258828080", "street": "One Microsoft Way", "country": "US", "postalcode": "98052", "organization": "Microsoft Corporation", "email": "domains@microsoft.com"}, "tech": {"city": "Redmond", "fax": "+1.4259367329", "name": "MSN Hostmaster", "state": "WA", "phone": "+1.4258828080", "street": "One Microsoft Way", "country": "US", "postalcode": "98052", "organization": "Microsoft Corporation", "email": "msnhst@microsoft.com"}, "registrant": {"city": "Redmond", "fax": "+1.4259367329", "name": "Domain Administrator", "state": "WA", "phone": "+1.4258828080", "street": "One Microsoft Way", "country": "US", "postalcode": "98052", "organization": "Microsoft Corporation", "email": "domains@microsoft.com"}, "billing": null}, "expiration_date": ["2021-05-02T21:00:00", "2021-05-02T21:00:00"], "emails": ["compliance@markmonitor.com"], "raw": ["Domain Name: microsoft.com\nRegistry Domain ID: 2724960_DOMAIN_COM-VRSN\nRegistrar WHOIS Server: whois.markmonitor.com\nRegistrar URL: http://www.markmonitor.com\nUpdated Date: 2013-08-11T04:00:51-0700\nCreation Date: 2011-08-09T13:02:58-0700\nRegistrar Registration Expiration Date: 2021-05-02T21:00:00-0700\nRegistrar: MarkMonitor, Inc.\nRegistrar IANA ID: 292\nRegistrar Abuse Contact Email: compliance@markmonitor.com\nRegistrar Abuse Contact Phone: +1.2083895740\nDomain Status: clientUpdateProhibited\nDomain Status: clientTransferProhibited\nDomain Status: clientDeleteProhibited\nRegistry Registrant ID: \nRegistrant Name: Domain Administrator\nRegistrant Organization: Microsoft Corporation\nRegistrant Street: One Microsoft Way, \nRegistrant City: Redmond\nRegistrant State/Province: WA\nRegistrant Postal Code: 98052\nRegistrant Country: US\nRegistrant Phone: +1.4258828080\nRegistrant Phone Ext: \nRegistrant Fax: +1.4259367329\nRegistrant Fax Ext: \nRegistrant Email: domains@microsoft.com\nRegistry Admin ID: \nAdmin Name: Domain Administrator\nAdmin Organization: Microsoft Corporation\nAdmin Street: One Microsoft Way, \nAdmin City: Redmond\nAdmin State/Province: WA\nAdmin Postal Code: 98052\nAdmin Country: US\nAdmin Phone: +1.4258828080\nAdmin Phone Ext: \nAdmin Fax: +1.4259367329\nAdmin Fax Ext: \nAdmin Email: domains@microsoft.com\nRegistry Tech ID: \nTech Name: MSN Hostmaster\nTech Organization: Microsoft Corporation\nTech Street: One Microsoft Way, \nTech City: Redmond\nTech State/Province: WA\nTech Postal Code: 98052\nTech Country: US\nTech Phone: +1.4258828080\nTech Phone Ext: \nTech Fax: +1.4259367329\nTech Fax Ext: \nTech Email: msnhst@microsoft.com\nName Server: ns3.msft.net\nName Server: ns5.msft.net\nName Server: ns2.msft.net\nName Server: ns1.msft.net\nName Server: ns4.msft.net\nURL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/\n>>> Last update of WHOIS database: 2013-11-23T06:24:49-0800 <<<\n\nThe Data in MarkMonitor.com's WHOIS database is provided by MarkMonitor.com for\ninformation purposes, and to assist persons in obtaining information about or\nrelated to a domain name registration record. MarkMonitor.com does not guarantee\nits accuracy. By submitting a WHOIS query, you agree that you will use this Data\nonly for lawful purposes and that, under no circumstances will you use this Data to:\n (1) allow, enable, or otherwise support the transmission of mass unsolicited,\n commercial advertising or solicitations via e-mail (spam); or\n (2) enable high volume, automated, electronic processes that apply to\n MarkMonitor.com (or its systems).\nMarkMonitor.com reserves the right to modify these terms at any time.\nBy submitting this query, you agree to abide by this policy.\n\nMarkMonitor is the Global Leader in Online Brand Protection.\n\nMarkMonitor Domain Management(TM)\nMarkMonitor Brand Protection(TM)\nMarkMonitor AntiPiracy(TM)\nMarkMonitor AntiFraud(TM)\nProfessional and Managed Services\n\nVisit MarkMonitor at http://www.markmonitor.com\nContact us at +1.8007459229\nIn Europe, at +44.02032062220", "", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Server Name: MICROSOFT.COM.ZZZZZZZZZZZZZZZZZZZZZZ.IS.A.GREAT.COMPANY.ITREBAL.COM\n IP Address: 97.107.132.202\n Registrar: GANDI SAS\n Whois Server: whois.gandi.net\n Referral URL: http://www.gandi.net\n\n Server Name: MICROSOFT.COM.ZZZZZZZZZZZZZZZZZZZ.GET.ONE.MILLION.DOLLARS.AT.WWW.UNIMUNDI.COM\n IP Address: 209.126.190.70\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: MICROSOFT.COM.ZZZZZZZZZZZZZZZZZZ.IM.ELITE.WANNABE.TOO.WWW.PLUS613.NET\n IP Address: 64.251.18.228\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.ZZZZZZ.MORE.DETAILS.AT.WWW.BEYONDWHOIS.COM\n IP Address: 203.36.226.2\n Registrar: INSTRA CORPORATION PTY, LTD.\n Whois Server: whois.instra.net\n Referral URL: http://www.instra.com\n\n Server Name: MICROSOFT.COM.ZZZZZ.GET.LAID.AT.WWW.SWINGINGCOMMUNITY.COM\n IP Address: 69.41.185.194\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.ZZZOMBIED.AND.HACKED.BY.WWW.WEB-HACK.COM\n IP Address: 217.107.217.167\n Registrar: DOMAINCONTEXT, INC.\n Whois Server: whois.domaincontext.com\n Referral URL: http://www.domaincontext.com\n\n Server Name: MICROSOFT.COM.ZZZ.IS.0WNED.AND.HAX0RED.BY.SUB7.NET\n IP Address: 207.44.240.96\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.WILL.BE.SLAPPED.IN.THE.FACE.BY.MY.BLUE.VEINED.SPANNER.NET\n IP Address: 216.127.80.46\n Registrar: ASCIO TECHNOLOGIES, INC.\n Whois Server: whois.ascio.com\n Referral URL: http://www.ascio.com\n\n Server Name: MICROSOFT.COM.WILL.BE.BEATEN.WITH.MY.SPANNER.NET\n IP Address: 216.127.80.46\n Registrar: ASCIO TECHNOLOGIES, INC.\n Whois Server: whois.ascio.com\n Referral URL: http://www.ascio.com\n\n Server Name: MICROSOFT.COM.WAREZ.AT.TOPLIST.GULLI.COM\n IP Address: 80.190.192.33\n Registrar: CORE INTERNET COUNCIL OF REGISTRARS\n Whois Server: whois.corenic.net\n Referral URL: http://www.corenic.net\n\n Server Name: MICROSOFT.COM.THIS.IS.A.TEST.INETLIBRARY.NET\n IP Address: 173.161.23.178\n Registrar: GANDI SAS\n Whois Server: whois.gandi.net\n Referral URL: http://www.gandi.net\n\n Server Name: MICROSOFT.COM.SOFTWARE.IS.NOT.USED.AT.REG.RU\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n\n Server Name: MICROSOFT.COM.SHOULD.GIVE.UP.BECAUSE.LINUXISGOD.COM\n IP Address: 65.160.248.13\n Registrar: GKG.NET, INC.\n Whois Server: whois.gkg.net\n Referral URL: http://www.gkg.net\n\n Server Name: MICROSOFT.COM.RAWKZ.MUH.WERLD.MENTALFLOSS.CA\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.MORE.INFO.AT.WWW.BEYONDWHOIS.COM\n IP Address: 203.36.226.2\n Registrar: INSTRA CORPORATION PTY, LTD.\n Whois Server: whois.instra.net\n Referral URL: http://www.instra.com\n\n Server Name: MICROSOFT.COM.MATCHES.THIS.STRING.AT.KEYSIGNERS.COM\n IP Address: 85.10.240.254\n Registrar: HETZNER ONLINE AG\n Whois Server: whois.your-server.de\n Referral URL: http://www.hetzner.de\n\n Server Name: MICROSOFT.COM.MAKES.RICKARD.DRINK.SAMBUCA.0800CARRENTAL.COM\n IP Address: 209.85.135.106\n Registrar: KEY-SYSTEMS GMBH\n Whois Server: whois.rrpproxy.net\n Referral URL: http://www.key-systems.net\n\n Server Name: MICROSOFT.COM.LOVES.ME.KOSMAL.NET\n IP Address: 65.75.198.123\n Registrar: GODADDY.COM, LLC\n Whois Server: whois.godaddy.com\n Referral URL: http://registrar.godaddy.com\n\n Server Name: MICROSOFT.COM.LIVES.AT.SHAUNEWING.COM\n IP Address: 216.40.250.172\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.KNOWS.THAT.THE.BEST.WEB.HOSTING.IS.NASHHOST.NET\n IP Address: 78.47.16.44\n Registrar: CENTER OF UKRAINIAN INTERNET NAMES\n Whois Server: whois.ukrnames.com\n Referral URL: http://www.ukrnames.com\n\n Server Name: MICROSOFT.COM.IS.POWERED.BY.MIKROTIKA.V.OBSHTEJITIETO.OT.IBEKYAROV.UNIX-BG.COM\n IP Address: 84.22.26.98\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.IS.NOT.YEPPA.ORG\n Registrar: OVH\n Whois Server: whois.ovh.com\n Referral URL: http://www.ovh.com\n\n Server Name: MICROSOFT.COM.IS.NOT.HOSTED.BY.ACTIVEDOMAINDNS.NET\n IP Address: 217.148.161.5\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: MICROSOFT.COM.IS.IN.BED.WITH.CURTYV.COM\n IP Address: 216.55.187.193\n Registrar: HOSTOPIA.COM INC. D/B/A APLUS.NET\n Whois Server: whois.names4ever.com\n Referral URL: http://www.aplus.net\n\n Server Name: MICROSOFT.COM.IS.HOSTED.ON.PROFITHOSTING.NET\n IP Address: 66.49.213.213\n Registrar: NAME.COM, INC.\n Whois Server: whois.name.com\n Referral URL: http://www.name.com\n\n Server Name: MICROSOFT.COM.IS.A.STEAMING.HEAP.OF.FUCKING-BULLSHIT.NET\n IP Address: 63.99.165.11\n Registrar: 1 & 1 INTERNET AG\n Whois Server: whois.schlund.info\n Referral URL: http://1and1.com\n\n Server Name: MICROSOFT.COM.IS.A.MESS.TIMPORTER.CO.UK\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n\n Server Name: MICROSOFT.COM.HAS.A.PRESENT.COMING.FROM.HUGHESMISSILES.COM\n IP Address: 66.154.11.27\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.FILLS.ME.WITH.BELLIGERENCE.NET\n IP Address: 130.58.82.232\n Registrar: CPS-DATENSYSTEME GMBH\n Whois Server: whois.cps-datensysteme.de\n Referral URL: http://www.cps-datensysteme.de\n\n Server Name: MICROSOFT.COM.EENGURRA.COM\n IP Address: 184.168.46.68\n Registrar: GODADDY.COM, LLC\n Whois Server: whois.godaddy.com\n Referral URL: http://registrar.godaddy.com\n\n Server Name: MICROSOFT.COM.CAN.GO.FUCK.ITSELF.AT.SECZY.COM\n IP Address: 209.187.114.147\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.ARE.GODDAMN.PIGFUCKERS.NET.NS-NOT-IN-SERVICE.COM\n IP Address: 216.127.80.46\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Domain Name: MICROSOFT.COM\n Registrar: MARKMONITOR INC.\n Whois Server: whois.markmonitor.com\n Referral URL: http://www.markmonitor.com\n Name Server: NS1.MSFT.NET\n Name Server: NS2.MSFT.NET\n Name Server: NS3.MSFT.NET\n Name Server: NS4.MSFT.NET\n Name Server: NS5.MSFT.NET\n Status: clientDeleteProhibited\n Status: clientTransferProhibited\n Status: clientUpdateProhibited\n Status: serverDeleteProhibited\n Status: serverTransferProhibited\n Status: serverUpdateProhibited\n Updated Date: 09-aug-2011\n Creation Date: 02-may-1991\n Expiration Date: 03-may-2021\n\n>>> Last update of whois database: Sat, 23 Nov 2013 14:25:01 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.markmonitor.com"], "registrar": ["MarkMonitor, Inc."], "name_servers": ["ns3.msft.net", "ns5.msft.net", "ns2.msft.net", "ns1.msft.net", "ns4.msft.net"], "creation_date": ["2011-08-09T13:02:58"], "id": ["2724960_DOMAIN_COM-VRSN"]}
\ No newline at end of file
+{"status": ["clientUpdateProhibited", "clientTransferProhibited", "clientDeleteProhibited"], "updated_date": ["2013-08-11T04:00:51"], "contacts": {"admin": {"city": "Redmond", "fax": "+1.4259367329", "name": "Domain Administrator", "state": "WA", "phone": "+1.4258828080", "street": "One Microsoft Way", "country": "US", "postalcode": "98052", "organization": "Microsoft Corporation", "email": "domains@microsoft.com"}, "tech": {"city": "Redmond", "fax": "+1.4259367329", "name": "MSN Hostmaster", "state": "WA", "phone": "+1.4258828080", "street": "One Microsoft Way", "country": "US", "postalcode": "98052", "organization": "Microsoft Corporation", "email": "msnhst@microsoft.com"}, "registrant": {"city": "Redmond", "fax": "+1.4259367329", "name": "Domain Administrator", "state": "WA", "phone": "+1.4258828080", "street": "One Microsoft Way", "country": "US", "postalcode": "98052", "organization": "Microsoft Corporation", "email": "domains@microsoft.com"}, "billing": null}, "nameservers": ["ns3.msft.net", "ns5.msft.net", "ns2.msft.net", "ns1.msft.net", "ns4.msft.net"], "expiration_date": ["2021-05-02T21:00:00", "2021-05-02T21:00:00"], "emails": ["compliance@markmonitor.com"], "raw": ["Domain Name: microsoft.com\nRegistry Domain ID: 2724960_DOMAIN_COM-VRSN\nRegistrar WHOIS Server: whois.markmonitor.com\nRegistrar URL: http://www.markmonitor.com\nUpdated Date: 2013-08-11T04:00:51-0700\nCreation Date: 2011-08-09T13:02:58-0700\nRegistrar Registration Expiration Date: 2021-05-02T21:00:00-0700\nRegistrar: MarkMonitor, Inc.\nRegistrar IANA ID: 292\nRegistrar Abuse Contact Email: compliance@markmonitor.com\nRegistrar Abuse Contact Phone: +1.2083895740\nDomain Status: clientUpdateProhibited\nDomain Status: clientTransferProhibited\nDomain Status: clientDeleteProhibited\nRegistry Registrant ID: \nRegistrant Name: Domain Administrator\nRegistrant Organization: Microsoft Corporation\nRegistrant Street: One Microsoft Way, \nRegistrant City: Redmond\nRegistrant State/Province: WA\nRegistrant Postal Code: 98052\nRegistrant Country: US\nRegistrant Phone: +1.4258828080\nRegistrant Phone Ext: \nRegistrant Fax: +1.4259367329\nRegistrant Fax Ext: \nRegistrant Email: domains@microsoft.com\nRegistry Admin ID: \nAdmin Name: Domain Administrator\nAdmin Organization: Microsoft Corporation\nAdmin Street: One Microsoft Way, \nAdmin City: Redmond\nAdmin State/Province: WA\nAdmin Postal Code: 98052\nAdmin Country: US\nAdmin Phone: +1.4258828080\nAdmin Phone Ext: \nAdmin Fax: +1.4259367329\nAdmin Fax Ext: \nAdmin Email: domains@microsoft.com\nRegistry Tech ID: \nTech Name: MSN Hostmaster\nTech Organization: Microsoft Corporation\nTech Street: One Microsoft Way, \nTech City: Redmond\nTech State/Province: WA\nTech Postal Code: 98052\nTech Country: US\nTech Phone: +1.4258828080\nTech Phone Ext: \nTech Fax: +1.4259367329\nTech Fax Ext: \nTech Email: msnhst@microsoft.com\nName Server: ns3.msft.net\nName Server: ns5.msft.net\nName Server: ns2.msft.net\nName Server: ns1.msft.net\nName Server: ns4.msft.net\nURL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/\n>>> Last update of WHOIS database: 2013-11-23T06:24:49-0800 <<<\n\nThe Data in MarkMonitor.com's WHOIS database is provided by MarkMonitor.com for\ninformation purposes, and to assist persons in obtaining information about or\nrelated to a domain name registration record. MarkMonitor.com does not guarantee\nits accuracy. By submitting a WHOIS query, you agree that you will use this Data\nonly for lawful purposes and that, under no circumstances will you use this Data to:\n (1) allow, enable, or otherwise support the transmission of mass unsolicited,\n commercial advertising or solicitations via e-mail (spam); or\n (2) enable high volume, automated, electronic processes that apply to\n MarkMonitor.com (or its systems).\nMarkMonitor.com reserves the right to modify these terms at any time.\nBy submitting this query, you agree to abide by this policy.\n\nMarkMonitor is the Global Leader in Online Brand Protection.\n\nMarkMonitor Domain Management(TM)\nMarkMonitor Brand Protection(TM)\nMarkMonitor AntiPiracy(TM)\nMarkMonitor AntiFraud(TM)\nProfessional and Managed Services\n\nVisit MarkMonitor at http://www.markmonitor.com\nContact us at +1.8007459229\nIn Europe, at +44.02032062220", "", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Server Name: MICROSOFT.COM.ZZZZZZZZZZZZZZZZZZZZZZ.IS.A.GREAT.COMPANY.ITREBAL.COM\n IP Address: 97.107.132.202\n Registrar: GANDI SAS\n Whois Server: whois.gandi.net\n Referral URL: http://www.gandi.net\n\n Server Name: MICROSOFT.COM.ZZZZZZZZZZZZZZZZZZZ.GET.ONE.MILLION.DOLLARS.AT.WWW.UNIMUNDI.COM\n IP Address: 209.126.190.70\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Server Name: MICROSOFT.COM.ZZZZZZZZZZZZZZZZZZ.IM.ELITE.WANNABE.TOO.WWW.PLUS613.NET\n IP Address: 64.251.18.228\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.ZZZZZZ.MORE.DETAILS.AT.WWW.BEYONDWHOIS.COM\n IP Address: 203.36.226.2\n Registrar: INSTRA CORPORATION PTY, LTD.\n Whois Server: whois.instra.net\n Referral URL: http://www.instra.com\n\n Server Name: MICROSOFT.COM.ZZZZZ.GET.LAID.AT.WWW.SWINGINGCOMMUNITY.COM\n IP Address: 69.41.185.194\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.ZZZOMBIED.AND.HACKED.BY.WWW.WEB-HACK.COM\n IP Address: 217.107.217.167\n Registrar: DOMAINCONTEXT, INC.\n Whois Server: whois.domaincontext.com\n Referral URL: http://www.domaincontext.com\n\n Server Name: MICROSOFT.COM.ZZZ.IS.0WNED.AND.HAX0RED.BY.SUB7.NET\n IP Address: 207.44.240.96\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.WILL.BE.SLAPPED.IN.THE.FACE.BY.MY.BLUE.VEINED.SPANNER.NET\n IP Address: 216.127.80.46\n Registrar: ASCIO TECHNOLOGIES, INC.\n Whois Server: whois.ascio.com\n Referral URL: http://www.ascio.com\n\n Server Name: MICROSOFT.COM.WILL.BE.BEATEN.WITH.MY.SPANNER.NET\n IP Address: 216.127.80.46\n Registrar: ASCIO TECHNOLOGIES, INC.\n Whois Server: whois.ascio.com\n Referral URL: http://www.ascio.com\n\n Server Name: MICROSOFT.COM.WAREZ.AT.TOPLIST.GULLI.COM\n IP Address: 80.190.192.33\n Registrar: CORE INTERNET COUNCIL OF REGISTRARS\n Whois Server: whois.corenic.net\n Referral URL: http://www.corenic.net\n\n Server Name: MICROSOFT.COM.THIS.IS.A.TEST.INETLIBRARY.NET\n IP Address: 173.161.23.178\n Registrar: GANDI SAS\n Whois Server: whois.gandi.net\n Referral URL: http://www.gandi.net\n\n Server Name: MICROSOFT.COM.SOFTWARE.IS.NOT.USED.AT.REG.RU\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n\n Server Name: MICROSOFT.COM.SHOULD.GIVE.UP.BECAUSE.LINUXISGOD.COM\n IP Address: 65.160.248.13\n Registrar: GKG.NET, INC.\n Whois Server: whois.gkg.net\n Referral URL: http://www.gkg.net\n\n Server Name: MICROSOFT.COM.RAWKZ.MUH.WERLD.MENTALFLOSS.CA\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.MORE.INFO.AT.WWW.BEYONDWHOIS.COM\n IP Address: 203.36.226.2\n Registrar: INSTRA CORPORATION PTY, LTD.\n Whois Server: whois.instra.net\n Referral URL: http://www.instra.com\n\n Server Name: MICROSOFT.COM.MATCHES.THIS.STRING.AT.KEYSIGNERS.COM\n IP Address: 85.10.240.254\n Registrar: HETZNER ONLINE AG\n Whois Server: whois.your-server.de\n Referral URL: http://www.hetzner.de\n\n Server Name: MICROSOFT.COM.MAKES.RICKARD.DRINK.SAMBUCA.0800CARRENTAL.COM\n IP Address: 209.85.135.106\n Registrar: KEY-SYSTEMS GMBH\n Whois Server: whois.rrpproxy.net\n Referral URL: http://www.key-systems.net\n\n Server Name: MICROSOFT.COM.LOVES.ME.KOSMAL.NET\n IP Address: 65.75.198.123\n Registrar: GODADDY.COM, LLC\n Whois Server: whois.godaddy.com\n Referral URL: http://registrar.godaddy.com\n\n Server Name: MICROSOFT.COM.LIVES.AT.SHAUNEWING.COM\n IP Address: 216.40.250.172\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.KNOWS.THAT.THE.BEST.WEB.HOSTING.IS.NASHHOST.NET\n IP Address: 78.47.16.44\n Registrar: CENTER OF UKRAINIAN INTERNET NAMES\n Whois Server: whois.ukrnames.com\n Referral URL: http://www.ukrnames.com\n\n Server Name: MICROSOFT.COM.IS.POWERED.BY.MIKROTIKA.V.OBSHTEJITIETO.OT.IBEKYAROV.UNIX-BG.COM\n IP Address: 84.22.26.98\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.IS.NOT.YEPPA.ORG\n Registrar: OVH\n Whois Server: whois.ovh.com\n Referral URL: http://www.ovh.com\n\n Server Name: MICROSOFT.COM.IS.NOT.HOSTED.BY.ACTIVEDOMAINDNS.NET\n IP Address: 217.148.161.5\n Registrar: ENOM, INC.\n Whois Server: whois.enom.com\n Referral URL: http://www.enom.com\n\n Server Name: MICROSOFT.COM.IS.IN.BED.WITH.CURTYV.COM\n IP Address: 216.55.187.193\n Registrar: HOSTOPIA.COM INC. D/B/A APLUS.NET\n Whois Server: whois.names4ever.com\n Referral URL: http://www.aplus.net\n\n Server Name: MICROSOFT.COM.IS.HOSTED.ON.PROFITHOSTING.NET\n IP Address: 66.49.213.213\n Registrar: NAME.COM, INC.\n Whois Server: whois.name.com\n Referral URL: http://www.name.com\n\n Server Name: MICROSOFT.COM.IS.A.STEAMING.HEAP.OF.FUCKING-BULLSHIT.NET\n IP Address: 63.99.165.11\n Registrar: 1 & 1 INTERNET AG\n Whois Server: whois.schlund.info\n Referral URL: http://1and1.com\n\n Server Name: MICROSOFT.COM.IS.A.MESS.TIMPORTER.CO.UK\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n\n Server Name: MICROSOFT.COM.HAS.A.PRESENT.COMING.FROM.HUGHESMISSILES.COM\n IP Address: 66.154.11.27\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.FILLS.ME.WITH.BELLIGERENCE.NET\n IP Address: 130.58.82.232\n Registrar: CPS-DATENSYSTEME GMBH\n Whois Server: whois.cps-datensysteme.de\n Referral URL: http://www.cps-datensysteme.de\n\n Server Name: MICROSOFT.COM.EENGURRA.COM\n IP Address: 184.168.46.68\n Registrar: GODADDY.COM, LLC\n Whois Server: whois.godaddy.com\n Referral URL: http://registrar.godaddy.com\n\n Server Name: MICROSOFT.COM.CAN.GO.FUCK.ITSELF.AT.SECZY.COM\n IP Address: 209.187.114.147\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Server Name: MICROSOFT.COM.ARE.GODDAMN.PIGFUCKERS.NET.NS-NOT-IN-SERVICE.COM\n IP Address: 216.127.80.46\n Registrar: TUCOWS DOMAINS INC.\n Whois Server: whois.tucows.com\n Referral URL: http://domainhelp.opensrs.net\n\n Domain Name: MICROSOFT.COM\n Registrar: MARKMONITOR INC.\n Whois Server: whois.markmonitor.com\n Referral URL: http://www.markmonitor.com\n Name Server: NS1.MSFT.NET\n Name Server: NS2.MSFT.NET\n Name Server: NS3.MSFT.NET\n Name Server: NS4.MSFT.NET\n Name Server: NS5.MSFT.NET\n Status: clientDeleteProhibited\n Status: clientTransferProhibited\n Status: clientUpdateProhibited\n Status: serverDeleteProhibited\n Status: serverTransferProhibited\n Status: serverUpdateProhibited\n Updated Date: 09-aug-2011\n Creation Date: 02-may-1991\n Expiration Date: 03-may-2021\n\n>>> Last update of whois database: Sat, 23 Nov 2013 14:25:01 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.markmonitor.com"], "registrar": ["MarkMonitor, Inc."], "creation_date": ["2011-08-09T13:02:58"], "id": ["2724960_DOMAIN_COM-VRSN"]}
\ No newline at end of file
diff --git a/test/target_normalized/mu.oz.au b/test/target_normalized/mu.oz.au
index 04cd2b3..b6cd8a7 100644
--- a/test/target_normalized/mu.oz.au
+++ b/test/target_normalized/mu.oz.au
@@ -1 +1 @@
-{"status": null, "updated_date": null, "contacts": {"admin": null, "tech": null, "registrant": null, "billing": null}, "expiration_date": null, "emails": null, "raw": ["No Data Found\n\n"], "whois_server": null, "registrar": null, "name_servers": null, "creation_date": null, "id": null}
\ No newline at end of file
+{"raw": ["No Data Found\n\n"], "contacts": {"admin": null, "tech": null, "registrant": null, "billing": null}}
\ No newline at end of file
diff --git a/test/target_normalized/nepasituation.com b/test/target_normalized/nepasituation.com
index 8bf550e..c7435c9 100644
--- a/test/target_normalized/nepasituation.com
+++ b/test/target_normalized/nepasituation.com
@@ -1 +1 @@
-{"status": ["Locked"], "updated_date": ["2013-09-21T00:00:00", "2013-11-23T13:48:16"], "contacts": {"admin": {"city": "Nobby Beach", "name": "Domain Admin", "phone": "+45.36946676", "state": "Queensland", "street": "ID#10760, PO Box 16\nNote - Visit PrivacyProtect.org to contact the domain owner/operator", "country": "AU", "postalcode": "QLD 4218", "organization": "PrivacyProtect.org", "email": "contact@privacyprotect.org"}, "tech": {"city": "Nobby Beach", "name": "Domain Admin", "phone": "+45.36946676", "state": "Queensland", "street": "ID#10760, PO Box 16\nNote - Visit PrivacyProtect.org to contact the domain owner/operator", "country": "AU", "postalcode": "QLD 4218", "organization": "PrivacyProtect.org", "email": "contact@privacyprotect.org"}, "registrant": {"city": "Nobby Beach", "name": "Domain Admin", "phone": "+45.36946676", "state": "Queensland", "street": "ID#10760, PO Box 16\nNote - Visit PrivacyProtect.org to contact the domain owner/operator", "country": "AU", "postalcode": "QLD 4218", "organization": "PrivacyProtect.org", "email": "contact@privacyprotect.org"}, "billing": {"city": "Nobby Beach", "name": "Domain Admin", "phone": "+45.36946676", "state": "Queensland", "street": "ID#10760, PO Box 16\nNote - Visit PrivacyProtect.org to contact the domain owner/operator", "country": "AU", "postalcode": "QLD 4218", "organization": "PrivacyProtect.org", "email": "contact@privacyprotect.org"}}, "expiration_date": ["2014-10-25T00:00:00"], "id": null, "creation_date": ["2011-10-25T00:00:00"], "raw": ["Registration Service Provided By: WHOIS.COM\n\nDomain Name: NEPASITUATION.COM\n\n Registration Date: 25-Oct-2011 \n Expiration Date: 25-Oct-2014 \n\n Status:LOCKED\n\tNote: This Domain Name is currently Locked. \n\tThis feature is provided to protect against fraudulent acquisition of the domain name, \n\tas in this status the domain name cannot be transferred or modified. \n\n Name Servers: \n ns1.whois.com\n ns2.whois.com\n ns3.whois.com\n ns4.whois.com\n \n\n Registrant Contact Details:\n PrivacyProtect.org\n Domain Admin (contact@privacyprotect.org)\n ID#10760, PO Box 16\n Note - Visit PrivacyProtect.org to contact the domain owner/operator\n Nobby Beach\n Queensland,QLD 4218\n AU\n Tel. +45.36946676\n\n Administrative Contact Details: \n PrivacyProtect.org\n Domain Admin (contact@privacyprotect.org)\n ID#10760, PO Box 16\n Note - Visit PrivacyProtect.org to contact the domain owner/operator\n Nobby Beach\n Queensland,QLD 4218\n AU\n Tel. +45.36946676 \n\n Technical Contact Details: \n PrivacyProtect.org\n Domain Admin (contact@privacyprotect.org)\n ID#10760, PO Box 16\n Note - Visit PrivacyProtect.org to contact the domain owner/operator\n Nobby Beach\n Queensland,QLD 4218\n AU\n Tel. +45.36946676 \n\n Billing Contact Details: \n PrivacyProtect.org\n Domain Admin (contact@privacyprotect.org)\n ID#10760, PO Box 16\n Note - Visit PrivacyProtect.org to contact the domain owner/operator\n Nobby Beach\n Queensland,QLD 4218\n AU\n Tel. +45.36946676 \n \nPRIVACYPROTECT.ORG is providing privacy protection services to this domain name to \nprotect the owner from spam and phishing attacks. PrivacyProtect.org is not \nresponsible for any of the activities associated with this domain name. If you wish \nto report any abuse concerning the usage of this domain name, you may do so at \nhttp://privacyprotect.org/contact. We have a stringent abuse policy and any \ncomplaint will be actioned within a short period of time.\n\nThe data in this whois database is provided to you for information purposes \nonly, that is, to assist you in obtaining information about or related to a \ndomain name registration record. We make this information available \"as is\",\nand do not guarantee its accuracy. By submitting a whois query, you agree \nthat you will use this data only for lawful purposes and that, under no \ncircumstances will you use this data to: \n(1) enable high volume, automated, electronic processes that stress or load \nthis whois database system providing you this information; or \n(2) allow, enable, or otherwise support the transmission of mass unsolicited, \ncommercial advertising or solicitations via direct mail, electronic mail, or \nby telephone. \nThe compilation, repackaging, dissemination or other use of this data is \nexpressly prohibited without prior written consent from us. The Registrar of \nrecord is PDR Ltd. d/b/a PublicDomainRegistry.com. \nWe reserve the right to modify these terms at any time. \nBy submitting this query, you agree to abide by these terms.\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: NEPASITUATION.COM\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n Name Server: NS1.WHOIS.COM\n Name Server: NS2.WHOIS.COM\n Name Server: NS3.WHOIS.COM\n Name Server: NS4.WHOIS.COM\n Status: clientTransferProhibited\n Updated Date: 21-sep-2013\n Creation Date: 25-oct-2011\n Expiration Date: 25-oct-2014\n\n>>> Last update of whois database: Sat, 23 Nov 2013 13:48:16 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.publicdomainregistry.com"], "registrar": ["Whois.com"], "name_servers": ["ns1.whois.com", "ns2.whois.com", "ns3.whois.com", "ns4.whois.com"], "emails": []}
\ No newline at end of file
+{"status": ["Locked"], "updated_date": ["2013-09-21T00:00:00", "2013-11-23T13:48:16"], "contacts": {"admin": {"city": "Nobby Beach", "name": "Domain Admin", "phone": "+45.36946676", "state": "Queensland", "street": "ID#10760, PO Box 16\nNote - Visit PrivacyProtect.org to contact the domain owner/operator", "country": "AU", "postalcode": "QLD 4218", "organization": "PrivacyProtect.org", "email": "contact@privacyprotect.org"}, "tech": {"city": "Nobby Beach", "name": "Domain Admin", "phone": "+45.36946676", "state": "Queensland", "street": "ID#10760, PO Box 16\nNote - Visit PrivacyProtect.org to contact the domain owner/operator", "country": "AU", "postalcode": "QLD 4218", "organization": "PrivacyProtect.org", "email": "contact@privacyprotect.org"}, "registrant": {"city": "Nobby Beach", "name": "Domain Admin", "phone": "+45.36946676", "state": "Queensland", "street": "ID#10760, PO Box 16\nNote - Visit PrivacyProtect.org to contact the domain owner/operator", "country": "AU", "postalcode": "QLD 4218", "organization": "PrivacyProtect.org", "email": "contact@privacyprotect.org"}, "billing": {"city": "Nobby Beach", "name": "Domain Admin", "phone": "+45.36946676", "state": "Queensland", "street": "ID#10760, PO Box 16\nNote - Visit PrivacyProtect.org to contact the domain owner/operator", "country": "AU", "postalcode": "QLD 4218", "organization": "PrivacyProtect.org", "email": "contact@privacyprotect.org"}}, "nameservers": ["ns1.whois.com", "ns2.whois.com", "ns3.whois.com", "ns4.whois.com"], "expiration_date": ["2014-10-25T00:00:00"], "creation_date": ["2011-10-25T00:00:00"], "raw": ["Registration Service Provided By: WHOIS.COM\n\nDomain Name: NEPASITUATION.COM\n\n Registration Date: 25-Oct-2011 \n Expiration Date: 25-Oct-2014 \n\n Status:LOCKED\n\tNote: This Domain Name is currently Locked. \n\tThis feature is provided to protect against fraudulent acquisition of the domain name, \n\tas in this status the domain name cannot be transferred or modified. \n\n Name Servers: \n ns1.whois.com\n ns2.whois.com\n ns3.whois.com\n ns4.whois.com\n \n\n Registrant Contact Details:\n PrivacyProtect.org\n Domain Admin (contact@privacyprotect.org)\n ID#10760, PO Box 16\n Note - Visit PrivacyProtect.org to contact the domain owner/operator\n Nobby Beach\n Queensland,QLD 4218\n AU\n Tel. +45.36946676\n\n Administrative Contact Details: \n PrivacyProtect.org\n Domain Admin (contact@privacyprotect.org)\n ID#10760, PO Box 16\n Note - Visit PrivacyProtect.org to contact the domain owner/operator\n Nobby Beach\n Queensland,QLD 4218\n AU\n Tel. +45.36946676 \n\n Technical Contact Details: \n PrivacyProtect.org\n Domain Admin (contact@privacyprotect.org)\n ID#10760, PO Box 16\n Note - Visit PrivacyProtect.org to contact the domain owner/operator\n Nobby Beach\n Queensland,QLD 4218\n AU\n Tel. +45.36946676 \n\n Billing Contact Details: \n PrivacyProtect.org\n Domain Admin (contact@privacyprotect.org)\n ID#10760, PO Box 16\n Note - Visit PrivacyProtect.org to contact the domain owner/operator\n Nobby Beach\n Queensland,QLD 4218\n AU\n Tel. +45.36946676 \n \nPRIVACYPROTECT.ORG is providing privacy protection services to this domain name to \nprotect the owner from spam and phishing attacks. PrivacyProtect.org is not \nresponsible for any of the activities associated with this domain name. If you wish \nto report any abuse concerning the usage of this domain name, you may do so at \nhttp://privacyprotect.org/contact. We have a stringent abuse policy and any \ncomplaint will be actioned within a short period of time.\n\nThe data in this whois database is provided to you for information purposes \nonly, that is, to assist you in obtaining information about or related to a \ndomain name registration record. We make this information available \"as is\",\nand do not guarantee its accuracy. By submitting a whois query, you agree \nthat you will use this data only for lawful purposes and that, under no \ncircumstances will you use this data to: \n(1) enable high volume, automated, electronic processes that stress or load \nthis whois database system providing you this information; or \n(2) allow, enable, or otherwise support the transmission of mass unsolicited, \ncommercial advertising or solicitations via direct mail, electronic mail, or \nby telephone. \nThe compilation, repackaging, dissemination or other use of this data is \nexpressly prohibited without prior written consent from us. The Registrar of \nrecord is PDR Ltd. d/b/a PublicDomainRegistry.com. \nWe reserve the right to modify these terms at any time. \nBy submitting this query, you agree to abide by these terms.\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: NEPASITUATION.COM\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n Name Server: NS1.WHOIS.COM\n Name Server: NS2.WHOIS.COM\n Name Server: NS3.WHOIS.COM\n Name Server: NS4.WHOIS.COM\n Status: clientTransferProhibited\n Updated Date: 21-sep-2013\n Creation Date: 25-oct-2011\n Expiration Date: 25-oct-2014\n\n>>> Last update of whois database: Sat, 23 Nov 2013 13:48:16 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.publicdomainregistry.com"], "registrar": ["Whois.com"]}
\ No newline at end of file
diff --git a/test/target_normalized/nic.pw b/test/target_normalized/nic.pw
index cce94c4..c26f845 100644
--- a/test/target_normalized/nic.pw
+++ b/test/target_normalized/nic.pw
@@ -1 +1 @@
-{"status": ["OK"], "updated_date": ["2013-04-30T15:06:57"], "contacts": {"admin": {"city": "N/a", "handle": "H2661317", "name": "Registry Manager", "state": "N/a", "street": "N/A", "country": "PW", "postalcode": "N/A", "organization": ".PW Registry", "email": "contact@registry.pw"}, "tech": {"city": "N/a", "handle": "H2661317", "name": "Registry Manager", "state": "N/a", "street": "N/A", "country": "PW", "postalcode": "N/A", "organization": ".PW Registry", "email": "contact@registry.pw"}, "registrant": {"city": "N/a", "handle": "H2661317", "name": "Registry Manager", "state": "N/a", "street": "N/A", "country": "PW", "postalcode": "N/A", "organization": ".PW Registry", "email": "contact@registry.pw"}, "billing": {"city": "N/a", "handle": "H2661317", "name": "Registry Manager", "state": "N/a", "street": "N/A", "country": "PW", "postalcode": "N/A", "organization": ".PW Registry", "email": "contact@registry.pw"}}, "expiration_date": ["2020-01-01T23:59:59"], "emails": [], "raw": ["This whois service is provided by CentralNic Ltd and only contains\ninformation pertaining to Internet domain names we have registered for\nour customers. By using this service you are agreeing (1) not to use any\ninformation presented here for any purpose other than determining\nownership of domain names, (2) not to store or reproduce this data in \nany way, (3) not to use any high-volume, automated, electronic processes\nto obtain data from this service. Abuse of this service is monitored and\nactions in contravention of these terms will result in being permanently\nblacklisted. All data is (c) CentralNic Ltd https://www.centralnic.com/\n\nDomain ID:CNIC-DO949898\nDomain Name:NIC.PW\nCreated On:2012-10-12T10:19:46.0Z\nLast Updated On:2013-04-30T15:06:57.0Z\nExpiration Date:2020-01-01T23:59:59.0Z\nStatus:OK\nRegistrant ID:H2661317\nRegistrant Name:Registry Manager\nRegistrant Organization:.PW Registry\nRegistrant Street1:N/A\nRegistrant City:N/A\nRegistrant State/Province:N/A\nRegistrant Postal Code:N/A\nRegistrant Country:PW\nRegistrant Phone:\nRegistrant Email:contact@registry.pw\nAdmin ID:H2661317\nAdmin Name:Registry Manager\nAdmin Organization:.PW Registry\nAdmin Street1:N/A\nAdmin City:N/A\nAdmin State/Province:N/A\nAdmin Postal Code:N/A\nAdmin Country:PW\nAdmin Phone:\nAdmin Email:contact@registry.pw\nTech ID:H2661317\nTech Name:Registry Manager\nTech Organization:.PW Registry\nTech Street1:N/A\nTech City:N/A\nTech State/Province:N/A\nTech Postal Code:N/A\nTech Country:PW\nTech Phone:\nTech Email:contact@registry.pw\nBilling ID:H2661317\nBilling Name:Registry Manager\nBilling Organization:.PW Registry\nBilling Street1:N/A\nBilling City:N/A\nBilling State/Province:N/A\nBilling Postal Code:N/A\nBilling Country:PW\nBilling Phone:\nBilling Email:contact@registry.pw\nSponsoring Registrar ID:H2661317\nSponsoring Registrar Organization:.PW Registry\nSponsoring Registrar Street1:N/A\nSponsoring Registrar City:N/A\nSponsoring Registrar State/Province:N/A\nSponsoring Registrar Postal Code:N/A\nSponsoring Registrar Country:PW\nSponsoring Registrar Phone:N/A\nSponsoring Registrar Website:http://www.registry.pw\nName Server:NS0.CENTRALNIC-DNS.COM\nName Server:NS1.CENTRALNIC-DNS.COM\nName Server:NS2.CENTRALNIC-DNS.COM\nName Server:NS3.CENTRALNIC-DNS.COM\nName Server:NS4.CENTRALNIC-DNS.COM\nName Server:NS5.CENTRALNIC-DNS.COM\nDNSSEC:Unsigned\n\n\n\n"], "whois_server": null, "registrar": [".PW Registry"], "name_servers": ["ns0.centralnic-dns.com", "ns1.centralnic-dns.com", "ns2.centralnic-dns.com", "ns3.centralnic-dns.com", "ns4.centralnic-dns.com", "ns5.centralnic-dns.com"], "creation_date": ["2012-10-12T10:19:46", "2012-10-12T10:19:46", "2012-10-12T10:19:46"], "id": ["CNIC-DO949898"]}
\ No newline at end of file
+{"status": ["OK"], "updated_date": ["2013-04-30T15:06:57"], "contacts": {"admin": {"city": "N/a", "handle": "H2661317", "name": "Registry Manager", "state": "N/a", "street": "N/A", "country": "PW", "postalcode": "N/A", "organization": ".PW Registry", "email": "contact@registry.pw"}, "tech": {"city": "N/a", "handle": "H2661317", "name": "Registry Manager", "state": "N/a", "street": "N/A", "country": "PW", "postalcode": "N/A", "organization": ".PW Registry", "email": "contact@registry.pw"}, "registrant": {"city": "N/a", "handle": "H2661317", "name": "Registry Manager", "state": "N/a", "street": "N/A", "country": "PW", "postalcode": "N/A", "organization": ".PW Registry", "email": "contact@registry.pw"}, "billing": {"city": "N/a", "handle": "H2661317", "name": "Registry Manager", "state": "N/a", "street": "N/A", "country": "PW", "postalcode": "N/A", "organization": ".PW Registry", "email": "contact@registry.pw"}}, "nameservers": ["ns0.centralnic-dns.com", "ns1.centralnic-dns.com", "ns2.centralnic-dns.com", "ns3.centralnic-dns.com", "ns4.centralnic-dns.com", "ns5.centralnic-dns.com"], "expiration_date": ["2020-01-01T23:59:59"], "raw": ["This whois service is provided by CentralNic Ltd and only contains\ninformation pertaining to Internet domain names we have registered for\nour customers. By using this service you are agreeing (1) not to use any\ninformation presented here for any purpose other than determining\nownership of domain names, (2) not to store or reproduce this data in \nany way, (3) not to use any high-volume, automated, electronic processes\nto obtain data from this service. Abuse of this service is monitored and\nactions in contravention of these terms will result in being permanently\nblacklisted. All data is (c) CentralNic Ltd https://www.centralnic.com/\n\nDomain ID:CNIC-DO949898\nDomain Name:NIC.PW\nCreated On:2012-10-12T10:19:46.0Z\nLast Updated On:2013-04-30T15:06:57.0Z\nExpiration Date:2020-01-01T23:59:59.0Z\nStatus:OK\nRegistrant ID:H2661317\nRegistrant Name:Registry Manager\nRegistrant Organization:.PW Registry\nRegistrant Street1:N/A\nRegistrant City:N/A\nRegistrant State/Province:N/A\nRegistrant Postal Code:N/A\nRegistrant Country:PW\nRegistrant Phone:\nRegistrant Email:contact@registry.pw\nAdmin ID:H2661317\nAdmin Name:Registry Manager\nAdmin Organization:.PW Registry\nAdmin Street1:N/A\nAdmin City:N/A\nAdmin State/Province:N/A\nAdmin Postal Code:N/A\nAdmin Country:PW\nAdmin Phone:\nAdmin Email:contact@registry.pw\nTech ID:H2661317\nTech Name:Registry Manager\nTech Organization:.PW Registry\nTech Street1:N/A\nTech City:N/A\nTech State/Province:N/A\nTech Postal Code:N/A\nTech Country:PW\nTech Phone:\nTech Email:contact@registry.pw\nBilling ID:H2661317\nBilling Name:Registry Manager\nBilling Organization:.PW Registry\nBilling Street1:N/A\nBilling City:N/A\nBilling State/Province:N/A\nBilling Postal Code:N/A\nBilling Country:PW\nBilling Phone:\nBilling Email:contact@registry.pw\nSponsoring Registrar ID:H2661317\nSponsoring Registrar Organization:.PW Registry\nSponsoring Registrar Street1:N/A\nSponsoring Registrar City:N/A\nSponsoring Registrar State/Province:N/A\nSponsoring Registrar Postal Code:N/A\nSponsoring Registrar Country:PW\nSponsoring Registrar Phone:N/A\nSponsoring Registrar Website:http://www.registry.pw\nName Server:NS0.CENTRALNIC-DNS.COM\nName Server:NS1.CENTRALNIC-DNS.COM\nName Server:NS2.CENTRALNIC-DNS.COM\nName Server:NS3.CENTRALNIC-DNS.COM\nName Server:NS4.CENTRALNIC-DNS.COM\nName Server:NS5.CENTRALNIC-DNS.COM\nDNSSEC:Unsigned\n\n\n\n"], "registrar": [".PW Registry"], "creation_date": ["2012-10-12T10:19:46", "2012-10-12T10:19:46", "2012-10-12T10:19:46"], "id": ["CNIC-DO949898"]}
\ No newline at end of file
diff --git a/test/target_normalized/nic.ru b/test/target_normalized/nic.ru
index fb248c7..ac14124 100644
--- a/test/target_normalized/nic.ru
+++ b/test/target_normalized/nic.ru
@@ -1 +1 @@
-{"status": ["Registered, Delegated, Verified"], "updated_date": ["2013-11-20T08:41:39"], "contacts": {"admin": null, "tech": null, "registrant": {"organization": "Jsc 'ru-center'"}, "billing": null}, "expiration_date": ["2013-12-01T00:00:00"], "emails": null, "creation_date": ["1997-11-28T00:00:00"], "raw": ["% By submitting a query to RIPN's Whois Service\n% you agree to abide by the following terms of use:\n% http://www.ripn.net/about/servpol.html#3.2 (in Russian) \n% http://www.ripn.net/about/en/servpol.html#3.2 (in English).\n\ndomain: NIC.RU\nnserver: ns4-cloud.nic.ru. 195.253.65.2, 2a01:5b0:5::2\nnserver: ns5.nic.ru. 31.177.67.100, 2a02:2090:e800:9000:31:177:67:100\nnserver: ns6.nic.ru. 31.177.74.100, 2a02:2090:ec00:9040:31:177:74:100\nnserver: ns7.nic.ru. 31.177.71.100, 2a02:2090:ec00:9000:31:177:71:100\nnserver: ns8-cloud.nic.ru. 195.253.64.10, 2a01:5b0:4::a\nstate: REGISTERED, DELEGATED, VERIFIED\norg: JSC 'RU-CENTER'\nregistrar: RU-CENTER-REG-RIPN\nadmin-contact: https://www.nic.ru/whois\ncreated: 1997.11.28\npaid-till: 2013.12.01\nfree-date: 2014.01.01\nsource: TCI\n\nLast updated on 2013.11.20 08:41:39 MSK\n\n"], "whois_server": null, "registrar": ["Ru-center-reg-ripn"], "name_servers": ["ns4-cloud.nic.ru", "ns5.nic.ru", "ns6.nic.ru", "ns7.nic.ru", "ns8-cloud.nic.ru"], "id": null}
\ No newline at end of file
+{"status": ["Registered, Delegated, Verified"], "updated_date": ["2013-11-20T08:41:39"], "contacts": {"admin": null, "tech": null, "registrant": {"organization": "Jsc 'ru-center'"}, "billing": null}, "nameservers": ["ns4-cloud.nic.ru", "ns5.nic.ru", "ns6.nic.ru", "ns7.nic.ru", "ns8-cloud.nic.ru"], "expiration_date": ["2013-12-01T00:00:00"], "creation_date": ["1997-11-28T00:00:00"], "raw": ["% By submitting a query to RIPN's Whois Service\n% you agree to abide by the following terms of use:\n% http://www.ripn.net/about/servpol.html#3.2 (in Russian) \n% http://www.ripn.net/about/en/servpol.html#3.2 (in English).\n\ndomain: NIC.RU\nnserver: ns4-cloud.nic.ru. 195.253.65.2, 2a01:5b0:5::2\nnserver: ns5.nic.ru. 31.177.67.100, 2a02:2090:e800:9000:31:177:67:100\nnserver: ns6.nic.ru. 31.177.74.100, 2a02:2090:ec00:9040:31:177:74:100\nnserver: ns7.nic.ru. 31.177.71.100, 2a02:2090:ec00:9000:31:177:71:100\nnserver: ns8-cloud.nic.ru. 195.253.64.10, 2a01:5b0:4::a\nstate: REGISTERED, DELEGATED, VERIFIED\norg: JSC 'RU-CENTER'\nregistrar: RU-CENTER-REG-RIPN\nadmin-contact: https://www.nic.ru/whois\ncreated: 1997.11.28\npaid-till: 2013.12.01\nfree-date: 2014.01.01\nsource: TCI\n\nLast updated on 2013.11.20 08:41:39 MSK\n\n"], "registrar": ["Ru-center-reg-ripn"]}
\ No newline at end of file
diff --git a/test/target_normalized/nominet.org.uk b/test/target_normalized/nominet.org.uk
index 7b4474a..db5239e 100644
--- a/test/target_normalized/nominet.org.uk
+++ b/test/target_normalized/nominet.org.uk
@@ -1 +1 @@
-{"updated_date": ["2013-02-06T00:00:00"], "status": null, "contacts": {"admin": null, "tech": null, "registrant": {"city": "Oxford", "name": "Nominet UK", "state": "Oxon", "street": "Minerva House\nEdmund Halley Road\nOxford Science Park", "country": "United Kingdom", "postalcode": "OX4 4DQ"}, "billing": null}, "expiration_date": null, "emails": null, "creation_date": null, "raw": ["\n Domain name:\n nominet.org.uk\n\n Registrant:\n Nominet UK\n\n Registrant type:\n UK Limited Company, (Company number: 3203859)\n\n Registrant's address:\n Minerva House\n Edmund Halley Road\n Oxford Science Park\n Oxford\n Oxon\n OX4 4DQ\n United Kingdom\n\n Registrar:\n No registrar listed. This domain is registered directly with Nominet.\n\n Relevant dates:\n Registered on: before Aug-1996\n Last updated: 06-Feb-2013\n\n Registration status:\n No registration status listed.\n\n Name servers:\n nom-ns1.nominet.org.uk 213.248.199.16\n nom-ns2.nominet.org.uk 195.66.240.250 2a01:40:1001:37::2\n nom-ns3.nominet.org.uk 213.219.13.194\n\n DNSSEC:\n Signed\n\n WHOIS lookup made at 14:56:34 23-Nov-2013\n\n-- \nThis WHOIS information is provided for free by Nominet UK the central registry\nfor .uk domain names. This information and the .uk WHOIS are:\n\n Copyright Nominet UK 1996 - 2013.\n\nYou may not access the .uk WHOIS or use any data from it except as permitted\nby the terms of use available in full at http://www.nominet.org.uk/whoisterms, which\nincludes restrictions on: (A) use of the data for advertising, or its\nrepackaging, recompilation, redistribution or reuse (B) obscuring, removing\nor hiding any or all of this notice and (C) exceeding query rate or volume\nlimits. The data is provided on an 'as-is' basis and may lag behind the\nregister. Access may be withdrawn or restricted at any time. \n\n"], "whois_server": null, "registrar": ["No registrar listed. This domain is registered directly with Nominet."], "name_servers": ["nom-ns1.nominet.org.uk", "nom-ns2.nominet.org.uk", "nom-ns3.nominet.org.uk"], "id": null}
\ No newline at end of file
+{"updated_date": ["2013-02-06T00:00:00"], "contacts": {"admin": null, "tech": null, "registrant": {"city": "Oxford", "name": "Nominet UK", "state": "Oxon", "street": "Minerva House\nEdmund Halley Road\nOxford Science Park", "country": "United Kingdom", "postalcode": "OX4 4DQ"}, "billing": null}, "nameservers": ["nom-ns1.nominet.org.uk", "nom-ns2.nominet.org.uk", "nom-ns3.nominet.org.uk"], "creation_date": null, "raw": ["\n Domain name:\n nominet.org.uk\n\n Registrant:\n Nominet UK\n\n Registrant type:\n UK Limited Company, (Company number: 3203859)\n\n Registrant's address:\n Minerva House\n Edmund Halley Road\n Oxford Science Park\n Oxford\n Oxon\n OX4 4DQ\n United Kingdom\n\n Registrar:\n No registrar listed. This domain is registered directly with Nominet.\n\n Relevant dates:\n Registered on: before Aug-1996\n Last updated: 06-Feb-2013\n\n Registration status:\n No registration status listed.\n\n Name servers:\n nom-ns1.nominet.org.uk 213.248.199.16\n nom-ns2.nominet.org.uk 195.66.240.250 2a01:40:1001:37::2\n nom-ns3.nominet.org.uk 213.219.13.194\n\n DNSSEC:\n Signed\n\n WHOIS lookup made at 14:56:34 23-Nov-2013\n\n-- \nThis WHOIS information is provided for free by Nominet UK the central registry\nfor .uk domain names. This information and the .uk WHOIS are:\n\n Copyright Nominet UK 1996 - 2013.\n\nYou may not access the .uk WHOIS or use any data from it except as permitted\nby the terms of use available in full at http://www.nominet.org.uk/whoisterms, which\nincludes restrictions on: (A) use of the data for advertising, or its\nrepackaging, recompilation, redistribution or reuse (B) obscuring, removing\nor hiding any or all of this notice and (C) exceeding query rate or volume\nlimits. The data is provided on an 'as-is' basis and may lag behind the\nregister. Access may be withdrawn or restricted at any time. \n\n"], "registrar": ["No registrar listed. This domain is registered directly with Nominet."]}
\ No newline at end of file
diff --git a/test/target_normalized/nsa.gov b/test/target_normalized/nsa.gov
index e946964..df69f4e 100644
--- a/test/target_normalized/nsa.gov
+++ b/test/target_normalized/nsa.gov
@@ -1 +1 @@
-{"status": ["Active"], "updated_date": null, "contacts": {"admin": null, "tech": null, "registrant": null, "billing": null}, "expiration_date": null, "emails": null, "raw": ["% DOTGOV WHOIS Server ready\n Domain Name: NSA.GOV\n Status: ACTIVE\n\n\n>>> Last update of whois database: 2013-11-20T04:13:55Z <<<\nPlease be advised that this whois server only contains information pertaining\nto the .GOV domain. For information for other domains please use the whois\nserver at RS.INTERNIC.NET. \n\n"], "whois_server": null, "registrar": null, "name_servers": null, "creation_date": null, "id": null}
\ No newline at end of file
+{"status": ["Active"], "raw": ["% DOTGOV WHOIS Server ready\n Domain Name: NSA.GOV\n Status: ACTIVE\n\n\n>>> Last update of whois database: 2013-11-20T04:13:55Z <<<\nPlease be advised that this whois server only contains information pertaining\nto the .GOV domain. For information for other domains please use the whois\nserver at RS.INTERNIC.NET. \n\n"], "contacts": {"admin": null, "tech": null, "registrant": null, "billing": null}}
\ No newline at end of file
diff --git a/test/target_normalized/nytimes.com b/test/target_normalized/nytimes.com
index 6cca317..e5322a1 100644
--- a/test/target_normalized/nytimes.com
+++ b/test/target_normalized/nytimes.com
@@ -1 +1 @@
-{"status": ["serverDeleteProhibited", "serverTransferProhibited", "serverUpdateProhibited"], "updated_date": ["2013-08-27T00:00:00", "2013-11-23T14:47:40"], "contacts": {"admin": {"city": "New York", "fax": "+1.2125561234", "name": "Ellen Herb", "phone": "+1.2125561234", "state": "NY", "street": "620 8th Avenue", "country": "United States", "postalcode": "10018", "email": "hostmaster@nytimes.com"}, "tech": {"city": "New York", "fax": "+1.1231231234", "name": "New York Times Digital", "phone": "+1.2125561234", "state": "NY", "street": "229 West 43d Street", "country": "United States", "postalcode": "10036", "email": "hostmaster@nytimes.com"}, "registrant": {"city": "New York", "name": "New York Times Digital", "state": "NY", "street": "620 8th Avenue", "country": "United States", "postalcode": "10018"}, "billing": null}, "expiration_date": ["2014-01-19T00:00:00"], "id": null, "creation_date": ["1994-01-18T00:00:00"], "raw": ["\nDomain Name.......... nytimes.com\n Creation Date........ 1994-01-18\n Registration Date.... 2011-08-31\n Expiry Date.......... 2014-01-20\n Organisation Name.... New York Times Digital\n Organisation Address. 620 8th Avenue\n Organisation Address. \n Organisation Address. \n Organisation Address. New York\n Organisation Address. 10018\n Organisation Address. NY\n Organisation Address. UNITED STATES\n\nAdmin Name........... Ellen Herb\n Admin Address........ 620 8th Avenue\n Admin Address........ \n Admin Address........ \n Admin Address. NEW YORK\n Admin Address........ 10018\n Admin Address........ NY\n Admin Address........ UNITED STATES\n Admin Email.......... hostmaster@nytimes.com\n Admin Phone.......... +1.2125561234\n Admin Fax............ +1.2125561234\n\nTech Name............ NEW YORK TIMES DIGITAL\n Tech Address......... 229 West 43d Street\n Tech Address......... \n Tech Address......... \n Tech Address......... New York\n Tech Address......... 10036\n Tech Address......... NY\n Tech Address......... UNITED STATES\n Tech Email........... hostmaster@nytimes.com\n Tech Phone........... +1.2125561234\n Tech Fax............. +1.1231231234\n Name Server.......... DNS.EWR1.NYTIMES.COM\n Name Server.......... DNS.SEA1.NYTIMES.COM\n\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Server Name: NYTIMES.COM\n IP Address: 141.105.64.37\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n\n Domain Name: NYTIMES.COM\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n Name Server: DNS.EWR1.NYTIMES.COM\n Name Server: DNS.SEA1.NYTIMES.COM\n Status: serverDeleteProhibited\n Status: serverTransferProhibited\n Status: serverUpdateProhibited\n Updated Date: 27-aug-2013\n Creation Date: 18-jan-1994\n Expiration Date: 19-jan-2014\n\n>>> Last update of whois database: Sat, 23 Nov 2013 14:47:40 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.melbourneit.com", "whois.melbourneit.com"], "registrar": ["Melbourne It, Ltd. D/b/a Internet Names Worldwide"], "name_servers": ["dns.ewr1.nytimes.com", "dns.sea1.nytimes.com"], "emails": []}
\ No newline at end of file
+{"status": ["serverDeleteProhibited", "serverTransferProhibited", "serverUpdateProhibited"], "updated_date": ["2013-08-27T00:00:00", "2013-11-23T14:47:40"], "contacts": {"admin": {"city": "New York", "fax": "+1.2125561234", "name": "Ellen Herb", "phone": "+1.2125561234", "state": "NY", "street": "620 8th Avenue", "country": "United States", "postalcode": "10018", "email": "hostmaster@nytimes.com"}, "tech": {"city": "New York", "fax": "+1.1231231234", "name": "New York Times Digital", "phone": "+1.2125561234", "state": "NY", "street": "229 West 43d Street", "country": "United States", "postalcode": "10036", "email": "hostmaster@nytimes.com"}, "registrant": {"city": "New York", "name": "New York Times Digital", "state": "NY", "street": "620 8th Avenue", "country": "United States", "postalcode": "10018"}, "billing": null}, "nameservers": ["dns.ewr1.nytimes.com", "dns.sea1.nytimes.com"], "expiration_date": ["2014-01-19T00:00:00"], "creation_date": ["1994-01-18T00:00:00"], "raw": ["\nDomain Name.......... nytimes.com\n Creation Date........ 1994-01-18\n Registration Date.... 2011-08-31\n Expiry Date.......... 2014-01-20\n Organisation Name.... New York Times Digital\n Organisation Address. 620 8th Avenue\n Organisation Address. \n Organisation Address. \n Organisation Address. New York\n Organisation Address. 10018\n Organisation Address. NY\n Organisation Address. UNITED STATES\n\nAdmin Name........... Ellen Herb\n Admin Address........ 620 8th Avenue\n Admin Address........ \n Admin Address........ \n Admin Address. NEW YORK\n Admin Address........ 10018\n Admin Address........ NY\n Admin Address........ UNITED STATES\n Admin Email.......... hostmaster@nytimes.com\n Admin Phone.......... +1.2125561234\n Admin Fax............ +1.2125561234\n\nTech Name............ NEW YORK TIMES DIGITAL\n Tech Address......... 229 West 43d Street\n Tech Address......... \n Tech Address......... \n Tech Address......... New York\n Tech Address......... 10036\n Tech Address......... NY\n Tech Address......... UNITED STATES\n Tech Email........... hostmaster@nytimes.com\n Tech Phone........... +1.2125561234\n Tech Fax............. +1.1231231234\n Name Server.......... DNS.EWR1.NYTIMES.COM\n Name Server.......... DNS.SEA1.NYTIMES.COM\n\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Server Name: NYTIMES.COM\n IP Address: 141.105.64.37\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n\n Domain Name: NYTIMES.COM\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n Name Server: DNS.EWR1.NYTIMES.COM\n Name Server: DNS.SEA1.NYTIMES.COM\n Status: serverDeleteProhibited\n Status: serverTransferProhibited\n Status: serverUpdateProhibited\n Updated Date: 27-aug-2013\n Creation Date: 18-jan-1994\n Expiration Date: 19-jan-2014\n\n>>> Last update of whois database: Sat, 23 Nov 2013 14:47:40 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.melbourneit.com", "whois.melbourneit.com"], "registrar": ["Melbourne It, Ltd. D/b/a Internet Names Worldwide"]}
\ No newline at end of file
diff --git a/test/target_normalized/oli.id.au b/test/target_normalized/oli.id.au
index c627446..8dbc037 100644
--- a/test/target_normalized/oli.id.au
+++ b/test/target_normalized/oli.id.au
@@ -1 +1 @@
-{"status": ["ok"], "updated_date": ["2013-11-03T02:04:00"], "contacts": {"admin": null, "tech": {"handle": "ID00182825-PR", "name": "Oliver Ransom"}, "registrant": {"handle": "ID00182825-PR", "name": "Oliver Ransom"}, "billing": null}, "expiration_date": null, "emails": null, "raw": ["Domain Name: oli.id.au\nLast Modified: 03-Nov-2013 02:04:00 UTC\nRegistrar ID: PlanetDomain\nRegistrar Name: PlanetDomain\nStatus: ok\n\nRegistrant: Oliver Ransom\nEligibility Type: Citizen/Resident\n\nRegistrant Contact ID: ID00182825-PR\nRegistrant Contact Name: Oliver Ransom\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: ID00182825-PR\nTech Contact Name: Oliver Ransom\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: ns1.r4ns.com\nName Server: ns2.r4ns.com\n\n"], "whois_server": null, "registrar": ["PlanetDomain"], "name_servers": ["ns1.r4ns.com", "ns2.r4ns.com"], "creation_date": null, "id": null}
\ No newline at end of file
+{"status": ["ok"], "updated_date": ["2013-11-03T02:04:00"], "contacts": {"admin": null, "tech": {"handle": "ID00182825-PR", "name": "Oliver Ransom"}, "registrant": {"handle": "ID00182825-PR", "name": "Oliver Ransom"}, "billing": null}, "nameservers": ["ns1.r4ns.com", "ns2.r4ns.com"], "raw": ["Domain Name: oli.id.au\nLast Modified: 03-Nov-2013 02:04:00 UTC\nRegistrar ID: PlanetDomain\nRegistrar Name: PlanetDomain\nStatus: ok\n\nRegistrant: Oliver Ransom\nEligibility Type: Citizen/Resident\n\nRegistrant Contact ID: ID00182825-PR\nRegistrant Contact Name: Oliver Ransom\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: ID00182825-PR\nTech Contact Name: Oliver Ransom\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: ns1.r4ns.com\nName Server: ns2.r4ns.com\n\n"], "registrar": ["PlanetDomain"]}
\ No newline at end of file
diff --git a/test/target_normalized/ovh.fr b/test/target_normalized/ovh.fr
index fcf7193..e87acaa 100644
--- a/test/target_normalized/ovh.fr
+++ b/test/target_normalized/ovh.fr
@@ -1 +1 @@
-{"status": ["Active", "ok"], "updated_date": ["2006-10-11T00:00:00", "2013-10-28T00:00:00", "2009-04-03T00:00:00"], "contacts": {"admin": {"fax": "+33 3 20 20 09 58", "handle": "OK62-FRNIC", "phone": "+33 3 20 20 09 57", "street": "Sarl Ovh\n140, quai du Sartel", "postalcode": "59100", "city": "Roubaix", "name": "Octave Klaba", "country": "FR", "type": "PERSON", "changedate": "2009-04-03T00:00:00"}, "tech": {"handle": "OVH5-FRNIC", "phone": "+33 8 99 70 17 61", "street": "OVH\n140, quai du Sartel", "postalcode": "59100", "city": "Roubaix", "name": "OVH NET", "country": "FR", "type": "ROLE", "email": "tech@ovh.net", "changedate": "2006-10-11T00:00:00"}, "registrant": {"fax": "+33 3 20 20 09 58", "handle": "SO255-FRNIC", "phone": "+33 8 99 70 17 61", "street": "140, Quai du Sartel", "postalcode": "59100", "city": "Roubaix", "name": "OVH SAS", "country": "FR", "type": "ORGANIZATION", "email": "oles@ovh.net", "changedate": "2013-10-28T00:00:00"}, "billing": null}, "expiration_date": null, "id": null, "creation_date": ["1999-11-12T00:00:00", "1999-10-21T00:00:00"], "raw": ["%%\n%% This is the AFNIC Whois server.\n%%\n%% complete date format : DD/MM/YYYY\n%% short date format : DD/MM\n%% version : FRNIC-2.5\n%%\n%% Rights restricted by copyright.\n%% See http://www.afnic.fr/afnic/web/mentions-legales-whois_en\n%%\n%% Use '-h' option to obtain more information about this service.\n%%\n%% [77.162.55.23 REQUEST] >> -V Md5.0 ovh.fr\n%%\n%% RL Net [##########] - RL IP [#########.]\n%%\n\ndomain: ovh.fr\nstatus: ACTIVE\nhold: NO\nholder-c: SO255-FRNIC\nadmin-c: OK62-FRNIC\ntech-c: OVH5-FRNIC\nzone-c: NFC1-FRNIC\nnsl-id: NSL16790-FRNIC\nregistrar: OVH\nanniversary: 12/11\ncreated: 12/11/1999\nlast-update: 03/04/2009\nsource: FRNIC\n\nns-list: NSL16790-FRNIC\nnserver: dns.ovh.net\nnserver: dns10.ovh.net\nnserver: ns.ovh.net\nnserver: ns10.ovh.net\nsource: FRNIC\n\nregistrar: OVH\ntype: Isp Option 1\naddress: 2 Rue Kellermann\naddress: ROUBAIX\ncountry: FR\nphone: +33 8 99 70 17 61\nfax-no: +33 3 20 20 09 58\ne-mail: support@ovh.net\nwebsite: http://www.ovh.com\nanonymous: NO\nregistered: 21/10/1999\nsource: FRNIC\n\nnic-hdl: OVH5-FRNIC\ntype: ROLE\ncontact: OVH NET\naddress: OVH\naddress: 140, quai du Sartel\naddress: 59100 Roubaix\ncountry: FR\nphone: +33 8 99 70 17 61\ne-mail: tech@ovh.net\ntrouble: Information: http://www.ovh.fr\ntrouble: Questions: mailto:tech@ovh.net\ntrouble: Spam: mailto:abuse@ovh.net\nadmin-c: OK217-FRNIC\ntech-c: OK217-FRNIC\nnotify: tech@ovh.net\nregistrar: OVH\nchanged: 11/10/2006 tech@ovh.net\nanonymous: NO\nobsoleted: NO\nsource: FRNIC\n\nnic-hdl: SO255-FRNIC\ntype: ORGANIZATION\ncontact: OVH SAS\naddress: 140, quai du sartel\naddress: 59100 Roubaix\ncountry: FR\nphone: +33 8 99 70 17 61\nfax-no: +33 3 20 20 09 58\ne-mail: oles@ovh.net\nregistrar: OVH\nchanged: 28/10/2013 nic@nic.fr\nanonymous: NO\nobsoleted: NO\neligstatus: ok\neligdate: 01/09/2011 12:03:35\nsource: FRNIC\n\nnic-hdl: OK62-FRNIC\ntype: PERSON\ncontact: Octave Klaba\naddress: Sarl Ovh\naddress: 140, quai du Sartel\naddress: 59100 Roubaix\ncountry: FR\nphone: +33 3 20 20 09 57\nfax-no: +33 3 20 20 09 58\nregistrar: OVH\nchanged: 03/04/2009 nic@nic.fr\nanonymous: NO\nobsoleted: NO\nsource: FRNIC\n"], "whois_server": null, "registrar": ["OVH"], "name_servers": ["dns.ovh.net", "dns10.ovh.net", "ns.ovh.net", "ns10.ovh.net"], "emails": ["support@ovh.net", "abuse@ovh.net", "nic@nic.fr"]}
\ No newline at end of file
+{"status": ["Active", "ok"], "updated_date": ["2006-10-11T00:00:00", "2013-10-28T00:00:00", "2009-04-03T00:00:00"], "contacts": {"admin": {"fax": "+33 3 20 20 09 58", "handle": "OK62-FRNIC", "phone": "+33 3 20 20 09 57", "street": "Sarl Ovh\n140, quai du Sartel", "postalcode": "59100", "city": "Roubaix", "name": "Octave Klaba", "country": "FR", "type": "PERSON", "changedate": "2009-04-03T00:00:00"}, "tech": {"handle": "OVH5-FRNIC", "phone": "+33 8 99 70 17 61", "street": "OVH\n140, quai du Sartel", "postalcode": "59100", "city": "Roubaix", "name": "OVH NET", "country": "FR", "type": "ROLE", "email": "tech@ovh.net", "changedate": "2006-10-11T00:00:00"}, "registrant": {"fax": "+33 3 20 20 09 58", "handle": "SO255-FRNIC", "phone": "+33 8 99 70 17 61", "street": "140, Quai du Sartel", "postalcode": "59100", "city": "Roubaix", "name": "OVH SAS", "country": "FR", "type": "ORGANIZATION", "email": "oles@ovh.net", "changedate": "2013-10-28T00:00:00"}, "billing": null}, "nameservers": ["dns.ovh.net", "dns10.ovh.net", "ns.ovh.net", "ns10.ovh.net"], "creation_date": ["1999-11-12T00:00:00", "1999-10-21T00:00:00"], "raw": ["%%\n%% This is the AFNIC Whois server.\n%%\n%% complete date format : DD/MM/YYYY\n%% short date format : DD/MM\n%% version : FRNIC-2.5\n%%\n%% Rights restricted by copyright.\n%% See http://www.afnic.fr/afnic/web/mentions-legales-whois_en\n%%\n%% Use '-h' option to obtain more information about this service.\n%%\n%% [77.162.55.23 REQUEST] >> -V Md5.0 ovh.fr\n%%\n%% RL Net [##########] - RL IP [#########.]\n%%\n\ndomain: ovh.fr\nstatus: ACTIVE\nhold: NO\nholder-c: SO255-FRNIC\nadmin-c: OK62-FRNIC\ntech-c: OVH5-FRNIC\nzone-c: NFC1-FRNIC\nnsl-id: NSL16790-FRNIC\nregistrar: OVH\nanniversary: 12/11\ncreated: 12/11/1999\nlast-update: 03/04/2009\nsource: FRNIC\n\nns-list: NSL16790-FRNIC\nnserver: dns.ovh.net\nnserver: dns10.ovh.net\nnserver: ns.ovh.net\nnserver: ns10.ovh.net\nsource: FRNIC\n\nregistrar: OVH\ntype: Isp Option 1\naddress: 2 Rue Kellermann\naddress: ROUBAIX\ncountry: FR\nphone: +33 8 99 70 17 61\nfax-no: +33 3 20 20 09 58\ne-mail: support@ovh.net\nwebsite: http://www.ovh.com\nanonymous: NO\nregistered: 21/10/1999\nsource: FRNIC\n\nnic-hdl: OVH5-FRNIC\ntype: ROLE\ncontact: OVH NET\naddress: OVH\naddress: 140, quai du Sartel\naddress: 59100 Roubaix\ncountry: FR\nphone: +33 8 99 70 17 61\ne-mail: tech@ovh.net\ntrouble: Information: http://www.ovh.fr\ntrouble: Questions: mailto:tech@ovh.net\ntrouble: Spam: mailto:abuse@ovh.net\nadmin-c: OK217-FRNIC\ntech-c: OK217-FRNIC\nnotify: tech@ovh.net\nregistrar: OVH\nchanged: 11/10/2006 tech@ovh.net\nanonymous: NO\nobsoleted: NO\nsource: FRNIC\n\nnic-hdl: SO255-FRNIC\ntype: ORGANIZATION\ncontact: OVH SAS\naddress: 140, quai du sartel\naddress: 59100 Roubaix\ncountry: FR\nphone: +33 8 99 70 17 61\nfax-no: +33 3 20 20 09 58\ne-mail: oles@ovh.net\nregistrar: OVH\nchanged: 28/10/2013 nic@nic.fr\nanonymous: NO\nobsoleted: NO\neligstatus: ok\neligdate: 01/09/2011 12:03:35\nsource: FRNIC\n\nnic-hdl: OK62-FRNIC\ntype: PERSON\ncontact: Octave Klaba\naddress: Sarl Ovh\naddress: 140, quai du Sartel\naddress: 59100 Roubaix\ncountry: FR\nphone: +33 3 20 20 09 57\nfax-no: +33 3 20 20 09 58\nregistrar: OVH\nchanged: 03/04/2009 nic@nic.fr\nanonymous: NO\nobsoleted: NO\nsource: FRNIC\n"], "registrar": ["OVH"], "emails": ["support@ovh.net", "abuse@ovh.net", "nic@nic.fr"]}
\ No newline at end of file
diff --git a/test/target_normalized/prq.se b/test/target_normalized/prq.se
index 63bcefa..fe7caf7 100644
--- a/test/target_normalized/prq.se
+++ b/test/target_normalized/prq.se
@@ -1 +1 @@
-{"status": ["active", "ok"], "updated_date": ["2012-11-03T00:00:00"], "contacts": {"admin": null, "tech": null, "registrant": {"handle": "perper9352-00001"}, "billing": null}, "expiration_date": ["2015-06-14T00:00:00"], "emails": null, "creation_date": ["2004-06-14T00:00:00"], "raw": ["# Copyright (c) 1997- .SE (The Internet Infrastructure Foundation).\n# All rights reserved.\n\n# The information obtained through searches, or otherwise, is protected\n# by the Swedish Copyright Act (1960:729) and international conventions.\n# It is also subject to database protection according to the Swedish\n# Copyright Act.\n\n# Any use of this material to target advertising or\n# similar activities is forbidden and will be prosecuted.\n# If any of the information below is transferred to a third\n# party, it must be done in its entirety. This server must\n# not be used as a backend for a search engine.\n\n# Result of search for registered domain names under\n# the .SE top level domain.\n\n# The data is in the UTF-8 character set and the result is\n# printed with eight bits.\n\nstate: active\ndomain: prq.se\nholder: perper9352-00001\nadmin-c: -\ntech-c: -\nbilling-c: -\ncreated: 2004-06-14\nmodified: 2012-11-03\nexpires: 2015-06-14\ntransferred: 2012-08-09\nnserver: ns.prq.se 193.104.214.194\nnserver: ns2.prq.se 88.80.30.194\ndnssec: unsigned delegation\nstatus: ok\nregistrar: AEB Komm\n\n"], "whois_server": null, "registrar": ["AEB Komm"], "name_servers": ["ns.prq.se", "ns2.prq.se"], "id": null}
\ No newline at end of file
+{"status": ["active", "ok"], "updated_date": ["2012-11-03T00:00:00"], "contacts": {"admin": null, "tech": null, "registrant": {"handle": "perper9352-00001"}, "billing": null}, "nameservers": ["ns.prq.se", "ns2.prq.se"], "expiration_date": ["2015-06-14T00:00:00"], "creation_date": ["2004-06-14T00:00:00"], "raw": ["# Copyright (c) 1997- .SE (The Internet Infrastructure Foundation).\n# All rights reserved.\n\n# The information obtained through searches, or otherwise, is protected\n# by the Swedish Copyright Act (1960:729) and international conventions.\n# It is also subject to database protection according to the Swedish\n# Copyright Act.\n\n# Any use of this material to target advertising or\n# similar activities is forbidden and will be prosecuted.\n# If any of the information below is transferred to a third\n# party, it must be done in its entirety. This server must\n# not be used as a backend for a search engine.\n\n# Result of search for registered domain names under\n# the .SE top level domain.\n\n# The data is in the UTF-8 character set and the result is\n# printed with eight bits.\n\nstate: active\ndomain: prq.se\nholder: perper9352-00001\nadmin-c: -\ntech-c: -\nbilling-c: -\ncreated: 2004-06-14\nmodified: 2012-11-03\nexpires: 2015-06-14\ntransferred: 2012-08-09\nnserver: ns.prq.se 193.104.214.194\nnserver: ns2.prq.se 88.80.30.194\ndnssec: unsigned delegation\nstatus: ok\nregistrar: AEB Komm\n\n"], "registrar": ["AEB Komm"]}
\ No newline at end of file
diff --git a/test/target_normalized/quadranet.com b/test/target_normalized/quadranet.com
index 1c8d0d9..0db1e1d 100644
--- a/test/target_normalized/quadranet.com
+++ b/test/target_normalized/quadranet.com
@@ -1 +1 @@
-{"updated_date": ["2013-06-17T23:22:11"], "status": ["clientDeleteProhibited", "clientRenewProhibited", "clientTransferProhibited", "clientUpdateProhibited"], "contacts": {"admin": {"city": "Tarzana", "fax": "+1.2136149375", "name": "Quadra Net", "state": "California", "phone": "+1.2136149371", "street": "19528 Ventura Blvd\n#433", "country": "United States", "postalcode": "91356", "organization": "QuadraNet", "email": "noc@quadranet.com"}, "tech": {"city": "Tarzana", "fax": "+1.2136149375", "name": "Quadra Net", "state": "California", "phone": "+1.2136149371", "street": "19528 Ventura Blvd\n#433", "country": "United States", "postalcode": "91356", "organization": "QuadraNet", "email": "noc@quadranet.com"}, "registrant": {"city": "Tarzana", "name": "Quadra Net", "state": "California", "street": "19528 Ventura Blvd\n#433", "country": "United States", "postalcode": "91356", "organization": "QuadraNet"}, "billing": null}, "expiration_date": ["2015-09-29T18:08:54"], "id": null, "creation_date": ["1999-09-29T18:08:58"], "raw": ["Domain Name: QUADRANET.COM\nRegistrar URL: http://www.wildwestdomains.com\nUpdated Date: 2013-06-17 23:22:11\nCreation Date: 1999-09-29 18:08:58\nRegistrar Expiration Date: 2015-09-29 18:08:54\nRegistrar: Wild West Domains, LLC\nReseller: Registerbuzz.com\nRegistrant Name: Quadra Net\nRegistrant Organization: QuadraNet\nRegistrant Street: 19528 Ventura Blvd\nRegistrant Street: #433\nRegistrant City: Tarzana\nRegistrant State/Province: California\nRegistrant Postal Code: 91356\nRegistrant Country: United States\nAdmin Name: Quadra Net\nAdmin Organization: QuadraNet\nAdmin Street: 19528 Ventura Blvd\nAdmin Street: #433\nAdmin City: Tarzana\nAdmin State/Province: California\nAdmin Postal Code: 91356\nAdmin Country: United States\nAdmin Phone: +1.2136149371\nAdmin Fax: +1.2136149375\nAdmin Email: noc@quadranet.com\nTech Name: Quadra Net\nTech Organization: QuadraNet\nTech Street: 19528 Ventura Blvd\nTech Street: #433\nTech City: Tarzana\nTech State/Province: California\nTech Postal Code: 91356\nTech Country: United States\nTech Phone: +1.2136149371\nTech Fax: +1.2136149375\nTech Email: noc@quadranet.com\nName Server: NS2.QUADRANET.COM\nName Server: NS1.QUADRANET.COM\n\nThe data contained in this Registrar's Whois database, \nwhile believed by the registrar to be reliable, is provided \"as is\"\nwith no guarantee or warranties regarding its accuracy. This information \nis provided for the sole purpose of assisting you in obtaining \ninformation about domain name registration records. Any use of\nthis data for any other purpose is expressly forbidden without\nthe prior written permission of this registrar. By submitting an\ninquiry, you agree to these terms of usage and limitations of warranty.\nIn particular, you agree not to use this data to allow, enable, or\notherwise make possible, dissemination or collection of this data, in \npart or in its entirety, for any purpose, such as the transmission of \nunsolicited advertising and solicitations of any kind, including spam. \nYou further agree not to use this data to enable high volume, automated \nor robotic electronic processes designed to collect or compile this data \nfor any purpose, including mining this data for your own personal or \ncommercial purposes.\n\nPlease note: the owner of the domain name is specified in the \"registrant\" section. \nIn most cases, the Registrar is not the owner of domain names listed in this database.\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: QUADRANET.COM\n Registrar: WILD WEST DOMAINS, LLC\n Whois Server: whois.wildwestdomains.com\n Referral URL: http://www.wildwestdomains.com\n Name Server: NS1.QUADRANET.COM\n Name Server: NS2.QUADRANET.COM\n Status: clientDeleteProhibited\n Status: clientRenewProhibited\n Status: clientTransferProhibited\n Status: clientUpdateProhibited\n Updated Date: 18-jun-2013\n Creation Date: 29-sep-1999\n Expiration Date: 29-sep-2015\n\n>>> Last update of whois database: Wed, 20 Nov 2013 10:14:47 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.wildwestdomains.com"], "registrar": ["Wild West Domains, LLC"], "name_servers": ["ns2.quadranet.com", "ns1.quadranet.com"], "emails": []}
\ No newline at end of file
+{"updated_date": ["2013-06-17T23:22:11"], "status": ["clientDeleteProhibited", "clientRenewProhibited", "clientTransferProhibited", "clientUpdateProhibited"], "contacts": {"admin": {"city": "Tarzana", "fax": "+1.2136149375", "name": "Quadra Net", "state": "California", "phone": "+1.2136149371", "street": "19528 Ventura Blvd\n#433", "country": "United States", "postalcode": "91356", "organization": "QuadraNet", "email": "noc@quadranet.com"}, "tech": {"city": "Tarzana", "fax": "+1.2136149375", "name": "Quadra Net", "state": "California", "phone": "+1.2136149371", "street": "19528 Ventura Blvd\n#433", "country": "United States", "postalcode": "91356", "organization": "QuadraNet", "email": "noc@quadranet.com"}, "registrant": {"city": "Tarzana", "name": "Quadra Net", "state": "California", "street": "19528 Ventura Blvd\n#433", "country": "United States", "postalcode": "91356", "organization": "QuadraNet"}, "billing": null}, "nameservers": ["ns2.quadranet.com", "ns1.quadranet.com"], "expiration_date": ["2015-09-29T18:08:54"], "creation_date": ["1999-09-29T18:08:58"], "raw": ["Domain Name: QUADRANET.COM\nRegistrar URL: http://www.wildwestdomains.com\nUpdated Date: 2013-06-17 23:22:11\nCreation Date: 1999-09-29 18:08:58\nRegistrar Expiration Date: 2015-09-29 18:08:54\nRegistrar: Wild West Domains, LLC\nReseller: Registerbuzz.com\nRegistrant Name: Quadra Net\nRegistrant Organization: QuadraNet\nRegistrant Street: 19528 Ventura Blvd\nRegistrant Street: #433\nRegistrant City: Tarzana\nRegistrant State/Province: California\nRegistrant Postal Code: 91356\nRegistrant Country: United States\nAdmin Name: Quadra Net\nAdmin Organization: QuadraNet\nAdmin Street: 19528 Ventura Blvd\nAdmin Street: #433\nAdmin City: Tarzana\nAdmin State/Province: California\nAdmin Postal Code: 91356\nAdmin Country: United States\nAdmin Phone: +1.2136149371\nAdmin Fax: +1.2136149375\nAdmin Email: noc@quadranet.com\nTech Name: Quadra Net\nTech Organization: QuadraNet\nTech Street: 19528 Ventura Blvd\nTech Street: #433\nTech City: Tarzana\nTech State/Province: California\nTech Postal Code: 91356\nTech Country: United States\nTech Phone: +1.2136149371\nTech Fax: +1.2136149375\nTech Email: noc@quadranet.com\nName Server: NS2.QUADRANET.COM\nName Server: NS1.QUADRANET.COM\n\nThe data contained in this Registrar's Whois database, \nwhile believed by the registrar to be reliable, is provided \"as is\"\nwith no guarantee or warranties regarding its accuracy. This information \nis provided for the sole purpose of assisting you in obtaining \ninformation about domain name registration records. Any use of\nthis data for any other purpose is expressly forbidden without\nthe prior written permission of this registrar. By submitting an\ninquiry, you agree to these terms of usage and limitations of warranty.\nIn particular, you agree not to use this data to allow, enable, or\notherwise make possible, dissemination or collection of this data, in \npart or in its entirety, for any purpose, such as the transmission of \nunsolicited advertising and solicitations of any kind, including spam. \nYou further agree not to use this data to enable high volume, automated \nor robotic electronic processes designed to collect or compile this data \nfor any purpose, including mining this data for your own personal or \ncommercial purposes.\n\nPlease note: the owner of the domain name is specified in the \"registrant\" section. \nIn most cases, the Registrar is not the owner of domain names listed in this database.\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: QUADRANET.COM\n Registrar: WILD WEST DOMAINS, LLC\n Whois Server: whois.wildwestdomains.com\n Referral URL: http://www.wildwestdomains.com\n Name Server: NS1.QUADRANET.COM\n Name Server: NS2.QUADRANET.COM\n Status: clientDeleteProhibited\n Status: clientRenewProhibited\n Status: clientTransferProhibited\n Status: clientUpdateProhibited\n Updated Date: 18-jun-2013\n Creation Date: 29-sep-1999\n Expiration Date: 29-sep-2015\n\n>>> Last update of whois database: Wed, 20 Nov 2013 10:14:47 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.wildwestdomains.com"], "registrar": ["Wild West Domains, LLC"]}
\ No newline at end of file
diff --git a/test/target_normalized/singularity.fr b/test/target_normalized/singularity.fr
index 6c9e79c..3fb0c9f 100644
--- a/test/target_normalized/singularity.fr
+++ b/test/target_normalized/singularity.fr
@@ -1 +1 @@
-{"status": ["Active", "ok"], "updated_date": ["2009-08-31T00:00:00", "2006-03-03T00:00:00"], "contacts": {"admin": {"handle": "ANO00-FRNIC", "name": "Ano Nymous", "type": "PERSON", "changedate": "2009-08-31T00:00:00"}, "tech": {"handle": "GR283-FRNIC", "street": "Gandi\n15, place de la Nation", "postalcode": "75011", "city": "Paris", "name": "Gandi Role", "country": "FR", "type": "ROLE", "email": "noc@gandi.net", "changedate": "2006-03-03T00:00:00"}, "registrant": {"handle": "ANO00-FRNIC", "name": "Ano Nymous", "type": "PERSON", "changedate": "2009-08-31T00:00:00"}, "billing": null}, "expiration_date": null, "id": null, "creation_date": ["2009-04-04T00:00:00", "2004-03-09T00:00:00"], "raw": ["%%\n%% This is the AFNIC Whois server.\n%%\n%% complete date format : DD/MM/YYYY\n%% short date format : DD/MM\n%% version : FRNIC-2.5\n%%\n%% Rights restricted by copyright.\n%% See http://www.afnic.fr/afnic/web/mentions-legales-whois_en\n%%\n%% Use '-h' option to obtain more information about this service.\n%%\n%% [77.162.55.23 REQUEST] >> singularity.fr\n%%\n%% RL Net [##########] - RL IP [#########.]\n%%\n\ndomain: singularity.fr\nstatus: ACTIVE\nhold: NO\nholder-c: ANO00-FRNIC\nadmin-c: ANO00-FRNIC\ntech-c: GR283-FRNIC\nzone-c: NFC1-FRNIC\nnsl-id: NSL29702-FRNIC\nregistrar: GANDI\nanniversary: 01/09\ncreated: 04/04/2009\nlast-update: 01/09/2009\nsource: FRNIC\n\nns-list: NSL29702-FRNIC\nnserver: ns-sec.toile-libre.org\nnserver: ns-pri.toile-libre.org\nsource: FRNIC\n\nregistrar: GANDI\ntype: Isp Option 1\naddress: 63-65 boulevard Massena\naddress: PARIS\ncountry: FR\nphone: +33 1 70 37 76 61\nfax-no: +33 1 43 73 18 51\ne-mail: support-fr@support.gandi.net\nwebsite: http://www.gandi.net\nanonymous: NO\nregistered: 09/03/2004\nsource: FRNIC\n\nnic-hdl: ANO00-FRNIC\ntype: PERSON\ncontact: Ano Nymous\nremarks: -------------- WARNING --------------\nremarks: While the registrar knows him/her,\nremarks: this person chose to restrict access\nremarks: to his/her personal data. So PLEASE,\nremarks: don't send emails to Ano Nymous. This\nremarks: address is bogus and there is no hope\nremarks: of a reply.\nremarks: -------------- WARNING --------------\nregistrar: GANDI\nchanged: 31/08/2009 anonymous@nowhere.xx.fr\nanonymous: YES\nobsoleted: NO\neligstatus: ok\nsource: FRNIC\n\nnic-hdl: GR283-FRNIC\ntype: ROLE\ncontact: GANDI ROLE\naddress: Gandi\naddress: 15, place de la Nation\naddress: 75011 Paris\ncountry: FR\ne-mail: noc@gandi.net\ntrouble: -------------------------------------------------\ntrouble: GANDI is an ICANN accredited registrar\ntrouble: for more information:\ntrouble: Web: http://www.gandi.net\ntrouble: -------------------------------------------------\ntrouble: - network troubles: noc@gandi.net\ntrouble: - SPAM: abuse@gandi.net\ntrouble: -------------------------------------------------\nadmin-c: NL346-FRNIC\ntech-c: NL346-FRNIC\ntech-c: TUF1-FRNIC\nnotify: noc@gandi.net\nregistrar: GANDI\nchanged: 03/03/2006 noc@gandi.net\nanonymous: NO\nobsoleted: NO\nsource: FRNIC\n\n\n"], "whois_server": null, "registrar": ["Gandi"], "name_servers": ["ns-sec.toile-libre.org", "ns-pri.toile-libre.org"], "emails": ["support-fr@support.gandi.net", "anonymous@nowhere.xx.fr", "abuse@gandi.net"]}
\ No newline at end of file
+{"status": ["Active", "ok"], "updated_date": ["2009-08-31T00:00:00", "2006-03-03T00:00:00"], "contacts": {"admin": {"handle": "ANO00-FRNIC", "name": "Ano Nymous", "type": "PERSON", "changedate": "2009-08-31T00:00:00"}, "tech": {"handle": "GR283-FRNIC", "street": "Gandi\n15, place de la Nation", "postalcode": "75011", "city": "Paris", "name": "Gandi Role", "country": "FR", "type": "ROLE", "email": "noc@gandi.net", "changedate": "2006-03-03T00:00:00"}, "registrant": {"handle": "ANO00-FRNIC", "name": "Ano Nymous", "type": "PERSON", "changedate": "2009-08-31T00:00:00"}, "billing": null}, "nameservers": ["ns-sec.toile-libre.org", "ns-pri.toile-libre.org"], "creation_date": ["2009-04-04T00:00:00", "2004-03-09T00:00:00"], "raw": ["%%\n%% This is the AFNIC Whois server.\n%%\n%% complete date format : DD/MM/YYYY\n%% short date format : DD/MM\n%% version : FRNIC-2.5\n%%\n%% Rights restricted by copyright.\n%% See http://www.afnic.fr/afnic/web/mentions-legales-whois_en\n%%\n%% Use '-h' option to obtain more information about this service.\n%%\n%% [77.162.55.23 REQUEST] >> singularity.fr\n%%\n%% RL Net [##########] - RL IP [#########.]\n%%\n\ndomain: singularity.fr\nstatus: ACTIVE\nhold: NO\nholder-c: ANO00-FRNIC\nadmin-c: ANO00-FRNIC\ntech-c: GR283-FRNIC\nzone-c: NFC1-FRNIC\nnsl-id: NSL29702-FRNIC\nregistrar: GANDI\nanniversary: 01/09\ncreated: 04/04/2009\nlast-update: 01/09/2009\nsource: FRNIC\n\nns-list: NSL29702-FRNIC\nnserver: ns-sec.toile-libre.org\nnserver: ns-pri.toile-libre.org\nsource: FRNIC\n\nregistrar: GANDI\ntype: Isp Option 1\naddress: 63-65 boulevard Massena\naddress: PARIS\ncountry: FR\nphone: +33 1 70 37 76 61\nfax-no: +33 1 43 73 18 51\ne-mail: support-fr@support.gandi.net\nwebsite: http://www.gandi.net\nanonymous: NO\nregistered: 09/03/2004\nsource: FRNIC\n\nnic-hdl: ANO00-FRNIC\ntype: PERSON\ncontact: Ano Nymous\nremarks: -------------- WARNING --------------\nremarks: While the registrar knows him/her,\nremarks: this person chose to restrict access\nremarks: to his/her personal data. So PLEASE,\nremarks: don't send emails to Ano Nymous. This\nremarks: address is bogus and there is no hope\nremarks: of a reply.\nremarks: -------------- WARNING --------------\nregistrar: GANDI\nchanged: 31/08/2009 anonymous@nowhere.xx.fr\nanonymous: YES\nobsoleted: NO\neligstatus: ok\nsource: FRNIC\n\nnic-hdl: GR283-FRNIC\ntype: ROLE\ncontact: GANDI ROLE\naddress: Gandi\naddress: 15, place de la Nation\naddress: 75011 Paris\ncountry: FR\ne-mail: noc@gandi.net\ntrouble: -------------------------------------------------\ntrouble: GANDI is an ICANN accredited registrar\ntrouble: for more information:\ntrouble: Web: http://www.gandi.net\ntrouble: -------------------------------------------------\ntrouble: - network troubles: noc@gandi.net\ntrouble: - SPAM: abuse@gandi.net\ntrouble: -------------------------------------------------\nadmin-c: NL346-FRNIC\ntech-c: NL346-FRNIC\ntech-c: TUF1-FRNIC\nnotify: noc@gandi.net\nregistrar: GANDI\nchanged: 03/03/2006 noc@gandi.net\nanonymous: NO\nobsoleted: NO\nsource: FRNIC\n\n\n"], "registrar": ["Gandi"], "emails": ["support-fr@support.gandi.net", "anonymous@nowhere.xx.fr", "abuse@gandi.net"]}
\ No newline at end of file
diff --git a/test/target_normalized/swisscom.ch b/test/target_normalized/swisscom.ch
index 4881b0e..e108bd0 100644
--- a/test/target_normalized/swisscom.ch
+++ b/test/target_normalized/swisscom.ch
@@ -1 +1 @@
-{"status": null, "updated_date": null, "contacts": {"admin": null, "tech": {"postalcode": "CH-3050", "city": "Bern", "street": "Ostermundigenstrasse 99 6", "name": "Swisscom IT Services AG\nAndreas Disteli", "country": "Switzerland"}, "registrant": {"postalcode": "CH-3050", "city": "Bern", "street": "alte Tiefenaustrasse 6", "name": "Swisscom AG\nKarin Hug\nDomain Registration", "country": "Switzerland"}, "billing": null}, "expiration_date": null, "emails": null, "raw": ["whois: This information is subject to an Acceptable Use Policy.\nSee http://www.nic.ch/terms/aup.html\n\n\nDomain name:\nswisscom.ch\n\nHolder of domain name:\nSwisscom AG\nKarin Hug\nDomain Registration\nalte Tiefenaustrasse 6\nCH-3050 Bern\nSwitzerland\nContractual Language: English\n\nTechnical contact:\nSwisscom IT Services AG\nAndreas Disteli\nOstermundigenstrasse 99 6\nCH-3050 Bern\nSwitzerland\n\nDNSSEC:N\n\nName servers:\ndns1.swisscom.com\ndns2.swisscom.com\ndns3.swisscom.com\ndns6.swisscom.ch\t[193.222.76.52]\ndns6.swisscom.ch\t[2a02:a90:ffff:ffff::c:1]\ndns7.swisscom.ch\t[193.222.76.53]\ndns7.swisscom.ch\t[2a02:a90:ffff:ffff::c:3]\n\n"], "whois_server": null, "registrar": null, "name_servers": ["dns1.swisscom.com", "dns2.swisscom.com", "dns3.swisscom.com", "dns6.swisscom.ch", "dns7.swisscom.ch"], "creation_date": null, "id": null}
\ No newline at end of file
+{"nameservers": ["dns1.swisscom.com", "dns2.swisscom.com", "dns3.swisscom.com", "dns6.swisscom.ch", "dns7.swisscom.ch"], "raw": ["whois: This information is subject to an Acceptable Use Policy.\nSee http://www.nic.ch/terms/aup.html\n\n\nDomain name:\nswisscom.ch\n\nHolder of domain name:\nSwisscom AG\nKarin Hug\nDomain Registration\nalte Tiefenaustrasse 6\nCH-3050 Bern\nSwitzerland\nContractual Language: English\n\nTechnical contact:\nSwisscom IT Services AG\nAndreas Disteli\nOstermundigenstrasse 99 6\nCH-3050 Bern\nSwitzerland\n\nDNSSEC:N\n\nName servers:\ndns1.swisscom.com\ndns2.swisscom.com\ndns3.swisscom.com\ndns6.swisscom.ch\t[193.222.76.52]\ndns6.swisscom.ch\t[2a02:a90:ffff:ffff::c:1]\ndns7.swisscom.ch\t[193.222.76.53]\ndns7.swisscom.ch\t[2a02:a90:ffff:ffff::c:3]\n\n"], "contacts": {"admin": null, "tech": {"postalcode": "CH-3050", "city": "Bern", "street": "Ostermundigenstrasse 99 6", "name": "Swisscom IT Services AG\nAndreas Disteli", "country": "Switzerland"}, "registrant": {"postalcode": "CH-3050", "city": "Bern", "street": "alte Tiefenaustrasse 6", "name": "Swisscom AG\nKarin Hug\nDomain Registration", "country": "Switzerland"}, "billing": null}}
\ No newline at end of file
diff --git a/test/target_normalized/sydney.edu.au b/test/target_normalized/sydney.edu.au
index 48f47ac..7e50872 100644
--- a/test/target_normalized/sydney.edu.au
+++ b/test/target_normalized/sydney.edu.au
@@ -1 +1 @@
-{"status": ["ok"], "updated_date": ["2012-08-29T01:33:23"], "contacts": {"admin": null, "tech": {"handle": "EDU46834-C", "name": "Network Services"}, "registrant": {"organization": "The University of Sydney", "handle": "EDU2782-R", "name": "Network Services"}, "billing": null}, "expiration_date": null, "emails": null, "raw": ["Domain Name: sydney.edu.au\nLast Modified: 29-Aug-2012 01:33:23 UTC\nRegistrar ID: EducationAU\nRegistrar Name: Education Service Australia Ltd\nStatus: ok\n\nRegistrant: The University of Sydney\nRegistrant ID: ABN 15211513464\nEligibility Type: Higher Education Institution\n\nRegistrant Contact ID: EDU2782-R\nRegistrant Contact Name: Network Services\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: EDU46834-C\nTech Contact Name: Network Services\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: extro.ucc.usyd.edu.au\nName Server IP: 129.78.64.1\nName Server: metro.ucc.usyd.edu.au\nName Server IP: 129.78.64.2\n\n"], "whois_server": null, "registrar": ["Education Service Australia Ltd"], "name_servers": ["extro.ucc.usyd.edu.au", "metro.ucc.usyd.edu.au"], "creation_date": null, "id": null}
\ No newline at end of file
+{"status": ["ok"], "updated_date": ["2012-08-29T01:33:23"], "contacts": {"admin": null, "tech": {"handle": "EDU46834-C", "name": "Network Services"}, "registrant": {"organization": "The University of Sydney", "handle": "EDU2782-R", "name": "Network Services"}, "billing": null}, "nameservers": ["extro.ucc.usyd.edu.au", "metro.ucc.usyd.edu.au"], "raw": ["Domain Name: sydney.edu.au\nLast Modified: 29-Aug-2012 01:33:23 UTC\nRegistrar ID: EducationAU\nRegistrar Name: Education Service Australia Ltd\nStatus: ok\n\nRegistrant: The University of Sydney\nRegistrant ID: ABN 15211513464\nEligibility Type: Higher Education Institution\n\nRegistrant Contact ID: EDU2782-R\nRegistrant Contact Name: Network Services\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: EDU46834-C\nTech Contact Name: Network Services\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: extro.ucc.usyd.edu.au\nName Server IP: 129.78.64.1\nName Server: metro.ucc.usyd.edu.au\nName Server IP: 129.78.64.2\n\n"], "registrar": ["Education Service Australia Ltd"]}
\ No newline at end of file
diff --git a/test/target_normalized/theregister.com b/test/target_normalized/theregister.com
index e6bed30..1f368e5 100644
--- a/test/target_normalized/theregister.com
+++ b/test/target_normalized/theregister.com
@@ -1 +1 @@
-{"status": ["Active"], "updated_date": ["2013-07-02T00:24:06"], "contacts": {"admin": {"city": "Southport", "fax": "+44.7980898072", "name": "Philip Mitchell", "state": "Merseyside", "phone": "+44.7980898072", "street": "19 Saxon Road", "country": "GB", "postalcode": "PR8 2AX", "organization": "Situation Publishing Ltd", "email": "philip.mitchell@theregister.co.uk"}, "tech": {"city": "Null", "fax": "+44.2070159375", "name": "NetNames Hostmaster", "state": "London", "phone": "+44.2070159370", "street": "3rd Floor Prospero House\n241 Borough High St.", "country": "GB", "postalcode": "SE1 1GA", "organization": "Netnames Ltd", "email": "corporate-services@netnames.com"}, "registrant": {"city": "Southport", "name": "Situation Publishing", "state": "Mersyside", "street": "19 Saxon Road", "country": "GB", "postalcode": "PR8 2AX", "organization": "Situation Publishing Ltd"}, "billing": null}, "expiration_date": ["2014-06-30T00:00:00"], "id": null, "creation_date": ["2012-03-15T08:07:41"], "raw": ["The data in Ascio Technologies' WHOIS database is provided \nby Ascio Technologies for information purposes only. By submitting \na WHOIS query, you agree that you will use this data only for lawful \npurpose. In addition, you agree not to:\n(a) use the data to allow, enable, or otherwise support any marketing\nactivities, regardless of the medium used. Such media include but are \nnot limited to e-mail, telephone, facsimile, postal mail, SMS, and\nwireless alerts; or\n(b) use the data to enable high volume, automated, electronic processes\nthat sendqueries or data to the systems of any Registry Operator or \nICANN-Accredited registrar, except as reasonably necessary to register \ndomain names or modify existing registrations.\n(c) sell or redistribute the data except insofar as it has been \nincorporated into a value-added product or service that does not permit\nthe extraction of a substantial portion of the bulk data from the value-added\nproduct or service for use by other parties.\nAscio Technologies reserves the right to modify these terms at any time.\nAscio Technologies cannot guarantee the accuracy of the data provided.\nBy accessing and using Ascio Technologies WHOIS service, you agree to these terms.\n\nNOTE: FAILURE TO LOCATE A RECORD IN THE WHOIS DATABASE IS NOT\nINDICATIVE OF THE AVAILABILITY OF A DOMAIN NAME.\n\nDomain Name: theregister.com\nRegistry Domain ID:\nRegistrar WHOIS Server: whois.ascio.com\nRegistrar URL: http://www.ascio.com \nUpdated Date: 2013-07-02T00:24:06Z\nCreation Date: 2012-03-15T08:07:41Z\nRegistrar Registration Expiration Date: 2014-06-30T00:00:00Z\nRegistrar: Ascio Technologies, Inc\nRegistrar IANA ID: 106\nRegistrar Abuse Contact Email: abuse@ascio.com\nRegistrar Abuse Contact Phone: +44.2070159370\nReseller:\nDomain Status: ACTIVE\nRegistry Registrant ID:\nRegistrant Name: Situation Publishing\nRegistrant Organization: Situation Publishing Ltd\nRegistrant Street: 19 Saxon Road\nRegistrant City: Southport \nRegistrant State/Province: Mersyside\nRegistrant Postal Code: PR8 2AX\nRegistrant Country: GB\nRegistrant Phone:\nRegistrant Phone Ext:\nRegistrant Fax:\nRegistrant Fax Ext:\nRegistrant Email:\nRegistry Admin ID:\nAdmin Name: Philip Mitchell\nAdmin Organization: Situation Publishing Ltd\nAdmin Street: 19 Saxon Road\nAdmin City: Southport\nAdmin State/Province: Merseyside\nAdmin Postal Code: PR8 2AX\nAdmin Country: GB\nAdmin Phone: +44.7980898072\nAdmin Phone Ext:\nAdmin Fax: +44.7980898072\nAdmin Fax Ext:\nAdmin Email: philip.mitchell@theregister.co.uk\nRegistry Tech ID:\nTech Name: NetNames Hostmaster\nTech Organization: Netnames Ltd\nTech Street: 3rd Floor Prospero House\nTech Street: 241 Borough High St. \nTech City: null \nTech State/Province: London\nTech Postal Code: SE1 1GA\nTech Country: GB\nTech Phone: +44.2070159370\nTech Phone Ext:\nTech Fax: +44.2070159375 \nTech Fax Ext: \nTech Email: corporate-services@netnames.com\nName Server: NS1.THEREGISTER.COM\nName Server: NS2.THEREGISTER.COM\nName Server: NS3.THEREGISTER.COM\nName Server: NS4.THEREGISTER.COM\nName Server: ns1.theregister.co.uk\nName Server: ns2.theregister.co.uk\nName Server: ns3.theregister.co.uk\nName Server: ns6.theregister.co.uk\nDNSSEC:\nURL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/\n>>> Last update of WHOIS database: 2013-11-21T05:58:08 UTC <<<\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: THEREGISTER.COM\n Registrar: ASCIO TECHNOLOGIES, INC.\n Whois Server: whois.ascio.com\n Referral URL: http://www.ascio.com\n Name Server: NS1.THEREGISTER.CO.UK\n Name Server: NS2.THEREGISTER.CO.UK\n Name Server: NS3.THEREGISTER.CO.UK\n Name Server: NS4.THEREGISTER.CO.UK\n Name Server: NS5.THEREGISTER.CO.UK\n Name Server: NS6.THEREGISTER.CO.UK\n Status: clientDeleteProhibited\n Status: clientTransferProhibited\n Updated Date: 01-jul-2013\n Creation Date: 01-jul-1996\n Expiration Date: 30-jun-2014\n\n>>> Last update of whois database: Thu, 21 Nov 2013 05:57:38 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.ascio.com"], "registrar": ["Ascio Technologies, Inc"], "name_servers": ["ns1.theregister.com", "ns2.theregister.com", "ns3.theregister.com", "ns4.theregister.com", "ns1.theregister.co.uk", "ns2.theregister.co.uk", "ns3.theregister.co.uk", "ns6.theregister.co.uk"], "emails": ["abuse@ascio.com"]}
\ No newline at end of file
+{"status": ["Active"], "updated_date": ["2013-07-02T00:24:06"], "contacts": {"admin": {"city": "Southport", "fax": "+44.7980898072", "name": "Philip Mitchell", "state": "Merseyside", "phone": "+44.7980898072", "street": "19 Saxon Road", "country": "GB", "postalcode": "PR8 2AX", "organization": "Situation Publishing Ltd", "email": "philip.mitchell@theregister.co.uk"}, "tech": {"city": "Null", "fax": "+44.2070159375", "name": "NetNames Hostmaster", "state": "London", "phone": "+44.2070159370", "street": "3rd Floor Prospero House\n241 Borough High St.", "country": "GB", "postalcode": "SE1 1GA", "organization": "Netnames Ltd", "email": "corporate-services@netnames.com"}, "registrant": {"city": "Southport", "name": "Situation Publishing", "state": "Mersyside", "street": "19 Saxon Road", "country": "GB", "postalcode": "PR8 2AX", "organization": "Situation Publishing Ltd"}, "billing": null}, "nameservers": ["ns1.theregister.com", "ns2.theregister.com", "ns3.theregister.com", "ns4.theregister.com", "ns1.theregister.co.uk", "ns2.theregister.co.uk", "ns3.theregister.co.uk", "ns6.theregister.co.uk"], "expiration_date": ["2014-06-30T00:00:00"], "creation_date": ["2012-03-15T08:07:41"], "raw": ["The data in Ascio Technologies' WHOIS database is provided \nby Ascio Technologies for information purposes only. By submitting \na WHOIS query, you agree that you will use this data only for lawful \npurpose. In addition, you agree not to:\n(a) use the data to allow, enable, or otherwise support any marketing\nactivities, regardless of the medium used. Such media include but are \nnot limited to e-mail, telephone, facsimile, postal mail, SMS, and\nwireless alerts; or\n(b) use the data to enable high volume, automated, electronic processes\nthat sendqueries or data to the systems of any Registry Operator or \nICANN-Accredited registrar, except as reasonably necessary to register \ndomain names or modify existing registrations.\n(c) sell or redistribute the data except insofar as it has been \nincorporated into a value-added product or service that does not permit\nthe extraction of a substantial portion of the bulk data from the value-added\nproduct or service for use by other parties.\nAscio Technologies reserves the right to modify these terms at any time.\nAscio Technologies cannot guarantee the accuracy of the data provided.\nBy accessing and using Ascio Technologies WHOIS service, you agree to these terms.\n\nNOTE: FAILURE TO LOCATE A RECORD IN THE WHOIS DATABASE IS NOT\nINDICATIVE OF THE AVAILABILITY OF A DOMAIN NAME.\n\nDomain Name: theregister.com\nRegistry Domain ID:\nRegistrar WHOIS Server: whois.ascio.com\nRegistrar URL: http://www.ascio.com \nUpdated Date: 2013-07-02T00:24:06Z\nCreation Date: 2012-03-15T08:07:41Z\nRegistrar Registration Expiration Date: 2014-06-30T00:00:00Z\nRegistrar: Ascio Technologies, Inc\nRegistrar IANA ID: 106\nRegistrar Abuse Contact Email: abuse@ascio.com\nRegistrar Abuse Contact Phone: +44.2070159370\nReseller:\nDomain Status: ACTIVE\nRegistry Registrant ID:\nRegistrant Name: Situation Publishing\nRegistrant Organization: Situation Publishing Ltd\nRegistrant Street: 19 Saxon Road\nRegistrant City: Southport \nRegistrant State/Province: Mersyside\nRegistrant Postal Code: PR8 2AX\nRegistrant Country: GB\nRegistrant Phone:\nRegistrant Phone Ext:\nRegistrant Fax:\nRegistrant Fax Ext:\nRegistrant Email:\nRegistry Admin ID:\nAdmin Name: Philip Mitchell\nAdmin Organization: Situation Publishing Ltd\nAdmin Street: 19 Saxon Road\nAdmin City: Southport\nAdmin State/Province: Merseyside\nAdmin Postal Code: PR8 2AX\nAdmin Country: GB\nAdmin Phone: +44.7980898072\nAdmin Phone Ext:\nAdmin Fax: +44.7980898072\nAdmin Fax Ext:\nAdmin Email: philip.mitchell@theregister.co.uk\nRegistry Tech ID:\nTech Name: NetNames Hostmaster\nTech Organization: Netnames Ltd\nTech Street: 3rd Floor Prospero House\nTech Street: 241 Borough High St. \nTech City: null \nTech State/Province: London\nTech Postal Code: SE1 1GA\nTech Country: GB\nTech Phone: +44.2070159370\nTech Phone Ext:\nTech Fax: +44.2070159375 \nTech Fax Ext: \nTech Email: corporate-services@netnames.com\nName Server: NS1.THEREGISTER.COM\nName Server: NS2.THEREGISTER.COM\nName Server: NS3.THEREGISTER.COM\nName Server: NS4.THEREGISTER.COM\nName Server: ns1.theregister.co.uk\nName Server: ns2.theregister.co.uk\nName Server: ns3.theregister.co.uk\nName Server: ns6.theregister.co.uk\nDNSSEC:\nURL of the ICANN WHOIS Data Problem Reporting System: http://wdprs.internic.net/\n>>> Last update of WHOIS database: 2013-11-21T05:58:08 UTC <<<\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: THEREGISTER.COM\n Registrar: ASCIO TECHNOLOGIES, INC.\n Whois Server: whois.ascio.com\n Referral URL: http://www.ascio.com\n Name Server: NS1.THEREGISTER.CO.UK\n Name Server: NS2.THEREGISTER.CO.UK\n Name Server: NS3.THEREGISTER.CO.UK\n Name Server: NS4.THEREGISTER.CO.UK\n Name Server: NS5.THEREGISTER.CO.UK\n Name Server: NS6.THEREGISTER.CO.UK\n Status: clientDeleteProhibited\n Status: clientTransferProhibited\n Updated Date: 01-jul-2013\n Creation Date: 01-jul-1996\n Expiration Date: 30-jun-2014\n\n>>> Last update of whois database: Thu, 21 Nov 2013 05:57:38 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.ascio.com"], "registrar": ["Ascio Technologies, Inc"], "emails": ["abuse@ascio.com"]}
\ No newline at end of file
diff --git a/test/target_normalized/twitter.com b/test/target_normalized/twitter.com
index 511e154..2de67bb 100644
--- a/test/target_normalized/twitter.com
+++ b/test/target_normalized/twitter.com
@@ -1 +1 @@
-{"updated_date": ["2013-10-07T00:00:00", "2013-10-07T00:00:00"], "status": ["clientTransferProhibited", "serverDeleteProhibited", "serverTransferProhibited", "serverUpdateProhibited"], "contacts": {"admin": {"city": "San Francisco", "name": "Domain Admin", "country": "US", "phone": "+1.4152229670", "state": "CA", "street": "1355 Market Street Suite 900", "postalcode": "94103", "organization": "Twitter, Inc.", "email": "domains@twitter.com"}, "tech": {"city": "San Francisco", "name": "Tech Admin", "country": "US", "phone": "+1.4152229670", "state": "CA", "street": "1355 Market Street Suite 900", "postalcode": "94103", "organization": "Twitter, Inc.", "email": "domains-tech@twitter.com"}, "registrant": {"city": "San Francisco", "name": "Twitter, Inc.", "country": "US", "state": "CA", "street": "1355 Market Street Suite 900", "postalcode": "94103", "organization": "Twitter, Inc.", "email": "domains@twitter.com"}, "billing": null}, "expiration_date": ["2020-01-21T00:00:00", "2020-01-21T00:00:00"], "id": null, "creation_date": ["2000-01-21T00:00:00", "2000-01-21T00:00:00"], "raw": ["\nCorporation Service Company(c) (CSC) The Trusted Partner of More than 50% of the 100 Best Global Brands.\n\nContact us to learn more about our enterprise solutions for Global Domain Name Registration and Management, Trademark Research and Watching, Brand, Logo and Auction Monitoring, as well SSL Certificate Services and DNS Hosting.\n\nNOTICE: You are not authorized to access or query our WHOIS database through the use of high-volume, automated, electronic processes or for the purpose or purposes of using the data in any manner that violates these terms of use. The Data in the CSC WHOIS database is provided by CSC for information purposes only, and to assist persons in obtaining information about or related to a domain name registration record. CSC does not guarantee its accuracy. By submitting a WHOIS query, you agree to abide by the following terms of use: you agree that you may use this Data only for lawful purposes and that under no circumstances will you use this Data to: (1) allow, enable, or otherwise support the transmission of mass unsolicited, commercial advertising or solicitations via direct mail, e-mail, telephone, or facsimile; or (2) enable high volume, automated, electronic processes that apply to CSC (or its computer systems). CSC reserves the right to terminate your access to the WHOIS database in its sole discretion for any violations by you of these terms of use. CSC reserves the right to modify these terms at any time.\n\n Registrant: \n Twitter, Inc.\n Twitter, Inc.\n 1355 Market Street Suite 900\n San Francisco, CA 94103\n US\n Email: domains@twitter.com\n\n Registrar Name....: CORPORATE DOMAINS, INC.\n Registrar Whois...: whois.corporatedomains.com\n Registrar Homepage: www.cscprotectsbrands.com \n\n Domain Name: twitter.com\n\n Created on..............: Fri, Jan 21, 2000\n Expires on..............: Tue, Jan 21, 2020\n Record last updated on..: Mon, Oct 07, 2013\n\n Administrative Contact:\n Twitter, Inc.\n Domain Admin\n 1355 Market Street Suite 900\n San Francisco, CA 94103\n US\n Phone: +1.4152229670\n Email: domains@twitter.com\n\n Technical Contact:\n Twitter, Inc.\n Tech Admin\n 1355 Market Street Suite 900\n San Francisco, CA 94103\n US\n Phone: +1.4152229670\n Email: domains-tech@twitter.com\n\n DNS Servers:\n\n NS3.P34.DYNECT.NET\n NS4.P34.DYNECT.NET\n NS2.P34.DYNECT.NET\n NS1.P34.DYNECT.NET\n \n\nRegister your domain name at http://www.cscglobal.com\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Server Name: TWITTER.COM.GET.ONE.MILLION.DOLLARS.AT.WWW.UNIMUNDI.COM\n IP Address: 209.126.190.71\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Domain Name: TWITTER.COM\n Registrar: CSC CORPORATE DOMAINS, INC.\n Whois Server: whois.corporatedomains.com\n Referral URL: http://www.cscglobal.com\n Name Server: NS1.P34.DYNECT.NET\n Name Server: NS2.P34.DYNECT.NET\n Name Server: NS3.P34.DYNECT.NET\n Name Server: NS4.P34.DYNECT.NET\n Status: clientTransferProhibited\n Status: serverDeleteProhibited\n Status: serverTransferProhibited\n Status: serverUpdateProhibited\n Updated Date: 07-oct-2013\n Creation Date: 21-jan-2000\n Expiration Date: 21-jan-2020\n\n>>> Last update of whois database: Sat, 23 Nov 2013 14:23:45 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.publicdomainregistry.com", "whois.corporatedomains.com"], "registrar": ["Corporate Domains, Inc."], "name_servers": ["ns3.p34.dynect.net", "ns4.p34.dynect.net", "ns2.p34.dynect.net", "ns1.p34.dynect.net"], "emails": []}
\ No newline at end of file
+{"updated_date": ["2013-10-07T00:00:00", "2013-10-07T00:00:00"], "status": ["clientTransferProhibited", "serverDeleteProhibited", "serverTransferProhibited", "serverUpdateProhibited"], "contacts": {"admin": {"city": "San Francisco", "name": "Domain Admin", "country": "US", "phone": "+1.4152229670", "state": "CA", "street": "1355 Market Street Suite 900", "postalcode": "94103", "organization": "Twitter, Inc.", "email": "domains@twitter.com"}, "tech": {"city": "San Francisco", "name": "Tech Admin", "country": "US", "phone": "+1.4152229670", "state": "CA", "street": "1355 Market Street Suite 900", "postalcode": "94103", "organization": "Twitter, Inc.", "email": "domains-tech@twitter.com"}, "registrant": {"city": "San Francisco", "name": "Twitter, Inc.", "country": "US", "state": "CA", "street": "1355 Market Street Suite 900", "postalcode": "94103", "organization": "Twitter, Inc.", "email": "domains@twitter.com"}, "billing": null}, "nameservers": ["ns3.p34.dynect.net", "ns4.p34.dynect.net", "ns2.p34.dynect.net", "ns1.p34.dynect.net"], "expiration_date": ["2020-01-21T00:00:00", "2020-01-21T00:00:00"], "creation_date": ["2000-01-21T00:00:00", "2000-01-21T00:00:00"], "raw": ["\nCorporation Service Company(c) (CSC) The Trusted Partner of More than 50% of the 100 Best Global Brands.\n\nContact us to learn more about our enterprise solutions for Global Domain Name Registration and Management, Trademark Research and Watching, Brand, Logo and Auction Monitoring, as well SSL Certificate Services and DNS Hosting.\n\nNOTICE: You are not authorized to access or query our WHOIS database through the use of high-volume, automated, electronic processes or for the purpose or purposes of using the data in any manner that violates these terms of use. The Data in the CSC WHOIS database is provided by CSC for information purposes only, and to assist persons in obtaining information about or related to a domain name registration record. CSC does not guarantee its accuracy. By submitting a WHOIS query, you agree to abide by the following terms of use: you agree that you may use this Data only for lawful purposes and that under no circumstances will you use this Data to: (1) allow, enable, or otherwise support the transmission of mass unsolicited, commercial advertising or solicitations via direct mail, e-mail, telephone, or facsimile; or (2) enable high volume, automated, electronic processes that apply to CSC (or its computer systems). CSC reserves the right to terminate your access to the WHOIS database in its sole discretion for any violations by you of these terms of use. CSC reserves the right to modify these terms at any time.\n\n Registrant: \n Twitter, Inc.\n Twitter, Inc.\n 1355 Market Street Suite 900\n San Francisco, CA 94103\n US\n Email: domains@twitter.com\n\n Registrar Name....: CORPORATE DOMAINS, INC.\n Registrar Whois...: whois.corporatedomains.com\n Registrar Homepage: www.cscprotectsbrands.com \n\n Domain Name: twitter.com\n\n Created on..............: Fri, Jan 21, 2000\n Expires on..............: Tue, Jan 21, 2020\n Record last updated on..: Mon, Oct 07, 2013\n\n Administrative Contact:\n Twitter, Inc.\n Domain Admin\n 1355 Market Street Suite 900\n San Francisco, CA 94103\n US\n Phone: +1.4152229670\n Email: domains@twitter.com\n\n Technical Contact:\n Twitter, Inc.\n Tech Admin\n 1355 Market Street Suite 900\n San Francisco, CA 94103\n US\n Phone: +1.4152229670\n Email: domains-tech@twitter.com\n\n DNS Servers:\n\n NS3.P34.DYNECT.NET\n NS4.P34.DYNECT.NET\n NS2.P34.DYNECT.NET\n NS1.P34.DYNECT.NET\n \n\nRegister your domain name at http://www.cscglobal.com\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Server Name: TWITTER.COM.GET.ONE.MILLION.DOLLARS.AT.WWW.UNIMUNDI.COM\n IP Address: 209.126.190.71\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n\n Domain Name: TWITTER.COM\n Registrar: CSC CORPORATE DOMAINS, INC.\n Whois Server: whois.corporatedomains.com\n Referral URL: http://www.cscglobal.com\n Name Server: NS1.P34.DYNECT.NET\n Name Server: NS2.P34.DYNECT.NET\n Name Server: NS3.P34.DYNECT.NET\n Name Server: NS4.P34.DYNECT.NET\n Status: clientTransferProhibited\n Status: serverDeleteProhibited\n Status: serverTransferProhibited\n Status: serverUpdateProhibited\n Updated Date: 07-oct-2013\n Creation Date: 21-jan-2000\n Expiration Date: 21-jan-2020\n\n>>> Last update of whois database: Sat, 23 Nov 2013 14:23:45 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.publicdomainregistry.com", "whois.corporatedomains.com"], "registrar": ["Corporate Domains, Inc."]}
\ No newline at end of file
diff --git a/test/target_normalized/whirlpool.net.au b/test/target_normalized/whirlpool.net.au
index d973522..7d6f2a4 100644
--- a/test/target_normalized/whirlpool.net.au
+++ b/test/target_normalized/whirlpool.net.au
@@ -1 +1 @@
-{"status": ["ok"], "updated_date": ["2012-02-06T09:28:40"], "contacts": {"admin": null, "tech": {"handle": "WRSI1010", "name": "Simon Wright"}, "registrant": {"organization": "Whirlpool Broadband Multimedia", "handle": "WRSI1010", "name": "Simon Wright"}, "billing": null}, "expiration_date": null, "emails": null, "creation_date": null, "raw": ["Domain Name: whirlpool.net.au\nLast Modified: 06-Feb-2012 09:28:40 UTC\nRegistrar ID: NetRegistry\nRegistrar Name: NetRegistry\nStatus: ok\n\nRegistrant: Simon Wright\nEligibility Type: Registered Business\nEligibility Name: Whirlpool Broadband Multimedia\nEligibility ID: NSW BN BN98319722\n\nRegistrant Contact ID: WRSI1010\nRegistrant Contact Name: Simon Wright\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: WRSI1010\nTech Contact Name: Simon Wright\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: ns0.bulletproof.net.au\nName Server IP: 202.44.98.24\nName Server: ns1.bulletproof.net.au\nName Server IP: 64.71.152.56\nName Server: ns1.bulletproofnetworks.net\nName Server: ns0.bulletproofnetworks.net\n\n"], "whois_server": null, "registrar": ["NetRegistry"], "name_servers": ["ns0.bulletproof.net.au", "ns1.bulletproof.net.au", "ns1.bulletproofnetworks.net", "ns0.bulletproofnetworks.net"], "id": null}
\ No newline at end of file
+{"status": ["ok"], "updated_date": ["2012-02-06T09:28:40"], "contacts": {"admin": null, "tech": {"handle": "WRSI1010", "name": "Simon Wright"}, "registrant": {"organization": "Whirlpool Broadband Multimedia", "handle": "WRSI1010", "name": "Simon Wright"}, "billing": null}, "nameservers": ["ns0.bulletproof.net.au", "ns1.bulletproof.net.au", "ns1.bulletproofnetworks.net", "ns0.bulletproofnetworks.net"], "creation_date": null, "raw": ["Domain Name: whirlpool.net.au\nLast Modified: 06-Feb-2012 09:28:40 UTC\nRegistrar ID: NetRegistry\nRegistrar Name: NetRegistry\nStatus: ok\n\nRegistrant: Simon Wright\nEligibility Type: Registered Business\nEligibility Name: Whirlpool Broadband Multimedia\nEligibility ID: NSW BN BN98319722\n\nRegistrant Contact ID: WRSI1010\nRegistrant Contact Name: Simon Wright\nRegistrant Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nTech Contact ID: WRSI1010\nTech Contact Name: Simon Wright\nTech Contact Email: Visit whois.ausregistry.com.au for Web based WhoIs\n\nName Server: ns0.bulletproof.net.au\nName Server IP: 202.44.98.24\nName Server: ns1.bulletproof.net.au\nName Server IP: 64.71.152.56\nName Server: ns1.bulletproofnetworks.net\nName Server: ns0.bulletproofnetworks.net\n\n"], "registrar": ["NetRegistry"]}
\ No newline at end of file
diff --git a/test/target_normalized/whois.com b/test/target_normalized/whois.com
index f48e3b4..35e326a 100644
--- a/test/target_normalized/whois.com
+++ b/test/target_normalized/whois.com
@@ -1 +1 @@
-{"status": ["Locked"], "updated_date": ["2011-10-24T00:00:00", "2013-11-23T11:09:14"], "contacts": {"admin": {"city": "Singapore", "name": "DNS Admin", "phone": "+65.67553177", "state": "Singapore", "street": "c/o 9A Jasmine Road", "country": "SG", "postalcode": "576582", "organization": "Whois Inc", "email": "dnsadmin@whois.com"}, "tech": {"city": "Singapore", "name": "DNS Admin", "phone": "+65.67553177", "state": "Singapore", "street": "c/o 9A Jasmine Road", "country": "SG", "postalcode": "576582", "organization": "Whois Inc", "email": "dnsadmin@whois.com"}, "registrant": {"city": "Singapore", "name": "DNS Admin", "phone": "+65.67553177", "state": "Singapore", "street": "c/o 9A Jasmine Road", "country": "SG", "postalcode": "576582", "organization": "Whois Inc", "email": "dnsadmin@whois.com"}, "billing": {"city": "Singapore", "name": "DNS Admin", "phone": "+65.67553177", "state": "Singapore", "street": "c/o 9A Jasmine Road", "country": "SG", "postalcode": "576582", "organization": "Whois Inc", "email": "dnsadmin@whois.com"}}, "expiration_date": ["2021-04-12T00:00:00"], "id": null, "creation_date": ["1995-04-11T00:00:00"], "raw": ["Registration Service Provided By: WHOIS.COM\n\nDomain Name: WHOIS.COM\n\n Registration Date: 11-Apr-1995 \n Expiration Date: 12-Apr-2021 \n\n Status:LOCKED\n\tNote: This Domain Name is currently Locked. \n\tThis feature is provided to protect against fraudulent acquisition of the domain name, \n\tas in this status the domain name cannot be transferred or modified. \n\n Name Servers: \n ns1.whois.com\n ns2.whois.com\n ns3.whois.com\n ns4.whois.com\n \n\n Registrant Contact Details:\n Whois Inc\n DNS Admin (dnsadmin@whois.com)\n c/o 9A Jasmine Road\n Singapore\n Singapore,576582\n SG\n Tel. +65.67553177\n\n Administrative Contact Details: \n Whois Inc\n DNS Admin (dnsadmin@whois.com)\n c/o 9A Jasmine Road\n Singapore\n Singapore,576582\n SG\n Tel. +65.67553177 \n\n Technical Contact Details: \n Whois Inc\n DNS Admin (dnsadmin@whois.com)\n c/o 9A Jasmine Road\n Singapore\n Singapore,576582\n SG\n Tel. +65.67553177 \n\n Billing Contact Details: \n Whois Inc\n DNS Admin (dnsadmin@whois.com)\n c/o 9A Jasmine Road\n Singapore\n Singapore,576582\n SG\n Tel. +65.67553177 \n \nThe data in this whois database is provided to you for information purposes \nonly, that is, to assist you in obtaining information about or related to a \ndomain name registration record. We make this information available \"as is\",\nand do not guarantee its accuracy. By submitting a whois query, you agree \nthat you will use this data only for lawful purposes and that, under no \ncircumstances will you use this data to: \n(1) enable high volume, automated, electronic processes that stress or load \nthis whois database system providing you this information; or \n(2) allow, enable, or otherwise support the transmission of mass unsolicited, \ncommercial advertising or solicitations via direct mail, electronic mail, or \nby telephone. \nThe compilation, repackaging, dissemination or other use of this data is \nexpressly prohibited without prior written consent from us. The Registrar of \nrecord is PDR Ltd. d/b/a PublicDomainRegistry.com. \nWe reserve the right to modify these terms at any time. \nBy submitting this query, you agree to abide by these terms.\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Server Name: WHOIS.COM.AU\n Registrar: TPP WHOLESALE PTY LTD.\n Whois Server: whois.distributeit.com.au\n Referral URL: http://www.tppwholesale.com.au\n\n Domain Name: WHOIS.COM\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n Name Server: NS1.WHOIS.COM\n Name Server: NS2.WHOIS.COM\n Name Server: NS3.WHOIS.COM\n Name Server: NS4.WHOIS.COM\n Status: clientTransferProhibited\n Updated Date: 24-oct-2011\n Creation Date: 11-apr-1995\n Expiration Date: 12-apr-2021\n\n>>> Last update of whois database: Sat, 23 Nov 2013 11:09:14 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.distributeit.com.au", "whois.publicdomainregistry.com"], "registrar": ["Whois.com"], "name_servers": ["ns1.whois.com", "ns2.whois.com", "ns3.whois.com", "ns4.whois.com"], "emails": []}
\ No newline at end of file
+{"status": ["Locked"], "updated_date": ["2011-10-24T00:00:00", "2013-11-23T11:09:14"], "contacts": {"admin": {"city": "Singapore", "name": "DNS Admin", "phone": "+65.67553177", "state": "Singapore", "street": "c/o 9A Jasmine Road", "country": "SG", "postalcode": "576582", "organization": "Whois Inc", "email": "dnsadmin@whois.com"}, "tech": {"city": "Singapore", "name": "DNS Admin", "phone": "+65.67553177", "state": "Singapore", "street": "c/o 9A Jasmine Road", "country": "SG", "postalcode": "576582", "organization": "Whois Inc", "email": "dnsadmin@whois.com"}, "registrant": {"city": "Singapore", "name": "DNS Admin", "phone": "+65.67553177", "state": "Singapore", "street": "c/o 9A Jasmine Road", "country": "SG", "postalcode": "576582", "organization": "Whois Inc", "email": "dnsadmin@whois.com"}, "billing": {"city": "Singapore", "name": "DNS Admin", "phone": "+65.67553177", "state": "Singapore", "street": "c/o 9A Jasmine Road", "country": "SG", "postalcode": "576582", "organization": "Whois Inc", "email": "dnsadmin@whois.com"}}, "nameservers": ["ns1.whois.com", "ns2.whois.com", "ns3.whois.com", "ns4.whois.com"], "expiration_date": ["2021-04-12T00:00:00"], "creation_date": ["1995-04-11T00:00:00"], "raw": ["Registration Service Provided By: WHOIS.COM\n\nDomain Name: WHOIS.COM\n\n Registration Date: 11-Apr-1995 \n Expiration Date: 12-Apr-2021 \n\n Status:LOCKED\n\tNote: This Domain Name is currently Locked. \n\tThis feature is provided to protect against fraudulent acquisition of the domain name, \n\tas in this status the domain name cannot be transferred or modified. \n\n Name Servers: \n ns1.whois.com\n ns2.whois.com\n ns3.whois.com\n ns4.whois.com\n \n\n Registrant Contact Details:\n Whois Inc\n DNS Admin (dnsadmin@whois.com)\n c/o 9A Jasmine Road\n Singapore\n Singapore,576582\n SG\n Tel. +65.67553177\n\n Administrative Contact Details: \n Whois Inc\n DNS Admin (dnsadmin@whois.com)\n c/o 9A Jasmine Road\n Singapore\n Singapore,576582\n SG\n Tel. +65.67553177 \n\n Technical Contact Details: \n Whois Inc\n DNS Admin (dnsadmin@whois.com)\n c/o 9A Jasmine Road\n Singapore\n Singapore,576582\n SG\n Tel. +65.67553177 \n\n Billing Contact Details: \n Whois Inc\n DNS Admin (dnsadmin@whois.com)\n c/o 9A Jasmine Road\n Singapore\n Singapore,576582\n SG\n Tel. +65.67553177 \n \nThe data in this whois database is provided to you for information purposes \nonly, that is, to assist you in obtaining information about or related to a \ndomain name registration record. We make this information available \"as is\",\nand do not guarantee its accuracy. By submitting a whois query, you agree \nthat you will use this data only for lawful purposes and that, under no \ncircumstances will you use this data to: \n(1) enable high volume, automated, electronic processes that stress or load \nthis whois database system providing you this information; or \n(2) allow, enable, or otherwise support the transmission of mass unsolicited, \ncommercial advertising or solicitations via direct mail, electronic mail, or \nby telephone. \nThe compilation, repackaging, dissemination or other use of this data is \nexpressly prohibited without prior written consent from us. The Registrar of \nrecord is PDR Ltd. d/b/a PublicDomainRegistry.com. \nWe reserve the right to modify these terms at any time. \nBy submitting this query, you agree to abide by these terms.\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Server Name: WHOIS.COM.AU\n Registrar: TPP WHOLESALE PTY LTD.\n Whois Server: whois.distributeit.com.au\n Referral URL: http://www.tppwholesale.com.au\n\n Domain Name: WHOIS.COM\n Registrar: PDR LTD. D/B/A PUBLICDOMAINREGISTRY.COM\n Whois Server: whois.PublicDomainRegistry.com\n Referral URL: http://www.PublicDomainRegistry.com\n Name Server: NS1.WHOIS.COM\n Name Server: NS2.WHOIS.COM\n Name Server: NS3.WHOIS.COM\n Name Server: NS4.WHOIS.COM\n Status: clientTransferProhibited\n Updated Date: 24-oct-2011\n Creation Date: 11-apr-1995\n Expiration Date: 12-apr-2021\n\n>>> Last update of whois database: Sat, 23 Nov 2013 11:09:14 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.distributeit.com.au", "whois.publicdomainregistry.com"], "registrar": ["Whois.com"]}
\ No newline at end of file
diff --git a/test/target_normalized/whois.us b/test/target_normalized/whois.us
index 939bedb..08e1456 100644
--- a/test/target_normalized/whois.us
+++ b/test/target_normalized/whois.us
@@ -1 +1 @@
-{"status": ["clientDeleteProhibited", "clientTransferProhibited", "serverDeleteProhibited", "serverTransferProhibited", "serverUpdateProhibited"], "updated_date": ["2013-06-02T01:33:47", "2013-11-20T04:08:15"], "contacts": {"admin": {"city": "Sterling", "handle": "NEUSTAR7", "name": ".US Registration Policy", "phone": "+1.5714345728", "state": "VA", "street": "46000 Center Oak Plaza", "country": "United States", "postalcode": "20166", "email": "support.us@neustar.us"}, "tech": {"city": "Sterling", "handle": "NEUSTAR7", "name": ".US Registration Policy", "phone": "+1.5714345728", "state": "VA", "street": "46000 Center Oak Plaza", "country": "United States", "postalcode": "20166", "email": "support.us@neustar.us"}, "registrant": {"city": "Sterling", "handle": "NEUSTAR7", "name": ".US Registration Policy", "phone": "+1.5714345728", "state": "VA", "street": "46000 Center Oak Plaza", "country": "United States", "postalcode": "20166", "email": "support.us@neustar.us"}, "billing": {"city": "Sterling", "handle": "NEUSTAR7", "name": ".US Registration Policy", "phone": "+1.5714345728", "state": "VA", "street": "46000 Center Oak Plaza", "country": "United States", "postalcode": "20166", "email": "support.us@neustar.us"}}, "expiration_date": ["2014-04-17T23:59:59"], "emails": [], "raw": ["Domain Name: WHOIS.US\nDomain ID: D675910-US\nSponsoring Registrar: REGISTRY REGISTRAR\nRegistrar URL (registration services): WWW.NEUSTAR.US\nDomain Status: clientDeleteProhibited\nDomain Status: clientTransferProhibited\nDomain Status: serverDeleteProhibited\nDomain Status: serverTransferProhibited\nDomain Status: serverUpdateProhibited\nRegistrant ID: NEUSTAR7\nRegistrant Name: .US Registration Policy\nRegistrant Address1: 46000 Center Oak Plaza\nRegistrant City: Sterling\nRegistrant State/Province: VA\nRegistrant Postal Code: 20166\nRegistrant Country: United States\nRegistrant Country Code: US\nRegistrant Phone Number: +1.5714345728\nRegistrant Email: support.us@neustar.us\nRegistrant Application Purpose: P5\nRegistrant Nexus Category: C21\nAdministrative Contact ID: NEUSTAR7\nAdministrative Contact Name: .US Registration Policy\nAdministrative Contact Address1: 46000 Center Oak Plaza\nAdministrative Contact City: Sterling\nAdministrative Contact State/Province: VA\nAdministrative Contact Postal Code: 20166\nAdministrative Contact Country: United States\nAdministrative Contact Country Code: US\nAdministrative Contact Phone Number: +1.5714345728\nAdministrative Contact Email: support.us@neustar.us\nAdministrative Application Purpose: P5\nAdministrative Nexus Category: C21\nBilling Contact ID: NEUSTAR7\nBilling Contact Name: .US Registration Policy\nBilling Contact Address1: 46000 Center Oak Plaza\nBilling Contact City: Sterling\nBilling Contact State/Province: VA\nBilling Contact Postal Code: 20166\nBilling Contact Country: United States\nBilling Contact Country Code: US\nBilling Contact Phone Number: +1.5714345728\nBilling Contact Email: support.us@neustar.us\nBilling Application Purpose: P5\nBilling Nexus Category: C21\nTechnical Contact ID: NEUSTAR7\nTechnical Contact Name: .US Registration Policy\nTechnical Contact Address1: 46000 Center Oak Plaza\nTechnical Contact City: Sterling\nTechnical Contact State/Province: VA\nTechnical Contact Postal Code: 20166\nTechnical Contact Country: United States\nTechnical Contact Country Code: US\nTechnical Contact Phone Number: +1.5714345728\nTechnical Contact Email: support.us@neustar.us\nTechnical Application Purpose: P5\nTechnical Nexus Category: C21\nName Server: PDNS1.ULTRADNS.NET\nName Server: PDNS2.ULTRADNS.NET\nName Server: PDNS3.ULTRADNS.ORG\nName Server: PDNS4.ULTRADNS.ORG\nName Server: PDNS5.ULTRADNS.INFO\nName Server: PDNS6.ULTRADNS.CO.UK\nCreated by Registrar: REGISTRY REGISTRAR\nLast Updated by Registrar: BATCHCSR\nDomain Registration Date: Thu Apr 18 20:44:15 GMT 2002\nDomain Expiration Date: Thu Apr 17 23:59:59 GMT 2014\nDomain Last Updated Date: Sun Jun 02 01:33:47 GMT 2013\n\n>>>> Whois database was last updated on: Wed Nov 20 04:08:15 GMT 2013 <<<<\n\nNeuStar, Inc., the Registry Administrator for .US, has collected this\ninformation for the WHOIS database through a .US-Accredited Registrar.\nThis information is provided to you for informational purposes only and is\ndesigned to assist persons in determining contents of a domain name\nregistration record in the NeuStar registry database. NeuStar makes this\ninformation available to you \"as is\" and does not guarantee its accuracy.\nBy submitting a WHOIS query, you agree that you will use this data only for\nlawful purposes and that, under no circumstances will you use this data:\n(1) to allow, enable, or otherwise support the transmission of mass\nunsolicited, commercial advertising or solicitations via direct mail,\nelectronic mail, or by telephone; (2) in contravention of any applicable\ndata and privacy protection laws; or (3) to enable high volume, automated,\nelectronic processes that apply to the registry (or its systems). Compilation,\nrepackaging, dissemination, or other use of the WHOIS database in its\nentirety, or of a substantial portion thereof, is not allowed without\nNeuStar's prior written permission. NeuStar reserves the right to modify or\nchange these conditions at any time without prior or subsequent notification\nof any kind. By executing this query, in any manner whatsoever, you agree to\nabide by these terms.\n\nNOTE: FAILURE TO LOCATE A RECORD IN THE WHOIS DATABASE IS NOT INDICATIVE\nOF THE AVAILABILITY OF A DOMAIN NAME.\n\nAll domain names are subject to certain additional domain name registration\nrules. For details, please visit our site at www.whois.us.\n\n"], "whois_server": null, "registrar": ["Registry Registrar", "Batchcsr"], "name_servers": ["pdns1.ultradns.net", "pdns2.ultradns.net", "pdns3.ultradns.org", "pdns4.ultradns.org", "pdns5.ultradns.info", "pdns6.ultradns.co.uk"], "creation_date": ["2002-04-18T20:44:15"], "id": ["D675910-US"]}
\ No newline at end of file
+{"status": ["clientDeleteProhibited", "clientTransferProhibited", "serverDeleteProhibited", "serverTransferProhibited", "serverUpdateProhibited"], "updated_date": ["2013-06-02T01:33:47", "2013-11-20T04:08:15"], "contacts": {"admin": {"city": "Sterling", "handle": "NEUSTAR7", "name": ".US Registration Policy", "phone": "+1.5714345728", "state": "VA", "street": "46000 Center Oak Plaza", "country": "United States", "postalcode": "20166", "email": "support.us@neustar.us"}, "tech": {"city": "Sterling", "handle": "NEUSTAR7", "name": ".US Registration Policy", "phone": "+1.5714345728", "state": "VA", "street": "46000 Center Oak Plaza", "country": "United States", "postalcode": "20166", "email": "support.us@neustar.us"}, "registrant": {"city": "Sterling", "handle": "NEUSTAR7", "name": ".US Registration Policy", "phone": "+1.5714345728", "state": "VA", "street": "46000 Center Oak Plaza", "country": "United States", "postalcode": "20166", "email": "support.us@neustar.us"}, "billing": {"city": "Sterling", "handle": "NEUSTAR7", "name": ".US Registration Policy", "phone": "+1.5714345728", "state": "VA", "street": "46000 Center Oak Plaza", "country": "United States", "postalcode": "20166", "email": "support.us@neustar.us"}}, "nameservers": ["pdns1.ultradns.net", "pdns2.ultradns.net", "pdns3.ultradns.org", "pdns4.ultradns.org", "pdns5.ultradns.info", "pdns6.ultradns.co.uk"], "expiration_date": ["2014-04-17T23:59:59"], "raw": ["Domain Name: WHOIS.US\nDomain ID: D675910-US\nSponsoring Registrar: REGISTRY REGISTRAR\nRegistrar URL (registration services): WWW.NEUSTAR.US\nDomain Status: clientDeleteProhibited\nDomain Status: clientTransferProhibited\nDomain Status: serverDeleteProhibited\nDomain Status: serverTransferProhibited\nDomain Status: serverUpdateProhibited\nRegistrant ID: NEUSTAR7\nRegistrant Name: .US Registration Policy\nRegistrant Address1: 46000 Center Oak Plaza\nRegistrant City: Sterling\nRegistrant State/Province: VA\nRegistrant Postal Code: 20166\nRegistrant Country: United States\nRegistrant Country Code: US\nRegistrant Phone Number: +1.5714345728\nRegistrant Email: support.us@neustar.us\nRegistrant Application Purpose: P5\nRegistrant Nexus Category: C21\nAdministrative Contact ID: NEUSTAR7\nAdministrative Contact Name: .US Registration Policy\nAdministrative Contact Address1: 46000 Center Oak Plaza\nAdministrative Contact City: Sterling\nAdministrative Contact State/Province: VA\nAdministrative Contact Postal Code: 20166\nAdministrative Contact Country: United States\nAdministrative Contact Country Code: US\nAdministrative Contact Phone Number: +1.5714345728\nAdministrative Contact Email: support.us@neustar.us\nAdministrative Application Purpose: P5\nAdministrative Nexus Category: C21\nBilling Contact ID: NEUSTAR7\nBilling Contact Name: .US Registration Policy\nBilling Contact Address1: 46000 Center Oak Plaza\nBilling Contact City: Sterling\nBilling Contact State/Province: VA\nBilling Contact Postal Code: 20166\nBilling Contact Country: United States\nBilling Contact Country Code: US\nBilling Contact Phone Number: +1.5714345728\nBilling Contact Email: support.us@neustar.us\nBilling Application Purpose: P5\nBilling Nexus Category: C21\nTechnical Contact ID: NEUSTAR7\nTechnical Contact Name: .US Registration Policy\nTechnical Contact Address1: 46000 Center Oak Plaza\nTechnical Contact City: Sterling\nTechnical Contact State/Province: VA\nTechnical Contact Postal Code: 20166\nTechnical Contact Country: United States\nTechnical Contact Country Code: US\nTechnical Contact Phone Number: +1.5714345728\nTechnical Contact Email: support.us@neustar.us\nTechnical Application Purpose: P5\nTechnical Nexus Category: C21\nName Server: PDNS1.ULTRADNS.NET\nName Server: PDNS2.ULTRADNS.NET\nName Server: PDNS3.ULTRADNS.ORG\nName Server: PDNS4.ULTRADNS.ORG\nName Server: PDNS5.ULTRADNS.INFO\nName Server: PDNS6.ULTRADNS.CO.UK\nCreated by Registrar: REGISTRY REGISTRAR\nLast Updated by Registrar: BATCHCSR\nDomain Registration Date: Thu Apr 18 20:44:15 GMT 2002\nDomain Expiration Date: Thu Apr 17 23:59:59 GMT 2014\nDomain Last Updated Date: Sun Jun 02 01:33:47 GMT 2013\n\n>>>> Whois database was last updated on: Wed Nov 20 04:08:15 GMT 2013 <<<<\n\nNeuStar, Inc., the Registry Administrator for .US, has collected this\ninformation for the WHOIS database through a .US-Accredited Registrar.\nThis information is provided to you for informational purposes only and is\ndesigned to assist persons in determining contents of a domain name\nregistration record in the NeuStar registry database. NeuStar makes this\ninformation available to you \"as is\" and does not guarantee its accuracy.\nBy submitting a WHOIS query, you agree that you will use this data only for\nlawful purposes and that, under no circumstances will you use this data:\n(1) to allow, enable, or otherwise support the transmission of mass\nunsolicited, commercial advertising or solicitations via direct mail,\nelectronic mail, or by telephone; (2) in contravention of any applicable\ndata and privacy protection laws; or (3) to enable high volume, automated,\nelectronic processes that apply to the registry (or its systems). Compilation,\nrepackaging, dissemination, or other use of the WHOIS database in its\nentirety, or of a substantial portion thereof, is not allowed without\nNeuStar's prior written permission. NeuStar reserves the right to modify or\nchange these conditions at any time without prior or subsequent notification\nof any kind. By executing this query, in any manner whatsoever, you agree to\nabide by these terms.\n\nNOTE: FAILURE TO LOCATE A RECORD IN THE WHOIS DATABASE IS NOT INDICATIVE\nOF THE AVAILABILITY OF A DOMAIN NAME.\n\nAll domain names are subject to certain additional domain name registration\nrules. For details, please visit our site at www.whois.us.\n\n"], "registrar": ["Registry Registrar", "Batchcsr"], "creation_date": ["2002-04-18T20:44:15"], "id": ["D675910-US"]}
\ No newline at end of file
diff --git a/test/target_normalized/winamp.com b/test/target_normalized/winamp.com
index 3334850..8565611 100644
--- a/test/target_normalized/winamp.com
+++ b/test/target_normalized/winamp.com
@@ -1 +1 @@
-{"status": ["clientTransferProhibited", "serverDeleteProhibited", "serverTransferProhibited", "serverUpdateProhibited"], "updated_date": ["2013-10-03T00:00:00", "2013-11-22T05:13:08"], "contacts": {"admin": {"city": "Dulles", "name": "Domain Admin", "phone": "+1.7032654670", "state": "VA", "street": "AOL Inc.\n22000 AOL Way", "country": "United States", "postalcode": "20166", "email": "domain-adm@corp.aol.com"}, "tech": {"city": "Dulles", "name": "Domain Admin", "phone": "+1.7032654670", "state": "VA", "street": "AOL Inc.\n22000 AOL Way", "country": "United States", "postalcode": "20166", "email": "domain-adm@corp.aol.com"}, "registrant": {"city": "Dulles", "name": "AOL Inc.", "state": "VA", "street": "22000 AOL Way", "country": "United States", "postalcode": "20166"}, "billing": null}, "expiration_date": ["2014-12-23T00:00:00"], "id": null, "creation_date": ["1997-12-30T00:00:00"], "raw": ["\nDomain Name.......... winamp.com\n Creation Date........ 1997-12-30\n Registration Date.... 2009-10-03\n Expiry Date.......... 2014-12-24\n Organisation Name.... AOL Inc.\n Organisation Address. 22000 AOL Way\n Organisation Address. \n Organisation Address. \n Organisation Address. Dulles\n Organisation Address. 20166\n Organisation Address. VA\n Organisation Address. UNITED STATES\n\nAdmin Name........... Domain Admin\n Admin Address........ AOL Inc.\n Admin Address........ 22000 AOL Way\n Admin Address........ \n Admin Address. Dulles\n Admin Address........ 20166\n Admin Address........ VA\n Admin Address........ UNITED STATES\n Admin Email.......... domain-adm@corp.aol.com\n Admin Phone.......... +1.7032654670\n Admin Fax............ \n\nTech Name............ Domain Admin\n Tech Address......... AOL Inc.\n Tech Address......... 22000 AOL Way\n Tech Address......... \n Tech Address......... Dulles\n Tech Address......... 20166\n Tech Address......... VA\n Tech Address......... UNITED STATES\n Tech Email........... domain-adm@corp.aol.com\n Tech Phone........... +1.7032654670\n Tech Fax............. \n Name Server.......... dns-02.ns.aol.com\n Name Server.......... dns-06.ns.aol.com\n Name Server.......... dns-07.ns.aol.com\n Name Server.......... dns-01.ns.aol.com\n\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: WINAMP.COM\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n Name Server: DNS-01.NS.AOL.COM\n Name Server: DNS-02.NS.AOL.COM\n Name Server: DNS-06.NS.AOL.COM\n Name Server: DNS-07.NS.AOL.COM\n Status: clientTransferProhibited\n Status: serverDeleteProhibited\n Status: serverTransferProhibited\n Status: serverUpdateProhibited\n Updated Date: 03-oct-2013\n Creation Date: 30-dec-1997\n Expiration Date: 23-dec-2014\n\n>>> Last update of whois database: Fri, 22 Nov 2013 05:13:08 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.melbourneit.com"], "registrar": ["Melbourne It, Ltd. D/b/a Internet Names Worldwide"], "name_servers": ["dns-02.ns.aol.com", "dns-06.ns.aol.com", "dns-07.ns.aol.com", "dns-01.ns.aol.com"], "emails": []}
\ No newline at end of file
+{"status": ["clientTransferProhibited", "serverDeleteProhibited", "serverTransferProhibited", "serverUpdateProhibited"], "updated_date": ["2013-10-03T00:00:00", "2013-11-22T05:13:08"], "contacts": {"admin": {"city": "Dulles", "name": "Domain Admin", "phone": "+1.7032654670", "state": "VA", "street": "AOL Inc.\n22000 AOL Way", "country": "United States", "postalcode": "20166", "email": "domain-adm@corp.aol.com"}, "tech": {"city": "Dulles", "name": "Domain Admin", "phone": "+1.7032654670", "state": "VA", "street": "AOL Inc.\n22000 AOL Way", "country": "United States", "postalcode": "20166", "email": "domain-adm@corp.aol.com"}, "registrant": {"city": "Dulles", "name": "AOL Inc.", "state": "VA", "street": "22000 AOL Way", "country": "United States", "postalcode": "20166"}, "billing": null}, "nameservers": ["dns-02.ns.aol.com", "dns-06.ns.aol.com", "dns-07.ns.aol.com", "dns-01.ns.aol.com"], "expiration_date": ["2014-12-23T00:00:00"], "creation_date": ["1997-12-30T00:00:00"], "raw": ["\nDomain Name.......... winamp.com\n Creation Date........ 1997-12-30\n Registration Date.... 2009-10-03\n Expiry Date.......... 2014-12-24\n Organisation Name.... AOL Inc.\n Organisation Address. 22000 AOL Way\n Organisation Address. \n Organisation Address. \n Organisation Address. Dulles\n Organisation Address. 20166\n Organisation Address. VA\n Organisation Address. UNITED STATES\n\nAdmin Name........... Domain Admin\n Admin Address........ AOL Inc.\n Admin Address........ 22000 AOL Way\n Admin Address........ \n Admin Address. Dulles\n Admin Address........ 20166\n Admin Address........ VA\n Admin Address........ UNITED STATES\n Admin Email.......... domain-adm@corp.aol.com\n Admin Phone.......... +1.7032654670\n Admin Fax............ \n\nTech Name............ Domain Admin\n Tech Address......... AOL Inc.\n Tech Address......... 22000 AOL Way\n Tech Address......... \n Tech Address......... Dulles\n Tech Address......... 20166\n Tech Address......... VA\n Tech Address......... UNITED STATES\n Tech Email........... domain-adm@corp.aol.com\n Tech Phone........... +1.7032654670\n Tech Fax............. \n Name Server.......... dns-02.ns.aol.com\n Name Server.......... dns-06.ns.aol.com\n Name Server.......... dns-07.ns.aol.com\n Name Server.......... dns-01.ns.aol.com\n\n\n", "\nWhois Server Version 2.0\n\nDomain names in the .com and .net domains can now be registered\nwith many different competing registrars. Go to http://www.internic.net\nfor detailed information.\n\n Domain Name: WINAMP.COM\n Registrar: MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE\n Whois Server: whois.melbourneit.com\n Referral URL: http://www.melbourneit.com\n Name Server: DNS-01.NS.AOL.COM\n Name Server: DNS-02.NS.AOL.COM\n Name Server: DNS-06.NS.AOL.COM\n Name Server: DNS-07.NS.AOL.COM\n Status: clientTransferProhibited\n Status: serverDeleteProhibited\n Status: serverTransferProhibited\n Status: serverUpdateProhibited\n Updated Date: 03-oct-2013\n Creation Date: 30-dec-1997\n Expiration Date: 23-dec-2014\n\n>>> Last update of whois database: Fri, 22 Nov 2013 05:13:08 UTC <<<\n\nNOTICE: The expiration date displayed in this record is the date the \nregistrar's sponsorship of the domain name registration in the registry is \ncurrently set to expire. This date does not necessarily reflect the expiration \ndate of the domain name registrant's agreement with the sponsoring \nregistrar. Users may consult the sponsoring registrar's Whois database to \nview the registrar's reported date of expiration for this registration.\n\nTERMS OF USE: You are not authorized to access or query our Whois \ndatabase through the use of electronic processes that are high-volume and \nautomated except as reasonably necessary to register domain names or \nmodify existing registrations; the Data in VeriSign Global Registry \nServices' (\"VeriSign\") Whois database is provided by VeriSign for \ninformation purposes only, and to assist persons in obtaining information \nabout or related to a domain name registration record. VeriSign does not \nguarantee its accuracy. By submitting a Whois query, you agree to abide \nby the following terms of use: You agree that you may use this Data only \nfor lawful purposes and that under no circumstances will you use this Data \nto: (1) allow, enable, or otherwise support the transmission of mass \nunsolicited, commercial advertising or solicitations via e-mail, telephone, \nor facsimile; or (2) enable high volume, automated, electronic processes \nthat apply to VeriSign (or its computer systems). The compilation, \nrepackaging, dissemination or other use of this Data is expressly \nprohibited without the prior written consent of VeriSign. You agree not to \nuse electronic processes that are automated and high-volume to access or \nquery the Whois database except as reasonably necessary to register \ndomain names or modify existing registrations. VeriSign reserves the right \nto restrict your access to the Whois database in its sole discretion to ensure \noperational stability. VeriSign may restrict or terminate your access to the \nWhois database for failure to abide by these terms of use. VeriSign \nreserves the right to modify these terms at any time. \n\nThe Registry database contains ONLY .COM, .NET, .EDU domains and\nRegistrars.\n"], "whois_server": ["whois.melbourneit.com"], "registrar": ["Melbourne It, Ltd. D/b/a Internet Names Worldwide"]}
\ No newline at end of file
diff --git a/test/target_normalized/x.it b/test/target_normalized/x.it
index c027864..99c53e5 100644
--- a/test/target_normalized/x.it
+++ b/test/target_normalized/x.it
@@ -1 +1 @@
-{"status": ["Unassignable"], "updated_date": null, "contacts": {"admin": null, "tech": null, "registrant": null, "billing": null}, "expiration_date": null, "emails": null, "raw": ["Domain: x.it\nStatus: UNASSIGNABLE\n\n"], "whois_server": null, "registrar": null, "name_servers": null, "creation_date": null, "id": null}
\ No newline at end of file
+{"status": ["Unassignable"], "raw": ["Domain: x.it\nStatus: UNASSIGNABLE\n\n"], "contacts": {"admin": null, "tech": null, "registrant": null, "billing": null}}
\ No newline at end of file
diff --git a/test/target_normalized/zem.org.uk b/test/target_normalized/zem.org.uk
index a0a9ced..dda7198 100644
--- a/test/target_normalized/zem.org.uk
+++ b/test/target_normalized/zem.org.uk
@@ -1 +1 @@
-{"updated_date": ["2013-02-01T00:00:00"], "status": null, "contacts": {"admin": null, "tech": null, "registrant": {"name": "Dan Foster"}, "billing": null}, "expiration_date": ["2015-04-15T00:00:00"], "emails": null, "creation_date": ["2009-04-15T00:00:00", "2009-04-15T00:00:00", "2009-04-15T00:00:00"], "raw": ["\n Domain name:\n zem.org.uk\n\n Registrant:\n Dan Foster\n\n Registrant type:\n UK Individual\n\n Registrant's address:\n The registrant is a non-trading individual who has opted to have their\n address omitted from the WHOIS service.\n\n Registrar:\n Webfusion Ltd t/a 123-reg [Tag = 123-REG]\n URL: http://www.123-reg.co.uk\n\n Relevant dates:\n Registered on: 15-Apr-2009\n Expiry date: 15-Apr-2015\n Last updated: 01-Feb-2013\n\n Registration status:\n Registered until expiry date.\n\n Name servers:\n dns-eu1.powerdns.net\n dns-eu2.powerdns.net\n dns-us1.powerdns.net\n dns-us2.powerdns.net\n\n WHOIS lookup made at 04:14:40 20-Nov-2013\n\n-- \nThis WHOIS information is provided for free by Nominet UK the central registry\nfor .uk domain names. This information and the .uk WHOIS are:\n\n Copyright Nominet UK 1996 - 2013.\n\nYou may not access the .uk WHOIS or use any data from it except as permitted\nby the terms of use available in full at http://www.nominet.org.uk/whoisterms, which\nincludes restrictions on: (A) use of the data for advertising, or its\nrepackaging, recompilation, redistribution or reuse (B) obscuring, removing\nor hiding any or all of this notice and (C) exceeding query rate or volume\nlimits. The data is provided on an 'as-is' basis and may lag behind the\nregister. Access may be withdrawn or restricted at any time. \n\n"], "whois_server": null, "registrar": ["Webfusion Ltd t/a 123-reg [Tag = 123-REG]"], "name_servers": ["dns-eu1.powerdns.net", "dns-eu2.powerdns.net", "dns-us1.powerdns.net", "dns-us2.powerdns.net"], "id": null}
\ No newline at end of file
+{"updated_date": ["2013-02-01T00:00:00"], "contacts": {"admin": null, "tech": null, "registrant": {"name": "Dan Foster"}, "billing": null}, "nameservers": ["dns-eu1.powerdns.net", "dns-eu2.powerdns.net", "dns-us1.powerdns.net", "dns-us2.powerdns.net"], "expiration_date": ["2015-04-15T00:00:00"], "creation_date": ["2009-04-15T00:00:00", "2009-04-15T00:00:00", "2009-04-15T00:00:00"], "raw": ["\n Domain name:\n zem.org.uk\n\n Registrant:\n Dan Foster\n\n Registrant type:\n UK Individual\n\n Registrant's address:\n The registrant is a non-trading individual who has opted to have their\n address omitted from the WHOIS service.\n\n Registrar:\n Webfusion Ltd t/a 123-reg [Tag = 123-REG]\n URL: http://www.123-reg.co.uk\n\n Relevant dates:\n Registered on: 15-Apr-2009\n Expiry date: 15-Apr-2015\n Last updated: 01-Feb-2013\n\n Registration status:\n Registered until expiry date.\n\n Name servers:\n dns-eu1.powerdns.net\n dns-eu2.powerdns.net\n dns-us1.powerdns.net\n dns-us2.powerdns.net\n\n WHOIS lookup made at 04:14:40 20-Nov-2013\n\n-- \nThis WHOIS information is provided for free by Nominet UK the central registry\nfor .uk domain names. This information and the .uk WHOIS are:\n\n Copyright Nominet UK 1996 - 2013.\n\nYou may not access the .uk WHOIS or use any data from it except as permitted\nby the terms of use available in full at http://www.nominet.org.uk/whoisterms, which\nincludes restrictions on: (A) use of the data for advertising, or its\nrepackaging, recompilation, redistribution or reuse (B) obscuring, removing\nor hiding any or all of this notice and (C) exceeding query rate or volume\nlimits. The data is provided on an 'as-is' basis and may lag behind the\nregister. Access may be withdrawn or restricted at any time. \n\n"], "registrar": ["Webfusion Ltd t/a 123-reg [Tag = 123-REG]"]}
\ No newline at end of file