--- a/test/test_main.py	Fri Apr 15 09:19:59 2016 -0600
+++ b/test/test_main.py	Fri Apr 15 09:20:53 2016 -0600
@@ -19,7 +19,7 @@
 
     def test_ascii_with_schema_path_and_query(self):
         url = 'https://www.google.com/search?q=why+is+domain+whois+such+a+mess'
-        domain = 'google.com'
+        domain = 'www.google.com'
         self.assertEqual(domain, extract_domain(url))
 
     def test_simple_unicode_domain(self):

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/test_query.py	Fri Apr 15 09:20:53 2016 -0600
@@ -0,0 +1,28 @@
+# coding=utf-8
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
+from builtins import *
+import unittest
+from whois import whois
+
+
+class TestQuery(unittest.TestCase):
+    def test_simple_ascii_domain(self):
+        domain = 'google.com'
+        whois(domain)
+
+    def test_simple_unicode_domain(self):
+        domain = 'нарояци.com'
+        whois(domain)
+
+    def test_unicode_domain_and_tld(self):
+        domain = 'россия.рф'
+        whois(domain)
+
+    def test_fail(self):
+        raise Exception('Whiskey Tango Foxtrot, over?')