diff --git a/elodie/constants.py b/elodie/constants.py
index 0979381..052eb45 100644
--- a/elodie/constants.py
+++ b/elodie/constants.py
@@ -20,7 +20,7 @@ location_db = '{}/location.json'.format(application_directory)
 script_directory = path.dirname(path.dirname(path.abspath(__file__)))
 
 #: Path to Elodie's ExifTool config file.
-exiftool_config = path.join(script_directory,'configs','ExifTool_config') 
+exiftool_config = path.join(script_directory, 'configs', 'ExifTool_config')
 
 #: Accepted language in responses from MapQuest
 accepted_language = 'en'
diff --git a/elodie/geolocation.py b/elodie/geolocation.py
index e9ea6a0..75b003d 100644
--- a/elodie/geolocation.py
+++ b/elodie/geolocation.py
@@ -164,7 +164,7 @@ def reverse_lookup(lat, lon):
         headers = {"Accept-Language": constants.accepted_language}
         r = requests.get(
             'http://open.mapquestapi.com/nominatim/v1/reverse.php?%s' %
-            urllib.urlencode(params),headers=headers
+            urllib.urlencode(params), headers=headers
         )
         return r.json()
     except requests.exceptions.RequestException as e:
diff --git a/elodie/media/media.py b/elodie/media/media.py
index cb7971a..b98df36 100644
--- a/elodie/media/media.py
+++ b/elodie/media/media.py
@@ -226,7 +226,7 @@ class Media(object):
             print '%s -config "%s" -xmp-elodie:Album="%s" "%s"' % (exiftool, exiftool_config, name, source)  # noqa
         process_output = subprocess.Popen(
             '%s -config "%s" -xmp-elodie:Album="%s" "%s"' %
-                  (exiftool, exiftool_config, name, source),
+            (exiftool, exiftool_config, name, source),
             stdout=subprocess.PIPE,
             shell=True
         )
diff --git a/requirements.txt b/requirements.txt
index cfb3339..8305605 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,3 +2,4 @@ click>=6.2,<7.0
 LatLon>=1.0.2,<2.0
 requests>=2.9.1,<3.0
 send2trash>=1.3.0,<2.0
+mock>=1.3.0