diff --git a/tests/test_pagure_flask_ui_fork.py b/tests/test_pagure_flask_ui_fork.py
index b87c373..fd98bda 100644
--- a/tests/test_pagure_flask_ui_fork.py
+++ b/tests/test_pagure_flask_ui_fork.py
@@ -1379,16 +1379,16 @@ index 0000000..2a552bb
             output = self.app.get('/test/diff/feature..master')
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Diff from master to feature - test - Pagure</title>',
-                output.data)
+                '<title>Diff from master to feature - test\n - '
+                'Pagure</title>', output.data)
             self.assertIn(
                 '<p class="error"> No commits found </p>', output.data)
 
             output = self.app.get('/test/diff/master..feature')
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Diff from feature to master - test - Pagure</title>',
-                output.data)
+                '<title>Diff from feature to master - test\n - '
+                'Pagure</title>', output.data)
             self.assertNotIn(
                 '<input type="submit" class="submit positive button" '
                 'value="Create">', output.data)
@@ -1398,7 +1398,7 @@ index 0000000..2a552bb
             output = self.app.get('/test/diff/master..feature')
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>    Create new Pull Request for master - test - '
+                '<title>Create new Pull Request for master - test\n - '
                 'Pagure</title>', output.data)
             self.assertIn(
                 '<input type="submit" class="btn btn-primary" value="Create">',
diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py
index 87be925..7beab23 100644
--- a/tests/test_pagure_flask_ui_repo.py
+++ b/tests/test_pagure_flask_ui_repo.py
@@ -1196,7 +1196,7 @@ class PagureFlaskRepotests(tests.Modeltests):
             output = self.app.get('/test/c/%s..%s' % (c2.oid.hex, c1.oid.hex))
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Diff from %s to %s - test - Pagure</title>'
+                '<title>Diff from %s to %s - test\n - Pagure</title>'
                 % (c2.oid.hex, c1.oid.hex),
                 output.data)
             self.assertIn(
@@ -1219,7 +1219,7 @@ class PagureFlaskRepotests(tests.Modeltests):
             output = self.app.get('/test/c/%s..%s' % (c1.oid.hex, c2.oid.hex))
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Diff from %s to %s - test - Pagure</title>' %
+                '<title>Diff from %s to %s - test\n - Pagure</title>' %
                 (c1.oid.hex, c2.oid.hex),
                 output.data)
             self.assertIn(
@@ -1245,7 +1245,7 @@ class PagureFlaskRepotests(tests.Modeltests):
             output = self.app.get('/test/c/%s..%s' % (c1.oid.hex, c3.oid.hex))
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Diff from %s to %s - test - Pagure</title>' %
+                '<title>Diff from %s to %s - test\n - Pagure</title>' %
                 (c1.oid.hex, c3.oid.hex), output.data)
             self.assertIn(
                 '<h5 class="text-muted">%s .. %s</h5>' %
@@ -1276,7 +1276,7 @@ class PagureFlaskRepotests(tests.Modeltests):
                 '/test/c/%s..%s' % (c3.oid.hex, c1.oid.hex))
             self.assertEqual(output.status_code, 200)
             self.assertIn(
-                '<title>Diff from %s to %s - test - Pagure</title>' %
+                '<title>Diff from %s to %s - test\n - Pagure</title>' %
                 (c3.oid.hex, c1.oid.hex), output.data)
             self.assertIn(
                 '<h5 class="text-muted">%s .. %s</h5>' %
@@ -1618,8 +1618,8 @@ class PagureFlaskRepotests(tests.Modeltests):
         self.assertTrue(
             '<div class="list-group" id="diff_list" style="display:none;">'
             in output.data)
-        self.assertTrue('</a> Authored by Alice Author' in output.data)
-        self.assertTrue('Committed by Cecil Committer' in output.data)
+        self.assertTrue('  Authored by Alice Author\n' in output.data)
+        self.assertTrue('  Committed by Cecil Committer\n' in output.data)
         self.assertTrue(
             '<span style="color: #00A000">+ Pagure</span>' in output.data)
         self.assertTrue(
@@ -1643,8 +1643,8 @@ class PagureFlaskRepotests(tests.Modeltests):
         self.assertTrue(
             '<div class="list-group" id="diff_list" style="display:none;">'
             in output.data)
-        self.assertTrue('</a> Authored by Alice Author' in output.data)
-        self.assertTrue('Committed by Cecil Committer' in output.data)
+        self.assertTrue('  Authored by Alice Author\n' in output.data)
+        self.assertTrue('  Committed by Cecil Committer\n' in output.data)
         self.assertTrue(
             # new version of pygments
             '<div class="highlight" style="background: #f8f8f8">'
@@ -1704,8 +1704,8 @@ class PagureFlaskRepotests(tests.Modeltests):
         self.assertTrue(
             '<div class="list-group" id="diff_list" style="display:none;">'
             in output.data)
-        self.assertTrue('</a> Authored by Alice Author' in output.data)
-        self.assertTrue('Committed by Cecil Committer' in output.data)
+        self.assertTrue('  Authored by Alice Author\n' in output.data)
+        self.assertTrue('  Committed by Cecil Committer\n' in output.data)
         self.assertTrue(
             '<span style="color: #00A000">+ Pagure</span>' in output.data)
         self.assertTrue(
@@ -3215,21 +3215,21 @@ index 0000000..fb7093d
             self.assertEqual(output.status_code, 404)
 
             output = self.app.post(
-                '/watch/foo', data=data, follow_redirects=True)
+                '/foo/watch/settings', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 404)
 
             output = self.app.post(
-                '/watch/test/settings/2', data=data, follow_redirects=True)
+                '/test/watch/settings/2', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 400)
 
             output = self.app.post(
-                '/watch/test/settings/0', data=data, follow_redirects=True)
+                '/test/watch/settings/0', data=data, follow_redirects=True)
             self.assertIn(
                 '</button>\n                      You are no longer'
                 ' watching this repo.', output.data)
 
             output = self.app.post(
-                '/watch/test/settings/1', data=data, follow_redirects=True)
+                '/test/watch/settings/1', data=data, follow_redirects=True)
             self.assertIn(
                 '</button>\n                      You are now'
                 ' watching this repo.', output.data)
