diff --git a/.env_template b/.env_template
new file mode 100644
index 0000000..ff7afa6
--- /dev/null
+++ b/.env_template
@@ -0,0 +1,2 @@
+SAUCE_USERNAME=""
+SAUCE_ACCESS_KEY=""
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 0d20b64..78bf3f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,64 @@
+*.bak
+.env
+# Byte-compiled / optimized / DLL files
+__pycache__/
 *.pyc
+*.pyd
+*.pyo
+
+# Virtual environment
+.venv/
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+eggs/
+*.egg-info/
+.installed.cfg
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# IDE-specific files
+.idea/  # IntelliJ IDEA / PyCharm
+*.iml
+.vscode/ # VS Code
+.settings/ # Eclipse
+.project
+.pydevproject
+
+# OS-specific files
+.DS_Store # macOS
+Thumbs.db # Windows
+
+# Jupyter Notebook files
+.ipynb_checkpoints
+
+# MyPy
+.mypy_cache/
+
+# Data files
+*.log
diff --git a/Pipfile b/Pipfile
deleted file mode 100644
index 9db2a8c..0000000
--- a/Pipfile
+++ /dev/null
@@ -1,14 +0,0 @@
-[[source]]
-name = "pypi"
-url = "https://pypi.org/simple"
-verify_ssl = true
-
-[dev-packages]
-nose = "==1.3.7"
-selenium = "==3.4.2"
-twine = "*"
-
-[packages]
-
-[requires]
-python_version = "3.8"
diff --git a/Pipfile.lock b/Pipfile.lock
deleted file mode 100644
index 767b427..0000000
--- a/Pipfile.lock
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-    "_meta": {
-        "hash": {
-            "sha256": "aa65200f913c612fbc54485aaf0a80513c433f52042f5c241b27339dac2eaecb"
-        },
-        "pipfile-spec": 6,
-        "requires": {
-            "python_version": "3.8"
-        },
-        "sources": [
-            {
-                "name": "pypi",
-                "url": "https://pypi.org/simple",
-                "verify_ssl": true
-            }
-        ]
-    },
-    "default": {},
-    "develop": {
-        "bleach": {
-            "hashes": [
-                "sha256:cc8da25076a1fe56c3ac63671e2194458e0c4d9c7becfd52ca251650d517903c",
-                "sha256:e78e426105ac07026ba098f04de8abe9b6e3e98b5befbf89b51a5ef0a4292b03"
-            ],
-            "version": "==3.1.4"
-        },
-        "certifi": {
-            "hashes": [
-                "sha256:1d987a998c75633c40847cc966fcf5904906c920a7f17ef374f5aa4282abd304",
-                "sha256:51fcb31174be6e6664c5f69e3e1691a2d72a1a12e90f872cbdb1567eb47b6519"
-            ],
-            "version": "==2020.4.5.1"
-        },
-        "chardet": {
-            "hashes": [
-                "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae",
-                "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"
-            ],
-            "version": "==3.0.4"
-        },
-        "docutils": {
-            "hashes": [
-                "sha256:0c5b78adfbf7762415433f5515cd5c9e762339e23369dbe8000d84a4bf4ab3af",
-                "sha256:c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc"
-            ],
-            "version": "==0.16"
-        },
-        "idna": {
-            "hashes": [
-                "sha256:7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb",
-                "sha256:a068a21ceac8a4d63dbfd964670474107f541babbd2250d61922f029858365fa"
-            ],
-            "version": "==2.9"
-        },
-        "keyring": {
-            "hashes": [
-                "sha256:197fd5903901030ef7b82fe247f43cfed2c157a28e7747d1cfcf4bc5e699dd03",
-                "sha256:8179b1cdcdcbc221456b5b74e6b7cfa06f8dd9f239eb81892166d9223d82c5ba"
-            ],
-            "version": "==21.2.0"
-        },
-        "nose": {
-            "hashes": [
-                "sha256:9ff7c6cc443f8c51994b34a667bbcf45afd6d945be7477b52e97516fd17c53ac",
-                "sha256:dadcddc0aefbf99eea214e0f1232b94f2fa9bd98fa8353711dacb112bfcbbb2a",
-                "sha256:f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98"
-            ],
-            "index": "pypi",
-            "version": "==1.3.7"
-        },
-        "pkginfo": {
-            "hashes": [
-                "sha256:7424f2c8511c186cd5424bbf31045b77435b37a8d604990b79d4e70d741148bb",
-                "sha256:a6d9e40ca61ad3ebd0b72fbadd4fba16e4c0e4df0428c041e01e06eb6ee71f32"
-            ],
-            "version": "==1.5.0.1"
-        },
-        "pygments": {
-            "hashes": [
-                "sha256:647344a061c249a3b74e230c739f434d7ea4d8b1d5f3721bc0f3558049b38f44",
-                "sha256:ff7a40b4860b727ab48fad6360eb351cc1b33cbf9b15a0f689ca5353e9463324"
-            ],
-            "version": "==2.6.1"
-        },
-        "readme-renderer": {
-            "hashes": [
-                "sha256:1b6d8dd1673a0b293766b4106af766b6eff3654605f9c4f239e65de6076bc222",
-                "sha256:e67d64242f0174a63c3b727801a2fff4c1f38ebe5d71d95ff7ece081945a6cd4"
-            ],
-            "version": "==25.0"
-        },
-        "requests": {
-            "hashes": [
-                "sha256:43999036bfa82904b6af1d99e4882b560e5e2c68e5c4b0aa03b655f3d7d73fee",
-                "sha256:b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6"
-            ],
-            "version": "==2.23.0"
-        },
-        "requests-toolbelt": {
-            "hashes": [
-                "sha256:380606e1d10dc85c3bd47bf5a6095f815ec007be7a8b69c878507068df059e6f",
-                "sha256:968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0"
-            ],
-            "version": "==0.9.1"
-        },
-        "selenium": {
-            "hashes": [
-                "sha256:046439d9370105fdb0dc99caee7dbf3290a22b8cf42d182b064abdaed030bd30",
-                "sha256:2befcd8a18c4a88fe7af1f848277d83aa89682516fb2ac95942cb13ea6eaad02"
-            ],
-            "index": "pypi",
-            "version": "==3.4.2"
-        },
-        "six": {
-            "hashes": [
-                "sha256:236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a",
-                "sha256:8f3cd2e254d8f793e7f3d6d9df77b92252b52637291d0f0da013c76ea2724b6c"
-            ],
-            "version": "==1.14.0"
-        },
-        "tqdm": {
-            "hashes": [
-                "sha256:00339634a22c10a7a22476ee946bbde2dbe48d042ded784e4d88e0236eca5d81",
-                "sha256:ea9e3fd6bd9a37e8783d75bfc4c1faf3c6813da6bd1c3e776488b41ec683af94"
-            ],
-            "version": "==4.45.0"
-        },
-        "twine": {
-            "hashes": [
-                "sha256:c1af8ca391e43b0a06bbc155f7f67db0bf0d19d284bfc88d1675da497a946124",
-                "sha256:d561a5e511f70275e5a485a6275ff61851c16ffcb3a95a602189161112d9f160"
-            ],
-            "index": "pypi",
-            "version": "==3.1.1"
-        },
-        "urllib3": {
-            "hashes": [
-                "sha256:3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527",
-                "sha256:88206b0eb87e6d677d424843ac5209e3fb9d0190d0ee169599165ec25e9d9115"
-            ],
-            "version": "==1.25.9"
-        },
-        "webencodings": {
-            "hashes": [
-                "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78",
-                "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"
-            ],
-            "version": "==0.5.1"
-        }
-    }
-}
diff --git a/README.rst b/README.rst
index e08bea5..fa2c23a 100644
--- a/README.rst
+++ b/README.rst
@@ -46,6 +46,16 @@ Supported and unsupported cases are documented by tests. If you have a request
 or a contribution for new conversions, include a test that proves the issue and
 solution and send a pull request.
 
