diff --git a/rhodecode/tests/functional/test_changelog.py b/rhodecode/tests/functional/test_changelog.py
--- a/rhodecode/tests/functional/test_changelog.py
+++ b/rhodecode/tests/functional/test_changelog.py
@@ -10,8 +10,10 @@ class TestChangelogController(TestContro
 
         response.mustcontain("""<div id="chg_20" class="container tablerow1">""")
         response.mustcontain(
-            """<input class="changeset_range" id="5e204e7583b9" """
-            """name="5e204e7583b9" type="checkbox" value="1" />"""
+            """<input class="changeset_range" """
+            """id="5e204e7583b9c8e7b93a020bd036564b1e731dae" """
+            """name="5e204e7583b9c8e7b93a020bd036564b1e731dae" """
+            """type="checkbox" value="1" />"""
         )
         response.mustcontain(
             """<span class="changeset_id">154:"""
@@ -29,22 +31,24 @@ class TestChangelogController(TestContro
 
         #pagination
         response = self.app.get(url(controller='changelog', action='index',
-                                    repo_name=HG_REPO), {'page':1})
+                                    repo_name=HG_REPO), {'page': 1})
         response = self.app.get(url(controller='changelog', action='index',
-                                    repo_name=HG_REPO), {'page':2})
+                                    repo_name=HG_REPO), {'page': 2})
         response = self.app.get(url(controller='changelog', action='index',
-                                    repo_name=HG_REPO), {'page':3})
+                                    repo_name=HG_REPO), {'page': 3})
         response = self.app.get(url(controller='changelog', action='index',
-                                    repo_name=HG_REPO), {'page':4})
+                                    repo_name=HG_REPO), {'page': 4})
         response = self.app.get(url(controller='changelog', action='index',
-                                    repo_name=HG_REPO), {'page':5})
+                                    repo_name=HG_REPO), {'page': 5})
         response = self.app.get(url(controller='changelog', action='index',
-                                    repo_name=HG_REPO), {'page':6})
+                                    repo_name=HG_REPO), {'page': 6})
 
         # Test response after pagination...
         response.mustcontain(
-            """<input class="changeset_range" id="46ad32a4f974" """
-            """name="46ad32a4f974" type="checkbox" value="1" />"""
+            """<input class="changeset_range" """
+            """id="46ad32a4f974e45472a898c6b0acb600320579b1" """
+            """name="46ad32a4f974e45472a898c6b0acb600320579b1" """
+            """type="checkbox" value="1" />"""
         )
         response.mustcontain(
             """<span class="changeset_id">64:"""
diff --git a/rhodecode/tests/test_models.py b/rhodecode/tests/test_models.py
--- a/rhodecode/tests/test_models.py
+++ b/rhodecode/tests/test_models.py
@@ -262,14 +262,14 @@ class TestNotifications(unittest.TestCas
         self.u2 = UserModel().create_or_update(username=u'u2',
                                         password=u'qweqwe',
                                         email=u'u2@rhodecode.org',
-                                        name=u'u2', lastname=u'u3')
+                                        firstname=u'u2', lastname=u'u3')
         Session.commit()
         self.u2 = self.u2.user_id
 
         self.u3 = UserModel().create_or_update(username=u'u3',
                                         password=u'qweqwe',
                                         email=u'u3@rhodecode.org',
-                                        name=u'u3', lastname=u'u3')
+                                        firstname=u'u3', lastname=u'u3')
         Session.commit()
         self.u3 = self.u3.user_id
 
diff --git a/rhodecode/tests/test_validators.py b/rhodecode/tests/test_validators.py
--- a/rhodecode/tests/test_validators.py
+++ b/rhodecode/tests/test_validators.py
@@ -170,7 +170,7 @@ class TestReposGroups(unittest.TestCase)
         self.assertEqual(expected, validator.to_python(name))
 
     def test_ValidCloneUri(self):
-            assert False
+            self.fail('TODO:')
 
     def test_ValidForkType(self):
             validator = v.ValidForkType(old_data={'repo_type': 'hg'})
@@ -178,7 +178,7 @@ class TestReposGroups(unittest.TestCase)
             self.assertRaises(formencode.Invalid, validator.to_python, 'git')
 
     def test_ValidPerms(self):
-            assert False
+            self.fail('TODO:')
 
     def test_ValidSettings(self):
         validator = v.ValidSettings()