diff --git a/python_apps/media-monitor2/media/monitor/pure.py b/python_apps/media-monitor2/media/monitor/pure.py
index b4fd0e7f5..2a8593688 100644
--- a/python_apps/media-monitor2/media/monitor/pure.py
+++ b/python_apps/media-monitor2/media/monitor/pure.py
@@ -9,7 +9,7 @@ import locale
 
 from media.monitor.exceptions import FailedToSetLocale
 
-supported_extensions =  ["mp3", "ogg"]
+supported_extensions =  [u"mp3", u"ogg"]
 unicode_unknown = u'unknown'
 
 class LazyProperty(object):
diff --git a/python_apps/media-monitor2/tests/run_tests.sh b/python_apps/media-monitor2/tests/run_tests.sh
new file mode 100755
index 000000000..e25911505
--- /dev/null
+++ b/python_apps/media-monitor2/tests/run_tests.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+for f in /home/rudi/Airtime/python_apps/media-monitor2/tests/*.py
+do
+    python $f
+done
diff --git a/python_apps/media-monitor2/tests/test_syncdb.py b/python_apps/media-monitor2/tests/test_syncdb.py
new file mode 100644
index 000000000..93e083e8b
--- /dev/null
+++ b/python_apps/media-monitor2/tests/test_syncdb.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+import unittest
+import os
+from media.monitor.syncdb import SyncDB
+from media.monitor.log import get_logger
+from media.monitor.pure import partition
+import api_clients.api_client as ac
+
+class TestSyncDB(unittest.TestCase):
+    def setUp(self):
+        self.ac = ac.AirtimeApiClient(logger=get_logger())
+
+    def test_syncdb_init(self):
+        sdb = SyncDB(self.ac)
+        self.assertTrue( len(sdb.directories.keys()) > 0 )
+
+    def test_list(self):
+        self.sdb = SyncDB(self.ac)
+        for watch_dir in self.sdb.list_directories():
+            self.assertTrue( os.path.exists(watch_dir) )
+
+    def test_directory_get_files(self):
+        sdb = SyncDB(self.ac)
+        print(sdb.directories)
+        for wdir in sdb.list_directories():
+            files = sdb.directory_get_files(wdir)
+            self.assertTrue( len(files) >= 0 )
+            self.assertTrue( isinstance(files, list) )
+            exist, deleted = partition(os.path.exists, files)
+            print("(exist, deleted) = (%d, %d)" % ( len(exist), len(deleted) ) )
+
+if __name__ == '__main__': unittest.main()