diff --git a/rhodecode/model/notification.py b/rhodecode/model/notification.py
--- a/rhodecode/model/notification.py
+++ b/rhodecode/model/notification.py
@@ -181,9 +181,9 @@ class NotificationModel(BaseModel):
 
 class EmailNotificationModel(BaseModel):
 
-    TYPE_CHANGESET_COMMENT = 'changeset_comment'
+    TYPE_CHANGESET_COMMENT = Notification.TYPE_CHANGESET_COMMENT
     TYPE_PASSWORD_RESET = 'passoword_link'
-    TYPE_REGISTRATION = 'registration'
+    TYPE_REGISTRATION = Notification.TYPE_REGISTRATION
     TYPE_DEFAULT = 'default'
 
     def __init__(self):
@@ -204,7 +204,7 @@ class EmailNotificationModel(BaseModel):
         :param type_:
         """
 
-        base = self.email_types.get(type_, self.TYPE_DEFAULT)
+        base = self.email_types.get(type_, self.email_types[self.TYPE_DEFAULT])
         email_template = self._tmpl_lookup.get_template(base)
         # translator inject
         _kwargs = {'_':_}
diff --git a/rhodecode/tests/functional/test_forks.py b/rhodecode/tests/functional/test_forks.py
--- a/rhodecode/tests/functional/test_forks.py
+++ b/rhodecode/tests/functional/test_forks.py
@@ -76,7 +76,10 @@ class TestForksController(TestController
         response = response.follow()
 
 
-        #check if fork is marked as fork
+        # check if fork is marked as fork
+        # wait for cache to expire
+        import time
+        time.sleep(10)
         response = self.app.get(url(controller='summary', action='index',
                                     repo_name=fork_name))
 
diff --git a/rhodecode/tests/functional/test_login.py b/rhodecode/tests/functional/test_login.py
--- a/rhodecode/tests/functional/test_login.py
+++ b/rhodecode/tests/functional/test_login.py
@@ -1,12 +1,19 @@
 # -*- coding: utf-8 -*-
 from rhodecode.tests import *
-from rhodecode.model.db import User
+from rhodecode.model.db import User, Notification
 from rhodecode.lib import generate_api_key
 from rhodecode.lib.auth import check_password
-
+from rhodecode.model.meta import Session
 
 class TestLoginController(TestController):
 
+    def tearDown(self):
+        for n in Notification.query().all():
+            Session().delete(n)
+
+        Session().commit()
+        self.assertEqual(Notification.query().all(), [])
+
     def test_index(self):
         response = self.app.get(url(controller='login', action='index'))
         self.assertEqual(response.status, '200 OK')