@@ -3248,13 +3248,15 @@ index 0000000..fb7093d
             pygit2.init_repository(gitrepo, bare=True)
 
             output = self.app.post(
-                '/watch/fork/foo/test/settings/0', data=data, follow_redirects=True)
+                '/fork/foo/test/watch/settings/0', data=data,
+                follow_redirects=True)
             self.assertIn(
                 '</button>\n                      You are no longer'
                 ' watching this repo.', output.data)
 
             output = self.app.post(
-                '/watch/fork/foo/test/settings/1', data=data, follow_redirects=True)
+                '/fork/foo/test/watch/settings/1', data=data,
+                follow_redirects=True)
             self.assertIn(
                 '</button>\n                      You are now'
                 ' watching this repo.', output.data)
diff --git a/tests/test_pagure_flask_ui_repo_slash_name.py b/tests/test_pagure_flask_ui_repo_slash_name.py
index 349d7f8..5ca66c3 100644
--- a/tests/test_pagure_flask_ui_repo_slash_name.py
+++ b/tests/test_pagure_flask_ui_repo_slash_name.py
@@ -124,7 +124,8 @@ class PagureFlaskSlashInNametests(tests.Modeltests):
             pagure.exceptions.PagureException,
             pagure.lib.new_project,
             self.session,
-            name='forks/test',
+            name='test',
+            namespace='forks',
             description='test project forks/test',
             url='',
             avatar_email='',
@@ -140,7 +141,8 @@ class PagureFlaskSlashInNametests(tests.Modeltests):
         # So just put it in the DB
         item = pagure.lib.model.Project(
             user_id=1,  # pingou
-            name='forks/test',
+            name='test',
+            namespace='forks',
             description='test project forks/test',
             hook_token='aaabbbcccddd',
         )
@@ -194,7 +196,8 @@ class PagureFlaskSlashInNametests(tests.Modeltests):
             pagure.exceptions.PagureException,
             pagure.lib.new_project,
             self.session,
-            name='forks/test',
+            name='test',
+            namespace='forks',
             description='test project forks/test',
             url='',
             avatar_email='',