+To install the dependencies (Python 3.7+)
+
+  $ python3 -m venv venv
+  $ source venv/bin/activate
+  # pip install -r requirements.txt
+
+Populate environment variables
+  copy the file .env_template to .env and change the value of the variables.
+  Python-dotenv will get the value and feed the code where necessary 
+
 To run all unit tests locally::
 
   $ nosetests tests/test_cssify.py
diff --git a/cssify/cssify.py b/cssify/cssify.py
index 19d29a9..6acbf39 100755
--- a/cssify/cssify.py
+++ b/cssify/cssify.py
@@ -5,24 +5,24 @@
 from optparse import OptionParser
 
 sub_regexes = {
-    "tag": "([a-zA-Z][a-zA-Z0-9]{0,10}|\*)",
-    "attribute": "[.a-zA-Z_:][-\w:.]*(\(\))?)",
-    "value": "\s*[\w/:][-/\w\s,:;.]*"
+    "tag": r"([a-zA-Z][a-zA-Z0-9]{0,10}|\*)",
+    "attribute": r"[.a-zA-Z_:][-\w:.]*(\(\))?)",
+    "value": r"\s*[\w/:][-/\w\s,:;.]*",
 }
 
 validation_re = (
     "(?P<node>"
-      "("
-        "^id\([\"\']?(?P<idvalue>%(value)s)[\"\']?\)" # special case! id(idValue)
-      "|"
-        "(?P<nav>//?)(?P<tag>%(tag)s)" # //div
-        "(\[("
-          "(?P<matched>(?P<mattr>@?%(attribute)s=[\"\'](?P<mvalue>%(value)s))[\"\']" # [@id="bleh"] and [text()="meh"]
-        "|"
-          "(?P<contained>contains\((?P<cattr>@?%(attribute)s,\s*[\"\'](?P<cvalue>%(value)s)[\"\']\))" # [contains(text(), "bleh")] or [contains(@id, "bleh")]
-        ")\])?"
-        "(\[(?P<nth>\d+)\])?"
-      ")"
+    "("
+    "^id\\([\"']?(?P<idvalue>%(value)s)[\"']?\\)"  # special case! id(idValue)
+    "|"
+    "(?P<nav>//?)(?P<tag>%(tag)s)"  # //div
+    r"(\[("
+    "(?P<matched>(?P<mattr>@?%(attribute)s=[\"'](?P<mvalue>%(value)s))[\"']"  # [@id="bleh"] and [text()="meh"]
+    "|"
+    "(?P<contained>contains\\((?P<cattr>@?%(attribute)s,\\s*[\"'](?P<cvalue>%(value)s)[\"']\\))"  # [contains(text(), "bleh")] or [contains(@id, "bleh")]
+    r")\])?"
+    r"(\[(?P<nth>\d+)\])?"
+    ")"
     ")" % sub_regexes
 )
 
