diff --git a/tests/testtvorganise.py b/tests/testtvorganise.py
index 1c806ff..858e49e 100755
--- a/tests/testtvorganise.py
+++ b/tests/testtvorganise.py
@@ -23,13 +23,20 @@ class testTvOrganise(unittest.TestCase):
 
     def testConfigSettings(self):
         """
-        Using a predefined dict, save then load the config and validate 
+        Using a predefined dict, save then load the config and validate
         the contents
         """
         pass
 
+    def testParseFilenames(self):
+        files = ['/media/out/Heroes - [01x05] - Llamaggeddon.avi']
+
+        res = self.tvo.parse_filenames(files)
+        self.assertEqual(res[0]['showname'], 'Heroes')
+
     def setUp(self):
         self.tvo = tvorganise.TvOrganiser()
+        self.tvo._config = tvorganise.config.Config('tvorganise.cfg')
 
 
 class testFindFiles(unittest.TestCase):
@@ -41,14 +48,14 @@ class testFindFiles(unittest.TestCase):
         os.makedirs("/tmp/find-files-test/folder1")
         os.makedirs("/tmp/find-files-test/folder2")
 
-	open('/tmp/find-files-test/folder1/file1', 'w').close() 
+	open('/tmp/find-files-test/folder1/file1', 'w').close()
         open('/tmp/find-files-test/folder1/file2', 'w').close()
         open('/tmp/find-files-test/folder2/file3', 'w').close()
         open('/tmp/find-files-test/folder2/file4', 'w').close()
         open('/tmp/find-files-test/folder2/file5', 'w').close()
 
     def tearDown(self):
-        shutil.rmtree("/tmp/find-files-test/")        
+        shutil.rmtree("/tmp/find-files-test/")
 
     def testFolderList(self):
         self.assertEqual(len(tvorganise.find_files("/tmp/find-files-test/")),5)
@@ -69,7 +76,7 @@ def suite(suite=None):
 
     suite.addTest(unittest.makeSuite(testTvOrganise))
     suite.addTest(unittest.makeSuite(testFindFiles))
- 
+
     return suite
 
 def run():
diff --git a/tvorganise/__init__.py b/tvorganise/__init__.py
index 847aff2..9aa43c6 100755
--- a/tvorganise/__init__.py
+++ b/tvorganise/__init__.py
@@ -13,11 +13,10 @@ import sys
 import re
 from optparse import OptionParser
 import shutil
-import ConfigParser
 import logging
-
 import config
 
+
 def same_partition(path1, path2):
     """
     Checks to see if two paths are on the same device, returns a
diff --git a/tvorganise/config.py b/tvorganise/config.py
index 111da9a..60f8117 100644
--- a/tvorganise/config.py
+++ b/tvorganise/config.py
@@ -1,20 +1,21 @@
 import ConfigParser
 import re
 
+
 def defaults():
-   """
-   Creates a ConfigParser instance and fills it with the default settings
-   """
+    """
+    Creates a ConfigParser instance and fills it with the default settings
+    """
 
-   config = ConfigParser.RawConfigParser()
+    config = ConfigParser.RawConfigParser()
 
-   config.add_section('main')
-   config.set('main', 'target_path', '/media/%(showname)s/Season %(seasonnum)s/')
+    config.add_section('main')
+    config.set('main', 'target_path', '/media/%(showname)s/Season %(seasonnum)s/')
 
-   config.add_section('regex')
-   config.set('regex', 'valid_in_names', "[\\w\\(\\).,\\[\\]'\\ \\-?!#:]")
+    config.add_section('regex')
+    config.set('regex', 'valid_in_names', "[\\w\\(\\).,\\[\\]'\\ \\-?!#:]")
 
-   return config
+    return config
 
 
 class Config(dict):