@@ -210,7 +213,8 @@ class PagureFlaskSlashInNametests(tests.Modeltests):
         # So just put it in the DB
         item = pagure.lib.model.Project(
             user_id=1,  # pingou
-            name='forks/test',
+            name='test',
+            namespace='forks',
             description='test project forks/test',
             hook_token='aaabbbcccddd',
         )
diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py
index 5eb56aa..ec7027f 100644
--- a/tests/test_pagure_lib.py
+++ b/tests/test_pagure_lib.py
@@ -755,7 +755,8 @@ class PagureLibtests(tests.Modeltests):
             pagure.lib.new_project,
             session=self.session,
             user='pingou',
-            name='pingou/' + 's' * 40,
+            name='s' * 40,
+            namespace='pingou',
             blacklist=['static'],
             allowed_prefix=['pingou'],
             gitfolder=gitfolder,
diff --git a/tests/test_zzz_pagure_flask_ui_old_commit.py b/tests/test_zzz_pagure_flask_ui_old_commit.py
index c38de81..87e7309 100644
--- a/tests/test_zzz_pagure_flask_ui_old_commit.py
+++ b/tests/test_zzz_pagure_flask_ui_old_commit.py
@@ -96,8 +96,8 @@ class PagureFlaskRepoOldUrltests(tests.Modeltests):
         self.assertTrue(
             '<div class="list-group" id="diff_list" style="display:none;">'
             in output.data)
-        self.assertTrue('</a> Authored by Alice Author' in output.data)
-        self.assertTrue('Committed by Cecil Committer' in output.data)
+        self.assertTrue('  Authored by Alice Author\n' in output.data)
+        self.assertTrue('  Committed by Cecil Committer\n' in output.data)
         self.assertTrue(
             '<span style="color: #00A000">+ Pagure</span>' in output.data)
         self.assertTrue(
@@ -111,8 +111,8 @@ class PagureFlaskRepoOldUrltests(tests.Modeltests):
         self.assertTrue(
             '<div class="list-group" id="diff_list" style="display:none;">'
             in output.data)
-        self.assertTrue('</a> Authored by Alice Author' in output.data)
-        self.assertTrue('Committed by Cecil Committer' in output.data)
+        self.assertTrue('  Authored by Alice Author\n' in output.data)
+        self.assertTrue('  Committed by Cecil Committer\n' in output.data)
         self.assertTrue(
             '<span style="color: #00A000">+ Pagure</span>' in output.data)
         self.assertTrue(
@@ -131,8 +131,8 @@ class PagureFlaskRepoOldUrltests(tests.Modeltests):
         self.assertTrue(
             '<div class="list-group" id="diff_list" style="display:none;">'
             in output.data)
-        self.assertTrue('</a> Authored by Alice Author' in output.data)
-        self.assertTrue('Committed by Cecil Committer' in output.data)
+        self.assertTrue('  Authored by Alice Author\n' in output.data)
+        self.assertTrue('  Committed by Cecil Committer\n' in output.data)
         self.assertTrue(
             # new version of pygments
             '<div class="highlight" style="background: #f8f8f8">'
@@ -179,8 +179,8 @@ class PagureFlaskRepoOldUrltests(tests.Modeltests):
         self.assertTrue(
             '<div class="list-group" id="diff_list" style="display:none;">'
             in output.data)
-        self.assertTrue('</a> Authored by Alice Author' in output.data)
-        self.assertTrue('Committed by Cecil Committer' in output.data)
+        self.assertTrue('  Authored by Alice Author\n' in output.data)
+        self.assertTrue('  Committed by Cecil Committer\n' in output.data)
         self.assertTrue(
             '<span style="color: #00A000">+ Pagure</span>' in output.data)
         self.assertTrue(
@@ -193,8 +193,8 @@ class PagureFlaskRepoOldUrltests(tests.Modeltests):
         self.assertTrue(
             '<div class="list-group" id="diff_list" style="display:none;">'
             in output.data)
-        self.assertTrue('</a> Authored by Alice Author' in output.data)
-        self.assertTrue('Committed by Cecil Committer' in output.data)
+        self.assertTrue('  Authored by Alice Author\n' in output.data)
+        self.assertTrue('  Committed by Cecil Committer\n' in output.data)
         self.assertTrue(
             '<span style="color: #00A000">+ Pagure</span>' in output.data)
         self.assertTrue(