@@ -33,61 +33,57 @@ class XpathException(Exception):
     pass
 
 
-def cssify(xpath):
+def cssify(xpath: str):
     """
     Get your XPATHs translated to css automatically! (don't go to crazy on what
     you want to translate, this script is smart but won't do your breakfast).
     """
 
-    css = ""
-    position = 0
+    css: str = ""
+    position: int = 0
 
     while position < len(xpath):
         node = prog.match(xpath[position:])
         if node is None:
-            raise XpathException("Invalid or unsupported Xpath: %s" % xpath)
-        log("node found: %s" % node)
+            raise XpathException(f"Invalid or unsupported Xpath: {xpath}")
+        log(f"node found: {node}")
         match = node.groupdict()
-        log("broke node down to: %s" % match)
+        log(f"broke node down to: {match}")
 
+        nav: str = ""
         if position != 0:
-            nav = " " if match['nav'] == "//" else " > "
-        else:
-            nav = ""
-
-        tag = "" if match['tag'] == "*" else match['tag'] or ""
-
-        if match['idvalue']:
-            attr = "#%s" % match['idvalue'].replace(" ", "#")
-        elif match['matched']:
-            if match['mattr'] == "@id":
-                attr = "#%s" % match['mvalue'].replace(" ", "#")
-            elif match['mattr'] == "@class":
-                attr = ".%s" % match['mvalue'].replace(" ", ".")
-            elif match['mattr'] in ["text()", "."]:
-                attr = ":contains(^%s$)" % match['mvalue']
-            elif match['mattr']:
+            nav = " " if match["nav"] == "//" else " > "
+
+        tag: str = "" if match["tag"] == "*" else match["tag"] or ""
+
+        attr: str = ""
+        if match["idvalue"]:
+            attr = f"#{match['idvalue'].replace(' ', '#')}"
+        elif match["matched"]:
+            if match["mattr"] == "@id":
+                attr = f"#{match['mvalue'].replace(' ', '#')}"
+            elif match["mattr"] == "@class":
+                attr = f".{match['mvalue'].replace(' ', '.')}"
+            elif match["mattr"] in ["text()", "."]:
+                attr = f":contains(^{match['mvalue']}$)"
+            elif match["mattr"]:
                 if match["mvalue"].find(" ") != -1:
