diff --git a/apps/reader/fixtures/subscriptions.json b/apps/reader/fixtures/subscriptions.json
index 05f53a7a7..34d05528c 100644
--- a/apps/reader/fixtures/subscriptions.json
+++ b/apps/reader/fixtures/subscriptions.json
@@ -135,6 +135,14 @@
         }
     },
 
+    {
+        "pk": 2,
+        "model": "sites.site",
+        "fields": {
+            "domain": "testserver",
+            "name": "testserver"
+        }
+    },
 
     {
         "pk": 1, 
diff --git a/apps/reader/models.py b/apps/reader/models.py
index 86f69ffb9..ce2f0ce85 100644
--- a/apps/reader/models.py
+++ b/apps/reader/models.py
@@ -351,7 +351,7 @@ class UserSubscription(models.Model):
         # now = datetime.datetime.strptime("2009-07-06 22:30:03", "%Y-%m-%d %H:%M:%S")
         now = datetime.datetime.now()
         UNREAD_CUTOFF = now - datetime.timedelta(days=settings.DAYS_OF_UNREAD)
-
+        
         if self.user.profile.last_seen_on < UNREAD_CUTOFF:
             # if not silent:
             #     logging.info(' ---> [%s] SKIPPING Computing scores: %s (1 week+)' % (self.user, self.feed))
diff --git a/apps/reader/tests.py b/apps/reader/tests.py
index 7ed73127e..4a9bebbf6 100644
--- a/apps/reader/tests.py
+++ b/apps/reader/tests.py
@@ -2,13 +2,21 @@ from utils import json_functions as json
 from django.test.client import Client
 from django.test import TestCase
 from django.core.urlresolvers import reverse
+from django.conf import settings
+from mongoengine.connection import connect, disconnect
 
 class ReaderTest(TestCase):
     fixtures = ['subscriptions.json', 'stories.json', '../../rss_feeds/fixtures/gawker1.json']
     
-    def setUp(self):
-        self.client = Client()
     
+    def setUp(self):
+        disconnect()
+        settings.MONGODB = connect('test_newsblur')
+        self.client = Client()
+
+    def tearDown(self):
+        settings.MONGODB.drop_database('test_newsblur')
+            
     def test_api_feeds(self):
         self.client.login(username='conesus', password='test')
         
diff --git a/apps/rss_feeds/fixtures/bootstrap.json b/apps/rss_feeds/fixtures/bootstrap.json
index c5e3b2c8c..9b1a67562 100644
--- a/apps/rss_feeds/fixtures/bootstrap.json
+++ b/apps/rss_feeds/fixtures/bootstrap.json
@@ -1,16 +1,16 @@
 [
     {
-        "pk": 1,
+        "pk": 2,
         "model": "sites.site",
         "fields": {
-            "domain": "localhost",
-            "name": "NewsBlur"
+            "domain": "testserver",
+            "name": "testserver"
         }
     },
     {
         "model": "auth.user",
         "fields": {
-            "username": "newsblur",
+            "username": "newsblur_test",
             "first_name": "",
             "last_name": "",
             "is_active": true,
diff --git a/apps/rss_feeds/fixtures/rss_feeds.json b/apps/rss_feeds/fixtures/rss_feeds.json
index 1afc26dee..5ffc0cf06 100644
--- a/apps/rss_feeds/fixtures/rss_feeds.json
+++ b/apps/rss_feeds/fixtures/rss_feeds.json
@@ -109,6 +109,14 @@
         }
     },
 
+    {
+        "pk": 2,
+        "model": "sites.site",
+        "fields": {
+            "domain": "testserver",
+            "name": "testserver"
+        }
+    },
 
 
     {
diff --git a/apps/rss_feeds/tests.py b/apps/rss_feeds/tests.py
index 3500d2f20..74e7c0c7b 100644
--- a/apps/rss_feeds/tests.py
+++ b/apps/rss_feeds/tests.py
@@ -3,15 +3,21 @@ from django.test.client import Client
 from django.test import TestCase
 from django.core import management
 from django.core.urlresolvers import reverse
+from django.conf import settings
 from apps.rss_feeds.models import Feed, MStory
-
+from mongoengine.connection import connect, disconnect
 
 class FeedTest(TestCase):
     fixtures = ['rss_feeds.json']
     
     def setUp(self):
+        disconnect()
+        settings.MONGODB = connect('test_newsblur')
         self.client = Client()
 
+    def tearDown(self):
+        settings.MONGODB.drop_database('test_newsblur')
+        
     def test_load_feeds__gawker(self):
         self.client.login(username='conesus', password='test')
         
diff --git a/utils/feed_fetcher.py b/utils/feed_fetcher.py
index 1751fcfe3..d411a4528 100644
--- a/utils/feed_fetcher.py
+++ b/utils/feed_fetcher.py
@@ -413,7 +413,8 @@ class Dispatcher:
                 feed_code = 500
                 fetched_feed = None
                 mail_feed_error_to_admin(feed, e, local_vars=locals())
-                if not settings.DEBUG:
+                if (not settings.DEBUG and hasattr(settings, 'RAVEN_CLIENT') and
+                    settings.RAVEN_CLIENT):
                     settings.RAVEN_CLIENT.captureException(e)
 
             if not feed_code:
diff --git a/utils/test-settings.py b/utils/test-settings.py
index ed9235f23..3943201f1 100644
--- a/utils/test-settings.py
+++ b/utils/test-settings.py
@@ -1,7 +1,7 @@
 from settings import *
 DATABASES = {
     'default': {
-        'NAME': ':memory:',
+        'NAME': 'memory',
         'ENGINE': 'django.db.backends.sqlite3',
         'USER': 'newsblur',
         'PASSWORD': '',
@@ -9,16 +9,17 @@ DATABASES = {
     }
 }
 MONGO_DB = {
-    'NAME': 'newsblur_test',
-    'HOST': '127.0.0.1',
-    'PORT': 27017
-}      
+    'name': 'newsblur_test',
+    'host': '127.0.0.1:27017',
+}
 
+MONGO_DATABASE_NAME = 'test_newsblur'
 TEST_DATABASE_NAME = ":memory:"
 DAYS_OF_UNREAD = 9999
 TEST_DEBUG = True
 DEBUG = True
-
+SITE_ID = 2
+RAVEN_CLIENT = None
 # from django.db import connection
 # cursor = connection.cursor()
 # cursor.execute('PRAGMA temp_store = MEMORY;')