-                    match["mvalue"] = "\"%s\"" % match["mvalue"]
-                attr = "[%s=%s]" % (match['mattr'].replace("@", ""),
-                                    match['mvalue'])
-        elif match['contained']:
-            if match['cattr'].startswith("@"):
-                attr = "[%s*=%s]" % (match['cattr'].replace("@", ""),
-                                     match['cvalue'])
-            elif match['cattr'] == "text()":
-                attr = ":contains(%s)" % match['cvalue']
-        else:
-            attr = ""
-
-        if match['nth']:
-            nth = ":nth-of-type(%s)" % match['nth']
-        else:
-            nth = ""
-
-        node_css = nav + tag + attr + nth
-
-        log("final node css: %s" % node_css)
+                    mvalue: str = match["mvalue"]
+                    match["mvalue"] = f'"{mvalue}"'
+                attr = f"[{match['mattr'].replace('@', '')}={match['mvalue']}]"
+        elif match["contained"]:
+            if match["cattr"].startswith("@"):
+                attr = f"[{match['cattr'].replace('@', '')}*={match['cvalue']}]"
+            elif match["cattr"] == "text()":
+                attr = f":contains({match['cvalue']})"
+
+        nth: str = ""
+        if match["nth"]:
+            nth = f":nth-of-type({match['nth']})"
+
+        node_css: str = nav + tag + attr + nth
+
+        log(f"final node css: {node_css}")
 
         css += node_css
         position += node.end()
@@ -95,19 +91,28 @@ def cssify(xpath):
         css = css.strip()
         return css
 
+
 if __name__ == "__main__":
     usage = "usage: %prog [options] XPATH"
     parser = OptionParser(usage)
-    parser.add_option("-v", "--verbose",
-                      action="store_true", dest="verbose", default=False,
-                      help="print status messages to stdout")
+    parser.add_option(
+        "-v",
+        "--verbose",
+        action="store_true",
+        dest="verbose",
+        default=False,
+        help="print status messages to stdout",
+    )
 
     (options, args) = parser.parse_args()
 
     if options.verbose:
+
         def log(msg):
-            print("> %s" % msg)
+            print(f"> {msg}")
+
     else:
+
         def log(msg):
             pass
 
@@ -119,5 +124,6 @@ def log(msg):
         print(e)
         sys.exit(1)
 else:
+
     def log(msg):
         pass
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..37a5693
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,3 @@
+nose
+python-dotenv
+selenium
diff --git a/setup.py b/setup.py
index b2e21cf..32c4ccf 100755
--- a/setup.py
+++ b/setup.py
@@ -2,13 +2,14 @@
 
 from distutils.core import setup
 
-setup(name='cssify',
-      version='1.1',
-      license='MIT',
-      description='Convert XPATH locators to CSS',
-      author='Santiago Suarez Ordonez',
-      author_email='santiycr@gmail.com',
-      url = 'https://github.com/santiycr/cssify',
-      download_url = 'https://github.com/santiycr/cssify/archive/v_10.tar.gz',
-      packages=['cssify'],
-     )
+setup(
+    name="cssify",
+    version="1.1",
+    license="MIT",
+    description="Convert XPATH locators to CSS",
+    author="Santiago Suarez Ordonez",
+    author_email="santiycr@gmail.com",
+    url="https://github.com/santiycr/cssify",
+    download_url="https://github.com/santiycr/cssify/archive/v_10.tar.gz",
+    packages=["cssify"],
+)
diff --git a/tests/test_cssify.py b/tests/test_cssify.py
index 2f68455..bc4e864 100644
--- a/tests/test_cssify.py
+++ b/tests/test_cssify.py
@@ -1,19 +1,22 @@
 #!/usr/bin/env python
 
-from test_data import SUPPORTED, UNSUPPORTED
 import os
 import sys
+
+from test_data import SUPPORTED, UNSUPPORTED
+
+from cssify.cssify import XpathException, cssify
+
 parentdir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 sys.path.insert(0, parentdir)
-import cssify
 import unittest
 
 
 class CssifyTest(unittest.TestCase):
     def test_supported(self):
         for path, cssified in SUPPORTED:
-            self.assertEqual(cssify.cssify(path), cssified)
+            self.assertEqual(cssify(path), cssified)
 
     def test_unsupported(self):
         for path in UNSUPPORTED:
-            self.assertRaises(cssify.XpathException, cssify.cssify, (path))
+            self.assertRaises(XpathException, cssify, (path))
diff --git a/tests/test_cssify_web.py b/tests/test_cssify_web.py
index a5cc38d..02949bb 100644
--- a/tests/test_cssify_web.py
+++ b/tests/test_cssify_web.py
@@ -1,73 +1,81 @@
 #!/usr/bin/python
 
-import os
-import sys
-import new
-from random import randint
 import base64
+import http.client
 import json
-import httplib
+import os
+import sys
 import unittest
+
+# import new
+from random import randint
+
 from selenium import webdriver
 from selenium.webdriver.support.ui import WebDriverWait
-
 from test_data import SUPPORTED, UNSUPPORTED
+from dotenv import load_dotenv
+from selenium.webdriver.chrome.options import Options
+
+load_dotenv()
 
 
 class CssifyWebTest(unittest.TestCase):
     __test__ = False
 
     def setUp(self):
-        self.caps['name'] = 'Testing cssify'
-        if (os.environ.get('TRAVIS') and
-            os.environ.get('HAS_JOSH_K_SEAL_OF_APPROVAL')):
-            self.caps['tunnel-identifier'] = os.environ['TRAVIS_JOB_NUMBER']
-            self.caps['build'] = os.environ['TRAVIS_BUILD_NUMBER']
-            self.caps['tags'] = [os.environ['TRAVIS_PYTHON_VERSION'], 'CI']
-        self.url = 'http://localhost:8080/'
-
-        self.username = os.environ['SAUCE_USERNAME']
-        self.key = os.environ['SAUCE_ACCESS_KEY']
-        hub_url = "%s:%s@ondemand.saucelabs.com:80" % (self.username, self.key)
-        self.driver = webdriver.Remote(desired_capabilities=self.caps,
-                                       command_executor="http://%s/wd/hub" % hub_url)
+        self.caps["name"] = "Testing cssify"
+        if os.environ.get("TRAVIS") and os.environ.get("HAS_JOSH_K_SEAL_OF_APPROVAL"):
+            self.caps["tunnel-identifier"] = os.environ["TRAVIS_JOB_NUMBER"]
+            self.caps["build"] = os.environ["TRAVIS_BUILD_NUMBER"]
+            self.caps["tags"] = [os.environ["TRAVIS_PYTHON_VERSION"], "CI"]
+        self.url = "http://localhost:8080/"
+
+        self.username = os.environ["SAUCE_USERNAME"]
+        self.key = os.environ["SAUCE_ACCESS_KEY"]
+        hub_url = f"{self.username}:{self.key}@ondemand.saucelabs.com:80"
+
+        self.driver = webdriver.Remote(
+            options=Options(), command_executor="http://%s/wd/hub" % hub_url
+        )
         self.jobid = self.driver.session_id
-        print "Sauce Labs job: https://saucelabs.com/jobs/%s" % self.jobid
+        print("Sauce Labs job: https://saucelabs.com/jobs/%s" % self.jobid)
         self.driver.implicitly_wait(30)
 
     def report_test_result(self):
-        base64string = base64.encodestring('%s:%s'
-                                           % (self.username, self.key))[:-1]
-        result = json.dumps({'passed': sys.exc_info() == (None, None, None)})
-        connection = httplib.HTTPConnection("saucelabs.com")
-        connection.request('PUT',
-                           '/rest/v1/%s/jobs/%s' % (self.username, self.jobid),
-                           result,
-                           headers={"Authorization": "Basic %s" % base64string})
+        base64string = base64.encodestring(f"{self.username}:{self.key}")[:-1]
+        result = json.dumps({"passed": sys.exc_info() == (None, None, None)})
+        connection = http.client.HTTPConnection("saucelabs.com")
+        connection.request(
+            "PUT",
+            f"/rest/v1/{self.username}/jobs/{self.jobid}",
+            result,
+            headers={"Authorization": "Basic %s" % base64string},
+        )
         result = connection.getresponse()
         return result.status == 200
 
     def test_supported_cssify(self):
         for path, cssified in SUPPORTED:
             self.driver.get(self.url)
-            xpath = self.driver.find_element_by_id('xpath')
+            xpath = self.driver.find_element_by_id("xpath")
             xpath.send_keys(path)
             xpath.submit()
             css = WebDriverWait(self.driver, 30).until(
-                lambda driver: driver.find_element_by_id("css"))
+                lambda driver: driver.find_element_by_id("css")
+            )
             self.assertEqual(css.get_attribute("value"), cssified)
 
     def test_unsupported_cssify(self):
         for path in UNSUPPORTED:
             self.driver.get(self.url)
             self.assertTrue("cssify" in self.driver.title)
-            xpath = self.driver.find_element_by_id('xpath')
+            xpath = self.driver.find_element_by_id("xpath")
             xpath.send_keys(path)
             xpath.submit()
             fail = WebDriverWait(self.driver, 30).until(
-                lambda driver: driver.find_element_by_class_name("fail"))
-            self.assertEqual("Invalid or unsupported Xpath: %s" % path,
-                             fail.text)
+                lambda driver: driver.find_element_by_class_name("fail")
+            )
+            self.assertEqual("Invalid or unsupported Xpath: %s" % path, fail.text)
 
     def tearDown(self):
         self.driver.quit()
@@ -75,40 +83,47 @@ def tearDown(self):
 
 
 PLATFORMS = [
-    {'browserName': 'firefox',
-     'platform': 'LINUX',
-     },
-    {'browserName': 'firefox',
-     'platform': 'XP',
-     },
-    {'browserName': 'chrome',
-     'platform': 'LINUX',
-     },
-    {'browserName': 'chrome',
-     'platform': 'XP',
-     },
-    {'browserName': 'internet explorer',
-     'platform': 'WIN8',
-     },
-    {'browserName': 'internet explorer',
-     'platform': 'VISTA',
-     },
-    {'browserName': 'internet explorer',
-     'platform': 'XP',
-     },
+    {
+        "browserName": "firefox",
+        "platform": "LINUX",
+    },
+    {
+        "browserName": "firefox",
+        "platform": "XP",
+    },
+    {
+        "browserName": "chrome",
+        "platform": "LINUX",
+    },
+    {
+        "browserName": "chrome",
+        "platform": "XP",
+    },
+    {
+        "browserName": "internet explorer",
+        "platform": "WIN8",
+    },
+    {
+        "browserName": "internet explorer",
+        "platform": "VISTA",
+    },
+    {
+        "browserName": "internet explorer",
+        "platform": "XP",
+    },
 ]
 
 classes = {}
 for platform in PLATFORMS:
     d = dict(CssifyWebTest.__dict__)
-    name = "%s_%s_%s_%s" % (CssifyWebTest.__name__,
-                            platform['browserName'],
-                            platform.get('platform', 'ANY'),
-                            randint(0, 999))
+    name = f"{CssifyWebTest.__name__}_{platform['browserName']}_{platform.get('platform', 'ANY')}_{randint(0, 999)}"
     name = name.replace(" ", "").replace(".", "")
-    d.update({'__test__': True,
-              'caps': platform,
-              })
-    classes[name] = new.classobj(name, (CssifyWebTest,), d)
+    d.update(
+        {
+            "__test__": True,
+            "caps": platform,
+        }
+    )
+    classes[name] = type(name, (CssifyWebTest,), d)
 
 globals().update(classes)
diff --git a/tests/test_data.py b/tests/test_data.py
index 9210022..bbfdaab 100644
--- a/tests/test_data.py
+++ b/tests/test_data.py
@@ -1,32 +1,34 @@
 #!/usr/bin/python
 
 SUPPORTED = [
-    ('//a', 'a'),
-    ('//a[2]', 'a:nth-of-type(2)'),
-    ('/html/body/h1', 'html > body > h1'),
-    ('//a[@id="myId"]', 'a#myId'),
-    ("//a[@id='myId']", 'a#myId'),
-    ('//a[@id="myId"][4]', 'a#myId:nth-of-type(4)'),
-    ('//*[@id="myId"]', '#myId'),
-    ('id(myId)', '#myId'),
-    ('id("myId")/a', '#myId > a'),
-    ('//a[@class="myClass"]', 'a.myClass'),
-    ('//*[@class="myClass"]', '.myClass'),
-    ('//a[@class="multiple classes"]', 'a.multiple.classes'),
-    ('//a[@href="bleh"]', 'a[href=bleh]'),
+    ("//a", "a"),
+    ("//a[2]", "a:nth-of-type(2)"),
+    ("/html/body/h1", "html > body > h1"),
+    ('//a[@id="myId"]', "a#myId"),
+    ("//a[@id='myId']", "a#myId"),
+    ('//a[@id="myId"][4]', "a#myId:nth-of-type(4)"),
+    ('//*[@id="myId"]', "#myId"),
+    ("id(myId)", "#myId"),
+    ('id("myId")/a', "#myId > a"),
+    ('//a[@class="myClass"]', "a.myClass"),
+    ('//*[@class="myClass"]', ".myClass"),
+    ('//a[@class="multiple classes"]', "a.multiple.classes"),
+    ('//a[@href="bleh"]', "a[href=bleh]"),
     ('//a[@href="bleh bar"]', 'a[href="bleh bar"]'),
-    ('//a[@href="/bleh"]', 'a[href=/bleh]'),
-    ('//a[@class="class-bleh"]', 'a.class-bleh'),
-    ('//a[.="my text"]', 'a:contains(^my text$)'),
-    ('//a[text()="my text"]', 'a:contains(^my text$)'),
-    ('//a[contains(@id, "bleh")]', 'a[id*=bleh]'),
-    ('//a[contains(text(), "bleh")]', 'a:contains(bleh)'),
-    ('//div[@id="myId"]/span[@class="myClass"]//a[contains(text(), "bleh")]//img',
-     'div#myId > span.myClass a:contains(bleh) img'),
+    ('//a[@href="/bleh"]', "a[href=/bleh]"),
+    ('//a[@class="class-bleh"]', "a.class-bleh"),
+    ('//a[.="my text"]', "a:contains(^my text$)"),
+    ('//a[text()="my text"]', "a:contains(^my text$)"),
+    ('//a[contains(@id, "bleh")]', "a[id*=bleh]"),
+    ('//a[contains(text(), "bleh")]', "a:contains(bleh)"),
+    (
+        '//div[@id="myId"]/span[@class="myClass"]//a[contains(text(), "bleh")]//img',
+        "div#myId > span.myClass a:contains(bleh) img",
+    ),
 ]
 
 UNSUPPORTED = [
-    'fail',
-    'a[[]]',
-    '(//a)[2]',
+    "fail",
+    "a[[]]",
+    "(//a)[2]",
 ]